Skip to content

Commit

Permalink
Merge branch 'release/v5.0.8-1'
Browse files Browse the repository at this point in the history
  • Loading branch information
sklein94 authored and cesmarvin committed Mar 7, 2024
2 parents 90cc7cd + f4b1544 commit a8aff3d
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 21 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [v5.0.8-1] - 2024-03-07
### Changed
- Update Redmine to version 5.0.8
- 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-4] - 2024-01-24
### Fixed
- Add bigdecimal bundle as a dependency of the `helpdesk` plugin
Expand Down
18 changes: 8 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# registry.cloudogu.com/official/redmine
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="[email protected]"

ENV USER=redmine \
Expand All @@ -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.0.8 \
REDMINE_TARGZ_SHA256=1eda410840a21ab0f6965a378699a65588b6785db95eaf6494c6c9bc51b5bf6e \
REDMINE_PATH="/usr/share/webapps/redmine" \
# Rest-API-Plugin version
EXTENDED_REST_API_PLUGIN_VERSION=1.1.0 \
Expand All @@ -28,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.0 \
CAS_PLUGIN_TARGZ_SHA256=062207dfc5ebc624458e25e41da8bfbebcf8d962f60b442a957c4617017e2090 \
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 \
Expand Down Expand Up @@ -132,19 +131,18 @@ RUN set -eux -o pipefail \
&& bundle config set --local without 'development test' \
&& bundle install \
&& gem install puma \
&& gem install bigdecimal -v 3.1.5 \
&& bundle add bigdecimal --version=3.1.5 \
# 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 \
&& apk --purge del /.build-deps \
&& 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
Expand Down
2 changes: 1 addition & 1 deletion dogu.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
19 changes: 9 additions & 10 deletions resources/startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ echo " 'V/(/////////////////////////////V' "

SETUP_DONE_KEY="startup/setup_done"


# import util functions:
# - create_secrets_yml
# - render_config_ru_template
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit a8aff3d

Please sign in to comment.