* make Dockerfile cacheable.

cnxtech · Apr 17, 2016 · 2eee019 · 2eee019
1 parent 86f3b4d
commit 2eee019
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,4 @@
 FROM ubuntu:15.10
-ENV PATH /usr/games:$PATH
-ADD . /usr/local/share/quine-relay
-WORKDIR /usr/local/share/quine-relay
 RUN apt-get update && apt-get upgrade -y
 RUN apt-get -qq install -y afnix && apt-get clean
 RUN apt-get -qq install -y algol68g && apt-get clean
@@ -95,5 +92,8 @@ RUN apt-get -qq install -y valac && apt-get clean
 RUN apt-get -qq install -y xsltproc && apt-get clean
 RUN apt-get -qq install -y yorick && apt-get clean
 RUN apt-get -qq install -y zoem && apt-get clean
+ENV PATH /usr/games:$PATH
+ADD . /usr/local/share/quine-relay
+WORKDIR /usr/local/share/quine-relay
 RUN make -C vendor
 CMD make check
diff --git a/README.md b/README.md
@@ -234,7 +234,7 @@ I used the following Ubuntu deb packages to test this program.
 54  |GAP                |gap                |4r7p8-1
 55  |GEL (Genius)       |genius             |1.0.20-2
 56  |Gnuplot            |gnuplot            |4.6.6-2
-57  |Go                 |golang             |2:1.5.1-0ubuntu2
+57  |Go                 |golang             |2:1.5.1-0ubuntu2.1
 58  |G-Portugol         |gpt                |1.1-2ubuntu2
 59  |Gri                |gri                |2.12.23-9build1
 60  |Groovy             |groovy             |2.0.0~beta2+isreally1.8.6-4ubuntu1
@@ -268,7 +268,7 @@ I used the following Ubuntu deb packages to test this program.
 87  |PARI/GP            |pari-gp            |2.7.4-2
 88  |Parrot asm         |parrot             |6.6.0-1build1
 89  |Pascal             |fp-compiler        |2.6.4+dfsg-8
-90  |Perl               |perl               |5.20.2-6ubuntu0.1
+90  |Perl               |perl               |5.20.2-6ubuntu0.2
 91  |PHP                |php5-cli           |5.6.11+dfsg-1ubuntu3.1
 92  |Piet               |*N/A*              |-
 93  |Pike               |pike8.0            |8.0.28-3

diff --git a/src/Dockerfile.gen.rb b/src/Dockerfile.gen.rb
@@ -7,14 +7,13 @@
 
 dockerfile = []
 dockerfile << "FROM ubuntu:15.10"
-dockerfile << "ENV PATH /usr/games:$PATH"
-dockerfile << "ADD . /usr/local/share/quine-relay"
-dockerfile << "WORKDIR /usr/local/share/quine-relay"
 dockerfile << "RUN apt-get update && apt-get upgrade -y"
-
 apts.each do |apt|
   dockerfile << "RUN apt-get -qq install -y #{ apt } && apt-get clean"
 end
+dockerfile << "ENV PATH /usr/games:$PATH"
+dockerfile << "ADD . /usr/local/share/quine-relay"
+dockerfile << "WORKDIR /usr/local/share/quine-relay"
 dockerfile << "RUN make -C vendor"
 dockerfile << "CMD make check"