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

Updates for Zammad 6

Browse source
This commit is contained in:
Darren Clarke 2023-07-11 10:05:52 +00:00 • committed by GitHub
parent 60b82f6fb4
commit 73fdb6e5d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 101 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docker/zammad/Dockerfile
View file

@ -3,6 +3,7 @@ FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} AS builder
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
RUN sed -i '/proxy_set_header X-Forwarded-User "";/d' ${ZAMMAD_DIR}/contrib/nginx/zammad.conf;
USER root
@ -22,13 +23,13 @@ WORKDIR ${ZAMMAD_DIR}
RUN echo "gem 'ruby_openpgp', git: 'https://github.com/throneless-tech/ruby_openpgp', branch: 'signing-and-userids'" >> Gemfile.local
RUN echo "gem 'rails-observers'" >> Gemfile.local
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\
bundle exec rake assets:precompile\n\
' /docker-entrypoint.sh
USER zammad
RUN ZAMMAD_SAFE_MODE=1 bundle exec rails runner /opt/zammad/contrib/link/install.rb
FROM node:16.18.0-slim as node
@ -43,5 +44,6 @@ 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