sr2/link-stack
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix multi-Zammad image build

Browse source
This commit is contained in:
Darren Clarke 2023-09-27 14:34:34 +02:00
parent 58ce48b031
commit 1443a61164
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docker/zammad/Dockerfile
View file

@ -1,5 +1,4 @@
ARG ZAMMAD_VERSION=6.1.0 ARG ZAMMAD_VERSION=6.1.0
ARG EMBEDDED
FROM node:16.18.0-slim as node FROM node:16.18.0-slim as node
FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} AS builder FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} AS builder
@ -9,7 +8,7 @@ RUN mkdir -p /opt/zammad/contrib/link/addons
COPY addons ${ZAMMAD_DIR}/contrib/link/addons COPY addons ${ZAMMAD_DIR}/contrib/link/addons
COPY setup.rb ${ZAMMAD_DIR}/contrib/link/setup.rb COPY setup.rb ${ZAMMAD_DIR}/contrib/link/setup.rb
COPY install.rb ${ZAMMAD_DIR}/contrib/link/install.rb COPY install.rb ${ZAMMAD_DIR}/contrib/link/install.rb
ENV EMBEDDED=${embedded} ARG EMBEDDED=false
RUN if [ "$EMBEDDED" = "true" ] ; then sed -i '/proxy_set_header X-Forwarded-User "";/d' ${ZAMMAD_DIR}/contrib/nginx/zammad.conf; fi RUN if [ "$EMBEDDED" = "true" ] ; then sed -i '/proxy_set_header X-Forwarded-User "";/d' ${ZAMMAD_DIR}/contrib/nginx/zammad.conf; fi
USER root USER root
@ -32,7 +31,6 @@ ENV ZAMMAD_READY_FILE=${ZAMMAD_DIR}/var/zammad.ready
COPY --from=node /opt /opt COPY --from=node /opt /opt
COPY --from=node /usr/local/bin /usr/local/bin COPY --from=node /usr/local/bin /usr/local/bin
COPY --from=builder ${ZAMMAD_DIR} ${ZAMMAD_DIR} COPY --from=builder ${ZAMMAD_DIR} ${ZAMMAD_DIR}
COPY --from=builder ${SEQUOIA_DIR} ${SEQUOIA_DIR}
COPY --from=builder /usr/local/bundle /usr/local/bundle COPY --from=builder /usr/local/bundle /usr/local/bundle
COPY --from=builder /docker-entrypoint.sh /docker-entrypoint.sh COPY --from=builder /docker-entrypoint.sh /docker-entrypoint.sh
RUN ZAMMAD_SAFE_MODE=1 bundle exec rake assets:precompile RUN ZAMMAD_SAFE_MODE=1 bundle exec rake assets:precompile