From eb319b68f5f6bb7a1b2c3b9166ad55d1c8c1a7c5 Mon Sep 17 00:00:00 2001 From: Darren Clarke Date: Wed, 26 Jun 2024 12:23:03 +0200 Subject: [PATCH] Update Zammad Dockerfile --- docker/zammad/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/zammad/Dockerfile b/docker/zammad/Dockerfile index 0458c21..15b7085 100644 --- a/docker/zammad/Dockerfile +++ b/docker/zammad/Dockerfile @@ -15,6 +15,7 @@ COPY setup.rb ${ZAMMAD_DIR}/contrib/link/setup.rb COPY install.rb ${ZAMMAD_DIR}/contrib/link/install.rb WORKDIR ${ZAMMAD_DIR} USER root +RUN sed -i '/script\/build\/cleanup\.sh/d' contrib/docker/setup.sh RUN contrib/docker/setup.sh builder ARG EMBEDDED=false RUN if [ "$EMBEDDED" = "true" ] ; then sed -i '/proxy_set_header X-Forwarded-User "";/d' ${ZAMMAD_DIR}/contrib/nginx/zammad.conf; fi @@ -23,12 +24,11 @@ echo "about to reinstall..."\n\ bundle exec rails runner /opt/zammad/contrib/link/setup.rb\n\ bundle exec rake zammad:package:migrate\n\ ' /docker-entrypoint.sh -USER zammad RUN ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql://zammad:/zammad bundle exec rails runner /opt/zammad/contrib/link/install.rb RUN ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql://zammad:/zammad bundle exec rake assets:precompile FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} as runner USER ${ZAMMAD_USER} -COPY --from=builder ${ZAMMAD_DIR} ${ZAMMAD_DIR} +COPY --from=builder --chown=zammad:zammad ${ZAMMAD_DIR} ${ZAMMAD_DIR} COPY --from=builder /usr/local/bundle /usr/local/bundle COPY --from=builder /docker-entrypoint.sh /docker-entrypoint.sh