From 5a4d7bab53d447d2218a4c07ae05068ac2571c4c Mon Sep 17 00:00:00 2001 From: El RIDO Date: Mon, 12 Feb 2024 21:30:59 +0100 Subject: [PATCH] with composer config becoming part of the signed release archive, we no longer need to download them separately --- Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 61ffcb3..d971262 100644 --- a/Dockerfile +++ b/Dockerfile @@ -65,12 +65,10 @@ RUN \ && cd /var/www \ && tar -xzf /tmp/${RELEASE}.tar.gz --strip 1 \ && if [ -n "${COMPOSER_PACKAGES}" ] ; then \ - wget -q ${RAWURL}${RELEASE}/composer.json \ - && wget -q ${RAWURL}${RELEASE}/composer.lock \ - && composer remove --dev --no-update phpunit/phpunit \ + composer remove --dev --no-update phpunit/phpunit \ && composer require --no-update ${COMPOSER_PACKAGES} \ && composer update --no-dev --optimize-autoloader \ - rm composer.* /usr/local/bin/* ;\ + rm /usr/local/bin/* ;\ fi \ && rm *.md cfg/conf.sample.php \ && mv bin cfg lib tpl vendor /srv \ @@ -85,7 +83,7 @@ RUN \ && chmod o+rwx /run /var/lib/nginx /var/lib/nginx/tmp \ # Clean up && gpgconf --kill gpg-agent \ - && rm -rf /tmp/* \ + && rm -rf /tmp/* composer.* \ && apk del --no-cache composer gnupg git ${ALPINE_COMPOSER_PACKAGES} COPY etc/ /etc/