diff --git a/6.0/alpine3.22/Dockerfile b/6.0/alpine3.22/Dockerfile index 1beb282..d268dfe 100644 --- a/6.0/alpine3.22/Dockerfile +++ b/6.0/alpine3.22/Dockerfile @@ -134,7 +134,9 @@ RUN set -eux; \ ' \ )"; \ apk add --no-network --virtual .redmine-rundeps $runDeps; \ - apk del --no-network .build-deps + apk del --no-network .build-deps; \ + # verify Kyiv timezone isn't missing + gosu redmine bundle exec rake time:zones:all | grep -q 'Kyiv' VOLUME /usr/src/redmine/files diff --git a/6.0/alpine3.23/Dockerfile b/6.0/alpine3.23/Dockerfile index fd0d186..84edb6e 100644 --- a/6.0/alpine3.23/Dockerfile +++ b/6.0/alpine3.23/Dockerfile @@ -134,7 +134,9 @@ RUN set -eux; \ ' \ )"; \ apk add --no-network --virtual .redmine-rundeps $runDeps; \ - apk del --no-network .build-deps + apk del --no-network .build-deps; \ + # verify Kyiv timezone isn't missing + gosu redmine bundle exec rake time:zones:all | grep -q 'Kyiv' VOLUME /usr/src/redmine/files diff --git a/6.0/bookworm/Dockerfile b/6.0/bookworm/Dockerfile index b70543d..d97818c 100644 --- a/6.0/bookworm/Dockerfile +++ b/6.0/bookworm/Dockerfile @@ -140,7 +140,9 @@ RUN set -eux; \ | sort -u \ | xargs -r apt-mark manual \ ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + # verify Kyiv timezone isn't missing + gosu redmine bundle exec rake time:zones:all | grep -q 'Kyiv' VOLUME /usr/src/redmine/files diff --git a/6.0/trixie/Dockerfile b/6.0/trixie/Dockerfile index e0e0845..8dcc46d 100644 --- a/6.0/trixie/Dockerfile +++ b/6.0/trixie/Dockerfile @@ -23,6 +23,7 @@ RUN set -eux; \ openssh-client \ subversion \ tini \ + tzdata-legacy \ wget \ ; \ rm -rf /var/lib/apt/lists/* @@ -138,7 +139,9 @@ RUN set -eux; \ | sort -u \ | xargs -r apt-mark manual \ ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + # verify Kyiv timezone isn't missing + gosu redmine bundle exec rake time:zones:all | grep -q 'Kyiv' VOLUME /usr/src/redmine/files diff --git a/6.1/alpine3.22/Dockerfile b/6.1/alpine3.22/Dockerfile index 9249962..c8ac87e 100644 --- a/6.1/alpine3.22/Dockerfile +++ b/6.1/alpine3.22/Dockerfile @@ -132,7 +132,9 @@ RUN set -eux; \ ' \ )"; \ apk add --no-network --virtual .redmine-rundeps $runDeps; \ - apk del --no-network .build-deps + apk del --no-network .build-deps; \ + # verify Kyiv timezone isn't missing + gosu redmine bundle exec rake time:zones:all | grep -q 'Kyiv' VOLUME /usr/src/redmine/files diff --git a/6.1/alpine3.23/Dockerfile b/6.1/alpine3.23/Dockerfile index 16571fd..d8c06b3 100644 --- a/6.1/alpine3.23/Dockerfile +++ b/6.1/alpine3.23/Dockerfile @@ -132,7 +132,9 @@ RUN set -eux; \ ' \ )"; \ apk add --no-network --virtual .redmine-rundeps $runDeps; \ - apk del --no-network .build-deps + apk del --no-network .build-deps; \ + # verify Kyiv timezone isn't missing + gosu redmine bundle exec rake time:zones:all | grep -q 'Kyiv' VOLUME /usr/src/redmine/files diff --git a/6.1/bookworm/Dockerfile b/6.1/bookworm/Dockerfile index b850488..79edf74 100644 --- a/6.1/bookworm/Dockerfile +++ b/6.1/bookworm/Dockerfile @@ -142,7 +142,9 @@ RUN set -eux; \ | sort -u \ | xargs -r apt-mark manual \ ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + # verify Kyiv timezone isn't missing + gosu redmine bundle exec rake time:zones:all | grep -q 'Kyiv' VOLUME /usr/src/redmine/files diff --git a/6.1/trixie/Dockerfile b/6.1/trixie/Dockerfile index 24d9f15..7d369ad 100644 --- a/6.1/trixie/Dockerfile +++ b/6.1/trixie/Dockerfile @@ -23,6 +23,7 @@ RUN set -eux; \ openssh-client \ subversion \ tini \ + tzdata-legacy \ wget \ ; \ rm -rf /var/lib/apt/lists/* @@ -140,7 +141,9 @@ RUN set -eux; \ | sort -u \ | xargs -r apt-mark manual \ ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + # verify Kyiv timezone isn't missing + gosu redmine bundle exec rake time:zones:all | grep -q 'Kyiv' VOLUME /usr/src/redmine/files diff --git a/Dockerfile.template b/Dockerfile.template index 2db9e07..e3cfcd6 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -41,6 +41,11 @@ RUN groupadd -r -g 999 redmine && useradd -r -g redmine -u 999 redmine # debian packages "bzr", "gsfonts", # for generating PNGs of Gantt charts + # redmine needs a rails update that includes https://github.com/rails/rails/pull/57266 + # before it will handle the renamed timezones (they just fail to show in the redmine selector) + if env.variant == "trixie" and IN(env.version; "6.0", "6.1") then + "tzdata-legacy" + else empty end, empty end ] | sort | ( @@ -263,7 +268,7 @@ RUN set -eux; \ ' \ )"; \ apk add --no-network --virtual .redmine-rundeps $runDeps; \ - apk del --no-network .build-deps + apk del --no-network .build-deps; \ {{ ) else ( -}} # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies apt-mark auto '.*' > /dev/null; \ @@ -277,8 +282,10 @@ RUN set -eux; \ | sort -u \ | xargs -r apt-mark manual \ ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ {{ ) end -}} + # verify Kyiv timezone isn't missing + gosu redmine bundle exec rake time:zones:all | grep -q 'Kyiv' VOLUME /usr/src/redmine/files