From d5b853910175974610265d9d858dd7696ab532fd Mon Sep 17 00:00:00 2001 From: Josh Reichardt Date: Thu, 21 Jan 2021 06:38:17 -0800 Subject: [PATCH 1/2] Inject composer auth env var as onbuild arg --- docker.Makefile | 1 + wordpress/Dockerfile-bedrock-build | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docker.Makefile b/docker.Makefile index b860c3b..8575dde 100644 --- a/docker.Makefile +++ b/docker.Makefile @@ -59,6 +59,7 @@ push-$(RUNTIME)-%: .build/tag-$(RUNTIME)-% $(DOCKER_BUILD) \ $(patsubst %,--build-arg BASE_IMAGE=%,$(BASE_IMAGE)) \ $(patsubst %,--build-arg PHP_BASE_IMAGE=%,$(PHP_BASE_IMAGE)) \ + --build-arg COMPOSER_AUTH= \ -t local$@ \ --cache-from $(REGISTRY):$(@:.build/$(RUNTIME)-%=%) \ --cache-from $(REGISTRY):$(@:.build/$(RUNTIME)-%=%)$(TAG_SUFFIX_SLUG) \ diff --git a/wordpress/Dockerfile-bedrock-build b/wordpress/Dockerfile-bedrock-build index de23007..8baa3e8 100644 --- a/wordpress/Dockerfile-bedrock-build +++ b/wordpress/Dockerfile-bedrock-build @@ -1,11 +1,17 @@ ARG BASE_IMAGE=quay.io/presslabs/wordpress-runtime:bedrock FROM ${BASE_IMAGE} as bedrock WORKDIR /src + +# Inject custom env vars as build args +ONBUILD ARG COMPOSER_AUTH +ONBUILD ENV COMPOSER_AUTH ${COMPOSER_AUTH} + # Install project dependencies as first build step for child images so that we # heat up composer cache +# ONBUILD COPY --chown=www-data:www-data composer.json composer.lock auth.json /src/ ONBUILD COPY --chown=www-data:www-data composer.json composer.lock /src/ -ONBUILD RUN composer install --no-dev --no-interaction --no-progress --no-ansi --no-scripts +ONBUILD RUN COMPOSER_AUTH=${COMPOSER_AUTH} composer install --no-dev --no-interaction --no-progress --no-ansi --no-scripts ONBUILD COPY --chown=www-data:www-data . /src -ONBUILD RUN composer install --no-dev --no-interaction --no-progress --no-ansi --no-scripts +ONBUILD RUN COMPOSER_AUTH=${COMPOSER_AUTH} composer install --no-dev --no-interaction --no-progress --no-ansi --no-scripts ONBUILD RUN cp -a /src/. /app From f54ffa0597018d65e8a56e3b4bb8df6601dd8362 Mon Sep 17 00:00:00 2001 From: Josh Reichardt Date: Thu, 21 Jan 2021 06:39:06 -0800 Subject: [PATCH 2/2] Remove comment --- wordpress/Dockerfile-bedrock-build | 1 - 1 file changed, 1 deletion(-) diff --git a/wordpress/Dockerfile-bedrock-build b/wordpress/Dockerfile-bedrock-build index 8baa3e8..500fd72 100644 --- a/wordpress/Dockerfile-bedrock-build +++ b/wordpress/Dockerfile-bedrock-build @@ -8,7 +8,6 @@ ONBUILD ENV COMPOSER_AUTH ${COMPOSER_AUTH} # Install project dependencies as first build step for child images so that we # heat up composer cache -# ONBUILD COPY --chown=www-data:www-data composer.json composer.lock auth.json /src/ ONBUILD COPY --chown=www-data:www-data composer.json composer.lock /src/ ONBUILD RUN COMPOSER_AUTH=${COMPOSER_AUTH} composer install --no-dev --no-interaction --no-progress --no-ansi --no-scripts