Skip to content

Commit

Permalink
PHRAS-4079 Bump base image 1.1.0 (#4554)
Browse files Browse the repository at this point in the history
* use base-image-1.0.1-alpha4

* PHRAS-4079 bump base image to 1.1.0
  • Loading branch information
moctardiouf authored Oct 17, 2024
1 parent 62e4471 commit 8f84487
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 . .
Expand Down Expand Up @@ -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 /
Expand All @@ -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 /
Expand All @@ -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 /
Expand Down Expand Up @@ -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 \
Expand All @@ -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


0 comments on commit 8f84487

Please sign in to comment.