From 4d5eaccde4e6108b3e35bcea4b987e13f8ac8d25 Mon Sep 17 00:00:00 2001
From: Darren Clarke <darren@redaranj.com>
Date: Wed, 26 Jun 2024 10:58:17 +0200
Subject: [PATCH] Update Zammad Dockerfile

---
 docker/zammad/Dockerfile | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/docker/zammad/Dockerfile b/docker/zammad/Dockerfile
index a462b9e..0458c21 100644
--- a/docker/zammad/Dockerfile
+++ b/docker/zammad/Dockerfile
@@ -1,38 +1,34 @@
-# need to include changes from https://github.com/zammad/zammad/blob/506c295c1d15f8dc19fc8bb69af1fb721bf10f49/contrib/docker/setup.sh
+ARG ZAMMAD_VERSION=6.3.1
 
-ARG ZAMMAD_VERSION=6.2.0
+FROM node:20-slim as node
 
-FROM node:16.18.0-slim as node
 FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} AS builder
+ARG DEBIAN_FRONTEND=noninteractive
+ARG RAILS_ENV=production
+ARG ZAMMAD_DIR=/opt/zammad
 COPY --from=node /opt /opt
 COPY --from=node /usr/local/bin /usr/local/bin
+SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
 RUN mkdir -p /opt/zammad/contrib/link/addons
 COPY addons ${ZAMMAD_DIR}/contrib/link/addons
 COPY setup.rb ${ZAMMAD_DIR}/contrib/link/setup.rb
 COPY install.rb ${ZAMMAD_DIR}/contrib/link/install.rb
+WORKDIR ${ZAMMAD_DIR}
+USER root
+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
-
-USER root
-RUN set -ex; \
-  apt-get update; \
-  apt-get install -y --no-install-recommends gpg;
-WORKDIR ${ZAMMAD_DIR}
-RUN bundle install --without test development mysql
-RUN sed -i '/^[[:space:]]*# create install ready file/ i\
-  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
+RUN sed -i '/^[[:space:]]*# es config/ i\
+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 bundle exec rails runner /opt/zammad/contrib/link/install.rb
+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}
+FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} as runner
 USER ${ZAMMAD_USER}
-ENV ZAMMAD_READY_FILE=${ZAMMAD_DIR}/var/zammad.ready
-COPY --from=node /opt /opt
-COPY --from=node /usr/local/bin /usr/local/bin
 COPY --from=builder ${ZAMMAD_DIR} ${ZAMMAD_DIR}
 COPY --from=builder /usr/local/bundle /usr/local/bundle
 COPY --from=builder /docker-entrypoint.sh /docker-entrypoint.sh
-RUN ZAMMAD_SAFE_MODE=1 bundle exec rake assets:precompile