From e2c5eaf6d5b2d0f4917194f9b3141963fdd836f0 Mon Sep 17 00:00:00 2001 From: Simon Klein Date: Fri, 1 Mar 2024 13:00:53 +0100 Subject: [PATCH 1/9] #126 Update cas plugin version --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0b3a1ec..4fa7e0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,8 +28,8 @@ ENV USER=redmine \ ACTIVERECORD_TARGZ_SHA256=6e9bdeef6ddaef3b997251418647bd17b11bb10d36b7a2ad27f387cb511858ea \ ACTIVERECORD_SESSION_STORE_PLUGIN_PATH="/usr/share/webapps/redmine/defaultPlugins/redmine_activerecord_session_store" \ # CAS-Plugin version - CAS_PLUGIN_VERSION=2.1.0 \ - CAS_PLUGIN_TARGZ_SHA256=062207dfc5ebc624458e25e41da8bfbebcf8d962f60b442a957c4617017e2090 \ + CAS_PLUGIN_VERSION=2.1.1 \ + CAS_PLUGIN_TARGZ_SHA256=d326207bbe86a82e95c41278553ce216713b3ad3755a10138d742816c213aeba \ CAS_PLUGIN_PATH="/usr/share/webapps/redmine/defaultPlugins/redmine_cas" \ # Cloudogu theme version CLOUDOGU_THEME_VERSION=2.15.0-2 \ From aff9ee612d5ac5b66fa1708c6faab3a2cddda0e2 Mon Sep 17 00:00:00 2001 From: Simon Klein Date: Fri, 1 Mar 2024 13:01:35 +0100 Subject: [PATCH 2/9] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9626d0b..dd05300 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed +- Update cas plugin to version 2.1.1 + - This will fix a bug where the user data was not updated on login (#126) ## [v5.0.5-1] - 2023-07-31 ### Changed From ca52ccf4f9b4065ed371c713a6ced8fd8ed6dc3d Mon Sep 17 00:00:00 2001 From: Philipp Pixel Date: Tue, 5 Mar 2024 16:31:58 +0100 Subject: [PATCH 3/9] #126 Update to Redmine 5.1, update alpine base As of now, the current Alpine 3.18 Ruby package is versioned as 3.2.2. This makes the build fail because Redmine 5.0 requires Ruby up to 3.2.0. Patching the Redmine Gemfile to support Ruby 3.2.2 does not work because it breaks compiling the `pg` gem, probably others as well (but docker build stops here). --- CHANGELOG.md | 3 ++- Dockerfile | 11 +++-------- resources/startup.sh | 19 +++++++++---------- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd05300..622d54d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Changed -- Update cas plugin to version 2.1.1 +- Update Redmine to version 5.1.2 +- Update CAS plugin to version 2.1.1 - This will fix a bug where the user data was not updated on login (#126) ## [v5.0.5-1] - 2023-07-31 diff --git a/Dockerfile b/Dockerfile index 4fa7e0a..13eccc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -# registry.cloudogu.com/official/redmine -FROM registry.cloudogu.com/official/base:3.17.3-2 +FROM registry.cloudogu.com/official/base:3.18.3-1 LABEL NAME="official/redmine" \ VERSION="5.0.5-1" \ @@ -16,8 +15,8 @@ ENV USER=redmine \ RUBYCASVERSION=2.4.0 \ RUBYCAS_TARGZ_SHA256=1fb29cf6a2331dc91b7cdca3d9b231866a4cfc36c4c5f03cedd89c74cc5aae05 \ # Redmine version - REDMINE_VERSION=5.0.5 \ - REDMINE_TARGZ_SHA256=a89ad1c4bb9bf025e6527c77ab18c8faf7749c94a975caf2cfdbba00eb12a481 \ + REDMINE_VERSION=5.1.2 \ + REDMINE_TARGZ_SHA256=26c0ca0a9aaee1ceb983825bf1266c99b0850bf013c178713f5a3b0080012123 \ REDMINE_PATH="/usr/share/webapps/redmine" \ # Rest-API-Plugin version EXTENDED_REST_API_PLUGIN_VERSION=1.1.0 \ @@ -139,10 +138,6 @@ RUN set -eux -o pipefail \ && rm -rf /var/cache/apk/* \ && apk add ruby-irb -# set workdir -WORKDIR ${WORKDIR} - -# expose application port EXPOSE 3000 HEALTHCHECK --interval=5s CMD doguctl healthy redmine || exit 1 diff --git a/resources/startup.sh b/resources/startup.sh index eb49a22..92123e2 100755 --- a/resources/startup.sh +++ b/resources/startup.sh @@ -17,7 +17,6 @@ echo " 'V/(/////////////////////////////V' " SETUP_DONE_KEY="startup/setup_done" - # import util functions: # - create_secrets_yml # - render_config_ru_template @@ -35,7 +34,7 @@ sourceUtilExitCode=0 # shellcheck disable=SC1091 source "${STARTUP_DIR}"/util.sh || sourceUtilExitCode=$? if [[ ${sourceUtilExitCode} -ne 0 ]]; then - echo "ERROR: An error occurred while sourcing util functions."; + echo "ERROR: An error occurred while sourcing util functions." doguctl state "ErrorSourceUtilFunctions" sleep 300 exit 2 @@ -46,17 +45,17 @@ function setDoguLogLevel() { currentLogLevel=$(doguctl config --default "WARN" "logging/root") case "${currentLogLevel}" in - "ERROR") - export REDMINE_LOGLEVEL=":error" + "ERROR") + export REDMINE_LOGLEVEL=":error" ;; - "INFO") - export REDMINE_LOGLEVEL=":info" + "INFO") + export REDMINE_LOGLEVEL=":info" ;; - "DEBUG") - export REDMINE_LOGLEVEL=":debug" + "DEBUG") + export REDMINE_LOGLEVEL=":debug" ;; - *) - export REDMINE_LOGLEVEL=":warn" + *) + export REDMINE_LOGLEVEL=":warn" ;; esac doguctl template /usr/share/webapps/redmine/config/additional_environment.rb.tpl /usr/share/webapps/redmine/config/additional_environment.rb From 939ed7de84eefb2a0fc846ee66e5e5ccfa59e351 Mon Sep 17 00:00:00 2001 From: Philipp Pixel Date: Wed, 6 Mar 2024 10:17:02 +0100 Subject: [PATCH 4/9] #126 Fix defect after reverted refactoring in Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 13eccc4..9876529 100644 --- a/Dockerfile +++ b/Dockerfile @@ -138,6 +138,8 @@ RUN set -eux -o pipefail \ && rm -rf /var/cache/apk/* \ && apk add ruby-irb +WORKDIR ${WORKDIR} + EXPOSE 3000 HEALTHCHECK --interval=5s CMD doguctl healthy redmine || exit 1 From 7462356941cb88a99b60935cf4e1f93287833c74 Mon Sep 17 00:00:00 2001 From: Philipp Pixel Date: Wed, 6 Mar 2024 12:40:46 +0100 Subject: [PATCH 5/9] #126 Downgrade Redmine back to 5.0.8 version --- CHANGELOG.md | 2 +- Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 622d54d..2bb1e80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Changed -- Update Redmine to version 5.1.2 +- Update Redmine to version 5.0.8 - Update CAS plugin to version 2.1.1 - This will fix a bug where the user data was not updated on login (#126) diff --git a/Dockerfile b/Dockerfile index 9876529..56657fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.cloudogu.com/official/base:3.18.3-1 +FROM registry.cloudogu.com/official/base:3.17.3-2 LABEL NAME="official/redmine" \ VERSION="5.0.5-1" \ @@ -15,8 +15,8 @@ ENV USER=redmine \ RUBYCASVERSION=2.4.0 \ RUBYCAS_TARGZ_SHA256=1fb29cf6a2331dc91b7cdca3d9b231866a4cfc36c4c5f03cedd89c74cc5aae05 \ # Redmine version - REDMINE_VERSION=5.1.2 \ - REDMINE_TARGZ_SHA256=26c0ca0a9aaee1ceb983825bf1266c99b0850bf013c178713f5a3b0080012123 \ + REDMINE_VERSION=5.0.8 \ + REDMINE_TARGZ_SHA256=1eda410840a21ab0f6965a378699a65588b6785db95eaf6494c6c9bc51b5bf6e \ REDMINE_PATH="/usr/share/webapps/redmine" \ # Rest-API-Plugin version EXTENDED_REST_API_PLUGIN_VERSION=1.1.0 \ From aae5246079eda062a7af392618ce2c34e789e0f1 Mon Sep 17 00:00:00 2001 From: Philipp Pixel Date: Wed, 6 Mar 2024 17:03:06 +0100 Subject: [PATCH 6/9] Upgrade redmine_cas plugin to even newer version. --- CHANGELOG.md | 3 ++- Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bb1e80..7f3104a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Changed - Update Redmine to version 5.0.8 -- Update CAS plugin to version 2.1.1 +- Update CAS plugin to version 2.1.2 - This will fix a bug where the user data was not updated on login (#126) + - This will also fix an error response when a ticket parameter inside an HTTP POST body was mistaken to be a CAS service ticket parameter ## [v5.0.5-1] - 2023-07-31 ### Changed diff --git a/Dockerfile b/Dockerfile index 56657fd..41af973 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,8 +27,8 @@ ENV USER=redmine \ ACTIVERECORD_TARGZ_SHA256=6e9bdeef6ddaef3b997251418647bd17b11bb10d36b7a2ad27f387cb511858ea \ ACTIVERECORD_SESSION_STORE_PLUGIN_PATH="/usr/share/webapps/redmine/defaultPlugins/redmine_activerecord_session_store" \ # CAS-Plugin version - CAS_PLUGIN_VERSION=2.1.1 \ - CAS_PLUGIN_TARGZ_SHA256=d326207bbe86a82e95c41278553ce216713b3ad3755a10138d742816c213aeba \ + CAS_PLUGIN_VERSION=2.1.2 \ + CAS_PLUGIN_TARGZ_SHA256=0a0234fca4224aa3da47e60fb20f633a6a11f328dfdac11c33548bfbd6dd1baf \ CAS_PLUGIN_PATH="/usr/share/webapps/redmine/defaultPlugins/redmine_cas" \ # Cloudogu theme version CLOUDOGU_THEME_VERSION=2.15.0-2 \ From 9dc17340b590c2faa4af300bbabc4d2c5598854a Mon Sep 17 00:00:00 2001 From: Simon Klein Date: Thu, 7 Mar 2024 09:18:26 +0100 Subject: [PATCH 7/9] #123 Add missing dependency on bigdecimal This dependency was added because it was not possible to install the dependency on dogu runtime. As many tools may require the dependency, it was added to the Dockerfile to make sure it exists. Otherwise the dogu may not be compatible with some RedmineUp Plugins. --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 41af973..3395445 100644 --- a/Dockerfile +++ b/Dockerfile @@ -131,6 +131,9 @@ RUN set -eux -o pipefail \ && bundle config set --local without 'development test' \ && bundle install \ && gem install puma \ + # Do not remove the dependency on bigdecimal. Many tools rely on bigdecimal, and it may not be possible to install it in a running dogu + && gem install bigdecimal -v 3.1.6 \ + && bundle add bigdecimal --version=3.1.6 \ # cleanup && gem cleanup all \ && rm -rf /root/* /tmp/* $(gem env gemdir)/cache \ From 643c2dd326e2593ae3c7bd5e8ac4aa2440a151b0 Mon Sep 17 00:00:00 2001 From: Simon Klein Date: Thu, 7 Mar 2024 14:30:56 +0100 Subject: [PATCH 8/9] Bump version --- Dockerfile | 2 +- dogu.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 417bb78..0b3cdb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.cloudogu.com/official/base:3.17.3-2 LABEL NAME="official/redmine" \ - VERSION="5.0.5-4" \ + VERSION="5.0.8-1" \ maintainer="hello@cloudogu.com" ENV USER=redmine \ diff --git a/dogu.json b/dogu.json index e8f3789..ad5daaa 100644 --- a/dogu.json +++ b/dogu.json @@ -1,6 +1,6 @@ { "Name": "official/redmine", - "Version": "5.0.5-4", + "Version": "5.0.8-1", "DisplayName": "Redmine", "Description": "Redmine is a flexible project management web application", "Category": "Development Apps", From f4b1544fc95cfdd136f22592c0f0f8d3b6a629e4 Mon Sep 17 00:00:00 2001 From: Simon Klein Date: Thu, 7 Mar 2024 14:31:07 +0100 Subject: [PATCH 9/9] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20dab71..8b9983e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [v5.0.8-1] - 2024-03-07 ### Changed - Update Redmine to version 5.0.8 - Update CAS plugin to version 2.1.2