Update Zammad Dockerfile
This commit is contained in:
parent
4d5eaccde4
commit
eb319b68f5
1 changed files with 2 additions and 2 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue