From 8f84487688d7576b9c5125cf86e9e67b6f4a3e31 Mon Sep 17 00:00:00 2001 From: moctardiouf Date: Thu, 17 Oct 2024 13:45:57 +0200 Subject: [PATCH] PHRAS-4079 Bump base image 1.1.0 (#4554) * use base-image-1.0.1-alpha4 * PHRAS-4079 bump base image to 1.1.0 --- Dockerfile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index bf7a1ef828..bca1bb3fcf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM alchemyfr/phraseanet-base:1.0.0 AS builder +FROM alchemyfr/phraseanet-base:1.1.0 AS builder COPY --from=composer:2.1.6 /usr/bin/composer /usr/bin/composer @@ -39,8 +39,8 @@ USER app # Warm up composer cache for faster builds COPY docker/caching/composer.* ./ -RUN composer install --prefer-dist --no-dev --no-progress --classmap-authoritative --no-interaction --no-scripts \ - && rm -rf vendor composer.* +RUN composer install --prefer-dist --no-dev --no-progress --classmap-authoritative --no-interaction --no-scripts +# && rm -rf vendor composer.* # End warm up COPY --chown=app . . @@ -72,7 +72,7 @@ CMD [] # Phraseanet install and setup application image ######################################################################### -FROM alchemyfr/phraseanet-base:1.0.0 AS phraseanet-setup +FROM alchemyfr/phraseanet-base:1.1.0 AS phraseanet-setup COPY --from=builder --chown=app /var/alchemy/Phraseanet /var/alchemy/Phraseanet ADD ./docker/phraseanet/root / @@ -85,7 +85,7 @@ CMD [] # Phraseanet web application image ######################################################################### -FROM alchemyfr/phraseanet-base:1.0.0 AS phraseanet-fpm +FROM alchemyfr/phraseanet-base:1.1.0 AS phraseanet-fpm COPY --from=builder --chown=app /var/alchemy/Phraseanet /var/alchemy/Phraseanet ADD ./docker/phraseanet/root / @@ -97,7 +97,7 @@ CMD ["php-fpm", "-F"] # Phraseanet worker application image ######################################################################### -FROM alchemyfr/phraseanet-base:1.0.0 AS phraseanet-worker +FROM alchemyfr/phraseanet-base:1.1.0 AS phraseanet-worker COPY --from=builder --chown=app /var/alchemy/Phraseanet /var/alchemy/Phraseanet ADD ./docker/phraseanet/root / @@ -139,7 +139,7 @@ HEALTHCHECK CMD wget --spider http://127.0.0.1/login || nginx -s reload || exit # phraseanet adapted simplesaml service provider ######################################################################### -FROM alchemyfr/phraseanet-base:1.0.0 AS phraseanet-saml-sp +FROM alchemyfr/phraseanet-base:1.1.0 AS phraseanet-saml-sp RUN apt-get update \ && apt-get install -y \ apt-transport-https \ @@ -162,5 +162,3 @@ ADD ./docker/phraseanet/saml-sp/root / ENTRYPOINT ["/bootstrap/entrypoint.sh"] CMD ["/bootstrap/bin/start-servers.sh"] HEALTHCHECK CMD wget --spider http://127.0.0.1/ || nginx -s reload || exit - -