Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PHRAS-4079 Bump base image 1.1.0 #4554

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

PHRAS-4079 Bump base image 1.1.0 #4554

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c861297
use base-image-1.0.1-alpha4
moctardiouf Sep 18, 2024
6e4a8c4
PHRAS-4079 bump base image to 1.1.0
moctardiouf Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions Dockerfile
View file
Open in desktop
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 @@

# 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 All @@ -50,7 +50,7 @@
ADD ./docker/builder/root /

# SSH Private repo
ARG SSH_PRIVATE_KEY

Check warning on line 53 in Dockerfile

View workflow job for this annotation

GitHub Actions / build phraseanet-setup / build

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "SSH_PRIVATE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 53 in Dockerfile

View workflow job for this annotation

GitHub Actions / build phraseanet-worker / build

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "SSH_PRIVATE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 53 in Dockerfile

View workflow job for this annotation

GitHub Actions / build phraseanet-fpm / build

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "SSH_PRIVATE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 53 in Dockerfile

View workflow job for this annotation

GitHub Actions / build phraseanet-nginx / build

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "SSH_PRIVATE_KEY")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
ARG PHRASEANET_PLUGINS

RUN ( \
Expand All @@ -72,7 +72,7 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
ENTRYPOINT ["/bootstrap/entrypoint.sh"]
CMD ["/bootstrap/bin/start-servers.sh"]
HEALTHCHECK CMD wget --spider http://127.0.0.1/ || nginx -s reload || exit


Loading