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 4093 reintegrate ufraw package into the worker image #4559

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

Phras 4093 reintegrate ufraw package into the worker image #4559

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fe92f7
Reintegrate ufraw package into the worker image
gjacobjn Aug 27, 2024
49af400
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet int…
gjacobjn Nov 8, 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
17 changes: 11 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
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-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/

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/
ARG PHRASEANET_PLUGINS

RUN ( \
Expand Down Expand Up @@ -103,13 +103,18 @@
ADD ./docker/phraseanet/root /
WORKDIR /var/alchemy/Phraseanet

RUN apt-get update
RUN apt-get install -y --no-install-recommends supervisor
RUN apt-get install -y --no-install-recommends logrotate
RUN mkdir -p /var/log/supervisor \
&& chown -R app: /var/log/supervisor \
RUN apt-get update \
&& apt-get install -y --no-install-recommends supervisor \
&& apt-get install -y --no-install-recommends logrotate \
&& mkdir -p /var/log/supervisor \
&& chown -R app: /var/log/supervisor

RUN echo "deb http://archive.debian.org/debian stretch main non-free" > /etc/apt/sources.list.d/archive-debian.list \
&& apt-get update \
&& apt-get install -y --no-install-recommends ufraw \
&& rm -fr /etc/apt/sources.list.d/archive-debian.list \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists
&& rm -rf /var/lib/apt/lists/*

COPY ./docker/phraseanet/worker/supervisor.conf /etc/supervisor/
COPY ./docker/phraseanet/worker/logrotate/worker /etc/logrotate.d/
Expand Down
Loading