Merge branch 'master' into mg/safer-es-data-rebuild

This commit is contained in:
André Bauer 2021-08-13 15:35:26 +02:00 committed by GitHub
commit 479dbccd15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
FROM ruby:2.6.6-slim AS builder
FROM ruby:2.6.8-slim AS builder
# note: zammad is currently incompatible to alpine because of:
# https://github.com/docker-library/ruby/issues/113
@ -24,7 +24,7 @@ RUN chmod +x /tmp/setup.sh; \
/tmp/setup.sh builder
FROM ruby:2.6.6-slim
FROM ruby:2.6.8-slim
ARG BUILD_DATE
ARG DEBIAN_FRONTEND=noninteractive