laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/42917?usp=email )
Change subject: redmine: upgrade to 6.1.3
......................................................................
redmine: upgrade to 6.1.3
* Use the redmine:6.1.3 image from upstream (the sysmocom registry image
was a workaround for 5.1.11).
* Install nkf with native extensions (needs gcc, libc6-dev, make) for
the redmine_openid_provider plugin. This was not needed for the
redmine 5 container, it was probably bundled there already.
* Upgrade "activerecord-session_store" to version 2.2.0, which is
compatible with redmine 6.
Related: SYS#8097
Change-Id: I3e7f746b1a96ff98bbdea2e043a88b9a492672d2
---
M redmine/0001-Set-session_store-to-active_record_store.patch
M redmine/Dockerfile
2 files changed, 10 insertions(+), 6 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/redmine/0001-Set-session_store-to-active_record_store.patch
b/redmine/0001-Set-session_store-to-active_record_store.patch
index 47efd2c..b27caee 100644
--- a/redmine/0001-Set-session_store-to-active_record_store.patch
+++ b/redmine/0001-Set-session_store-to-active_record_store.patch
@@ -19,7 +19,7 @@
gem 'rubyzip', '~> 2.3.0'
+# OS#5476
-+gem 'activerecord-session_store', '~> 2.0.0'
++gem 'activerecord-session_store', '~> 2.2.0'
+
# Ruby Standard Gems
gem 'csv', '~> 3.2.6'
diff --git a/redmine/Dockerfile b/redmine/Dockerfile
index b0b14c7..adcef31 100644
--- a/redmine/Dockerfile
+++ b/redmine/Dockerfile
@@ -1,17 +1,21 @@
-#FROM redmine:5.1.10
-FROM registry.sysmocom.de/redmine-base:5.1.11
+FROM redmine:6.1.3
RUN apt-get update && \
apt-get -y upgrade && \
apt-get install -y --no-install-recommends \
+ gcc \
graphviz \
imagemagick \
+ libc6-dev \
+ make \
mscgen \
- patch && \
+ patch \
+ && \
apt-get clean
-# needed after 5.0.0 removes openID [client] support
-RUN gem install ruby-openid rack-openid
+# {ruby,rack}-openid: needed after 5.0.0 removes openID [client] support
+# nkf: needed for redmine 6 to run redmine_openid_provider
+RUN gem install ruby-openid rack-openid nkf
ADD openid_server_length_empty.diff /tmp/openid_server_length_empty.diff
RUN cd /usr/local/bundle/gems/ruby-openid-2.9.2 && patch -p1 <
/tmp/openid_server_length_empty.diff
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/42917?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I3e7f746b1a96ff98bbdea2e043a88b9a492672d2
Gerrit-Change-Number: 42917
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
