diff --git a/containers/zammad/Dockerfile b/containers/zammad/Dockerfile index 369ca9d..c54d3f7 100644 --- a/containers/zammad/Dockerfile +++ b/containers/zammad/Dockerfile @@ -1,6 +1,6 @@ # note: zammad is currently incompatible to alpine because of: # 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 DEBIAN_FRONTEND=noninteractive @@ -24,7 +24,7 @@ RUN chmod +x /tmp/setup.sh; \ /tmp/setup.sh builder -FROM ruby:2.7.4-slim +FROM ruby:3.0.4-slim ARG BUILD_DATE 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-type="Git" \ 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" ENV GIT_BRANCH stable diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index 56736f1..68fe76c 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -106,7 +106,7 @@ if [ "$1" = 'zammad-init' ]; then if [ "${ELASTICSEARCH_REINDEX}" == "true" ]; then if ! curl -s "${SSL_SKIP_VERIFY}" "${ELASTICSEARCH_SCHEMA}://${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/_cat/indices" | grep -q zammad; then echo "rebuilding es searchindex..." - bundle exec rake searchindex:rebuild + bundle exec rake zammad:searchindex:rebuild fi fi fi