laforge submitted this change.

Approvals:
  fixeria: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

update redmine to latest 5.1.7 (security update)

Change-Id: Ia628674900376623626d8ad5f2a97324ed8780a1
---
M redmine/Dockerfile
D redmine/changeset_r23408.diff
2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/redmine/Dockerfile b/redmine/Dockerfile
index 19c701b..0fea460 100644
--- a/redmine/Dockerfile
+++ b/redmine/Dockerfile
@@ -1,4 +1,4 @@
-FROM redmine:5.1.5
+FROM redmine:5.1.7
 
 RUN	apt-get update && \
 	apt-get -y upgrade && \
@@ -18,11 +18,6 @@
 ADD	commitlog-references-oshash-5.1.3.diff /tmp/commitlog-references-oshash-5.1.3.diff
 RUN	cd /usr/src/redmine && patch -p1 < /tmp/commitlog-references-oshash-5.1.3.diff
 
-# https://www.redmine.org/issues/42013
-# https://www.redmine.org/projects/redmine/repository/svn/revisions/23408/diff/trunk/Gemfile
-ADD	changeset_r23408.diff /tmp/changeset_r23408.diff
-RUN	cd /usr/src/redmine && patch -p0 < /tmp/changeset_r23408.diff
-
 ADD	docker-entrypoint-osmo.sh /
 ENTRYPOINT ["/docker-entrypoint-osmo.sh"]
 CMD	["rails", "server", "-b", "0.0.0.0"]
diff --git a/redmine/changeset_r23408.diff b/redmine/changeset_r23408.diff
deleted file mode 100644
index d466a61..0000000
--- a/redmine/changeset_r23408.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Gemfile.orig        2025-01-06 10:18:09.938286940 +0000
-+++ Gemfile     2025-01-06 10:18:33.674878971 +0000
-@@ -74,7 +74,7 @@
-   if adapters.any?
-     adapters.each do |adapter|
-       case adapter.strip
--      when 'mysql2'
-+      when /mysql2/
-         gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]
-         gem "with_advisory_lock"
-       when /postgresql/

To view, visit change 39779. To unsubscribe, or for help writing mail filters, visit settings.