Skip to content

Fix for phraseanet-saml-sp image build in Dockerfile #4543

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

Merged
merged 3 commits into from
Sep 6, 2024
+10 −17
Merged

Fix for phraseanet-saml-sp image build in Dockerfile #4543

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b649839
Fix for phraseanet-saml-sp image build in Dockerfile
gjacobjn Aug 20, 2024
32fd3e3
Merge branch 'master' into PHRAS-4095-Fix-for-phraseanet-saml-sp-imag…
nmaillat Sep 6, 2024
b02ffe9
resolve 'as' case warn
nmaillat Sep 6, 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
27 changes: 10 additions & 17 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.0.0 AS builder

COPY --from=composer:2.1.6 /usr/bin/composer /usr/bin/composer

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

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-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/
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.0.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.0.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.0.0 AS phraseanet-worker

COPY --from=builder --chown=app /var/alchemy/Phraseanet /var/alchemy/Phraseanet
ADD ./docker/phraseanet/root /
Expand All @@ -123,7 +123,7 @@
# phraseanet-nginx
#########################################################################

FROM nginx:1.17.8-alpine as phraseanet-nginx
FROM nginx:1.17.8-alpine AS phraseanet-nginx
RUN adduser --uid 1000 --disabled-password app
RUN apk add --update apache2-utils \
&& rm -rf /var/cache/apk/*
Expand All @@ -139,10 +139,8 @@
# phraseanet adapted simplesaml service provider
#########################################################################

FROM alchemyfr/phraseanet-base:1.0.0 as phraseanet-saml-sp
RUN adduser --uid 1000 --disabled-password app
RUN echo "deb http://archive.debian.org/debian stretch main non-free" > /etc/apt/sources.list \
&& apt-get update \
FROM alchemyfr/phraseanet-base:1.0.0 AS phraseanet-saml-sp
RUN apt-get update \
&& apt-get install -y \
apt-transport-https \
ca-certificates \
Expand All @@ -159,15 +157,10 @@
gettext \
mcrypt \
libldap2-dev \
&& curl -Ls https://github.com/simplesamlphp/simplesamlphp/releases/download/simplesamlphp-1.10.0/simplesamlphp-1.10.0.tar.gz | tar xzvf - -C /var/www/ \
&& docker-php-ext-install zip mbstring pdo_mysql gettext mcrypt \
&& pecl install \
redis-5.3.7 \
&& docker-php-ext-enable redis \
&& pecl clear-cache \
&& docker-php-source delete
&& curl -Ls https://github.com/simplesamlphp/simplesamlphp/releases/download/simplesamlphp-1.10.0/simplesamlphp-1.10.0.tar.gz | tar xzvf - -C /var/www/
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
HEALTHCHECK CMD wget --spider http://127.0.0.1/ || nginx -s reload || exit


Loading