From 1443a611641b636e0ff817128626ad795dc731e2 Mon Sep 17 00:00:00 2001
From: Darren Clarke <darren@redaranj.com>
Date: Wed, 27 Sep 2023 14:34:34 +0200
Subject: [PATCH] Fix multi-Zammad image build

---
 docker/zammad/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docker/zammad/Dockerfile b/docker/zammad/Dockerfile
index 7adc38a..a0f426d 100644
--- a/docker/zammad/Dockerfile
+++ b/docker/zammad/Dockerfile
@@ -1,5 +1,4 @@
 ARG ZAMMAD_VERSION=6.1.0
-ARG EMBEDDED
 
 FROM node:16.18.0-slim as node
 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 setup.rb ${ZAMMAD_DIR}/contrib/link/setup.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
 
 USER root
@@ -32,7 +31,6 @@ 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 ${SEQUOIA_DIR} ${SEQUOIA_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