diff --git a/Dockerfile b/Dockerfile index 5bd8e5ff6a..f6133a69fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -97,7 +97,12 @@ CMD ["php-fpm", "-F"] # Phraseanet worker application image ######################################################################### -FROM phraseanet-fpm 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 / +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 diff --git a/docker/phraseanet/worker/entrypoint.sh b/docker/phraseanet/worker/entrypoint.sh index 4fdf1b827f..afe92889d5 100755 --- a/docker/phraseanet/worker/entrypoint.sh +++ b/docker/phraseanet/worker/entrypoint.sh @@ -27,6 +27,11 @@ fi chown -R app:app cache echo `date +"%Y-%m-%d %H:%M:%S"` " - chown app:app on cache/ repository" +if [ -d "www/plugins/" ];then +chown -R app:app www/plugins +echo `date +"%Y-%m-%d %H:%M:%S"` " - chown app:app on plugins/ repository" +fi + # config \ # tmp \ # logs \