diff --git a/docker/zammad/Dockerfile b/docker/zammad/Dockerfile index b51e5b5..6197edf 100644 --- a/docker/zammad/Dockerfile +++ b/docker/zammad/Dockerfile @@ -3,28 +3,26 @@ ARG ZAMMAD_VERSION=6.3.1 FROM node:20-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} +RUN mkdir -p /opt/zammad/contrib/link/addons +COPY addons contrib/link/addons +COPY setup.rb contrib/link/setup.rb +COPY install.rb contrib/link/install.rb + 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 RUN sed -i '/^[[:space:]]*# es config/a\ -echo "about to reinstall..."\n\ -bundle exec rails runner /opt/zammad/contrib/link/setup.rb\n\ -bundle exec rake zammad:package:migrate\n\ -bundle exec rails r "Setting.set(\"es_ssl_verify\", \"${ELASTICSEARCH_SSL_VERIFY}\")"'\n\ -/docker-entrypoint.sh + echo "about to reinstall..."\n\ + bundle exec rails runner /opt/zammad/contrib/link/setup.rb\n\ + bundle exec rake zammad:package:migrate\n\ + bundle exec rails r "Setting.set(\"es_ssl_verify\", \"${ELASTICSEARCH_SSL_VERIFY}\")"\n\ + ' /docker-entrypoint.sh 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