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

Update dependencies and version number, remove link tickets endpoint

Browse source
This commit is contained in:
Darren Clarke 2025-10-07 11:24:00 +02:00
parent 6f0f97ab7b
commit 11563a794e
36 changed files with 2953 additions and 4655 deletions
Download patch file Download diff file Expand all files Collapse all files

20
docker/zammad/Dockerfile
View file

@ -1,4 +1,4 @@
ARG ZAMMAD_VERSION=6.5.0
ARG ZAMMAD_VERSION=6.5.2
FROM node:22-slim AS node
@ -24,19 +24,19 @@ RUN contrib/docker/setup.sh builder
ARG EMBEDDED=false
ARG LINK_HOST=http://link:3000
RUN if [ "$EMBEDDED" = "true" ] ; then sed -i "/location \/ {/i\
location /link {\n\
proxy_pass ${LINK_HOST};\n\
proxy_set_header Host \$host;\n\
proxy_set_header X-Real-IP \$remote_addr;\n\
proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;\n\
proxy_set_header X-Forwarded-Proto https;\n\
}\n\
" ${ZAMMAD_DIR}/contrib/nginx/zammad.conf; fi
location /link {\n\
proxy_pass ${LINK_HOST};\n\
proxy_set_header Host \$host;\n\
proxy_set_header X-Real-IP \$remote_addr;\n\
proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;\n\
proxy_set_header X-Forwarded-Proto https;\n\
}\n\
" ${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\
' /docker-entrypoint.sh
' /docker-entrypoint.sh
FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} AS runner
USER zammad