Set commit argument (#849)

* Set commit argument * Rename
elifesciences · Apr 10, 2018 · 87f383f · 87f383f
1 parent a7eb749
commit 87f383f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
-ARG commit=latest
+ARG image_tag=latest
 # looking for a better name for the node image that replaces `assets`
-FROM elifesciences/pattern-library_assets:${commit} AS assets
+FROM elifesciences/pattern-library_assets:${image_tag} AS assets
 FROM elifesciences/php_cli:22434ef5bda09326d4c9347de7d8c2f1610a0b83 AS ui-builder
 
 USER elife

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -1,5 +1,5 @@
-ARG commit=latest
-FROM elifesciences/pattern-library_assets:${commit}
+ARG image_tag=latest
+FROM elifesciences/pattern-library_assets:${image_tag}
 
 USER elife
 COPY --chown=elife:elife test/ ${PROJECT_FOLDER}/test

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,6 +13,8 @@ services:
         build:
             context: .
             dockerfile: Dockerfile
+            args:
+                image_tag: ${IMAGE_TAG}
         image: elifesciences/pattern-library:${IMAGE_TAG}
         ports:
             - "8889:80"
@@ -22,6 +24,8 @@ services:
         build:
             context: .
             dockerfile: Dockerfile.ci
+            args:
+                image_tag: ${IMAGE_TAG}
         image: elifesciences/pattern-library_ci:${IMAGE_TAG}
         command: /bin/bash
         depends_on: