Freifunk-Rhein-Sieg/zammad-docker-compose
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Maintenance: Changes for Zammad 5.2. (#274)

Browse Source 
* Maintenance: Changes for Zammad 5.2.

* Maintenance: Switch to Ruby 3.0.4.

* Update Zammad version label.

* Maintenance: Use the renamed zammad:searchindex:* commands of Zammad 5.2.
This commit is contained in:
Martin Gruner 2022-06-21 12:28:31 +02:00 committed by GitHub
parent 4799b327d2
commit cc6207c354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
containers/zammad/Dockerfile
View File

@ -1,6 +1,6 @@
# note: zammad is currently incompatible to alpine because of: # note: zammad is currently incompatible to alpine because of:
# https://github.com/docker-library/ruby/issues/113 # https://github.com/docker-library/ruby/issues/113
FROM ruby:2.7.4-slim AS builder FROM ruby:3.0.4-slim AS builder
ARG BUILD_DATE ARG BUILD_DATE
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -24,7 +24,7 @@ RUN chmod +x /tmp/setup.sh; \
/tmp/setup.sh builder /tmp/setup.sh builder
FROM ruby:2.7.4-slim FROM ruby:3.0.4-slim
ARG BUILD_DATE ARG BUILD_DATE
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -37,7 +37,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.vcs-url="https://github.com/zammad/zammad" \ org.label-schema.vcs-url="https://github.com/zammad/zammad" \
org.label-schema.vcs-type="Git" \ org.label-schema.vcs-type="Git" \
org.label-schema.vendor="Zammad" \ org.label-schema.vendor="Zammad" \
org.label-schema.schema-version="5.1.0" \ org.label-schema.schema-version="5.2.0" \
org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
ENV GIT_BRANCH stable ENV GIT_BRANCH stable

2
containers/zammad/docker-entrypoint.sh
View File

@ -106,7 +106,7 @@ if [ "$1" = 'zammad-init' ]; then
if [ "${ELASTICSEARCH_REINDEX}" == "true" ]; then if [ "${ELASTICSEARCH_REINDEX}" == "true" ]; then
if ! curl -s "${SSL_SKIP_VERIFY}" "${ELASTICSEARCH_SCHEMA}://${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/_cat/indices" | grep -q zammad; then if ! curl -s "${SSL_SKIP_VERIFY}" "${ELASTICSEARCH_SCHEMA}://${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/_cat/indices" | grep -q zammad; then
echo "rebuilding es searchindex..." echo "rebuilding es searchindex..."
bundle exec rake searchindex:rebuild bundle exec rake zammad:searchindex:rebuild
fi fi
fi fi
fi fi