diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 85cb2a91bc6a050028bda149c9b69367c31e41b1..66403f03bdc40e6506dd5c572771952334d53b3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,15 +1,12 @@ build: stage: build - before_script: - - vagrant up - after_script: - - vagrant destroy -f + image: smokserwis/docker-docs-build script: - mkdir dist - - vagrant ssh -c 'cd /vagrant; python build.py lab1' - - vagrant ssh -c 'cd /vagrant; python build.py lab2' - - vagrant ssh -c 'cd /vagrant; python build.py lab3' - - vagrant ssh -c 'cd /vagrant; python build.py lab4' + - python build.py lab1 + - python build.py lab2 + - python build.py lab3 + - python build.py lab4 - cp resources/lab3_program.txt dist/lab3/program.txt - mv -f dist/* . artifacts: diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..1998642513a660eabfd15e11edea4cb7bd06783a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM debian:jessie +RUN apt-get update +RUN apt-get install -y python pandoc texlive-latex-base texlive-fonts-recommended +RUN apt-get clean diff --git a/README.md b/README.md index 6519030e1afadc35899f53dc2cb40b7bc8047f82..37454e313e9ad84255749af8296f6af46ccb18ed 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,9 @@ przez prowadzÄ cego. Napisane w [jÄzyku Markdown](https://daringfireball.net/projects/markdown/), uzupeĹniane o dane zadaĹ za pomocÄ skryptu w jÄzyku [Python](https://www.python.org/) i danych zapisanych w jÄzyku [JSON](http://www.json.org/), -montowane przy uĹźyciu [Vagrant](https://www.vagrantup.com/), Ĺrodowiska integracji ciÄ gĹej [GitLab CI](https://about.gitlab.com/), +montowane przy uĹźyciu [Docker](https://www.docker.com/), Ĺrodowiska integracji ciÄ gĹej [GitLab CI](https://about.gitlab.com/), systemu kontroli wersji [Git](https://git-scm.com/) oraz konwertera Markdown-PDF [pandoc](http://pandoc.org/). +WczeĹniej byĹ [Vagrant](https://www.vagrantup.com) ale mi siÄ wylaĹy kondensatory w zasilaczu i Vagrantowa maszyna zmarĹa [*]. + Instrukcja Copyright (c) 2017 Piotr MaĹlanka. [NiektĂłre](/LICENSE.md) prawa zastrzeĹźone. \ No newline at end of file diff --git a/Vagrantfile b/Vagrantfile index f09c7bfe62e3b843077610545100f3dcef7c7317..467016485a9f0f24263372dac4ac98f4c04f1e28 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,5 +6,5 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", inline: <<-SHELL apt-get install -y python pandoc texlive-latex-base texlive-fonts-recommended - SHELL +exi SHELL end