diff --git a/Dockerfile b/Dockerfile index 369d0c44f..7ca66d236 100644 --- 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 index 6f29e750f..e0f4d852f 100644 --- 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 index 92758444b..e73522b4f 100644 --- 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: