laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/38418?usp=email )
Change subject: redmine: upgrae our docker container to 5.1.3 ......................................................................
redmine: upgrae our docker container to 5.1.3
Change-Id: Ie65cfa0cfb4b1914966525be0d8db77dc98b7fa0 --- M gerrit/Dockerfile M redmine/Dockerfile R redmine/commitlog-references-oshash-5.1.3.diff D redmine/hmac.diff 4 files changed, 10 insertions(+), 32 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/18/38418/1
diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index c1c3777..175a58b 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.8.6 +FROM gerritcodereview/gerrit:3.9.5
USER root RUN yum -y install zip unzip patch diff --git a/redmine/Dockerfile b/redmine/Dockerfile index d6125cb..d48977f 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -1,4 +1,4 @@ -FROM redmine:4.2-passenger +FROM redmine:5.1.3
RUN apt-get update && \ apt-get -y upgrade && \ @@ -9,16 +9,15 @@ patch && \ apt-get clean
-# no longer needed after ruby-openid-2.9.2 is used -#ADD hmac.diff /tmp/hmac.diff -#RUN cd / && patch -p0 < /tmp/hmac.diff +# needed after 5.0.0 removes openID [client] support +RUN gem install ruby-openid rack-openid
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
-ADD commitlog-references-oshash.diff /tmp/commitlog-references-oshash.diff -RUN cd /usr/src/redmine && patch -p1 < /tmp/commitlog-references-oshash.diff +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
ADD docker-entrypoint-osmo.sh / ENTRYPOINT ["/docker-entrypoint-osmo.sh"] -CMD ["passenger", "start"] +CMD ["rails", "server", "-b", "0.0.0.0"] diff --git a/redmine/commitlog-references-oshash.diff b/redmine/commitlog-references-oshash-5.1.3.diff similarity index 82% rename from redmine/commitlog-references-oshash.diff rename to redmine/commitlog-references-oshash-5.1.3.diff index e7b4cf8..11004c7 100644 --- a/redmine/commitlog-references-oshash.diff +++ b/redmine/commitlog-references-oshash-5.1.3.diff @@ -1,5 +1,5 @@ diff --git a/app/models/changeset.rb b/app/models/changeset.rb -index f1580ce33..748c66ddc 100644 +index 9ee758128..cc92217e5 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -136,7 +136,7 @@ class Changeset < ActiveRecord::Base @@ -15,8 +15,8 @@ refs = match[3] next unless action.present? || ref_keywords_any
-- refs.scan(/#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m| -+ refs.scan(/OS#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m| +- refs.scan(/#(\d+)(\s+@#{TIMELOG_RE})?/o).each do |m| ++ refs.scan(/OS#(\d+)(\s+@#{TIMELOG_RE})?/o).each do |m| issue = find_referenced_issue_by_id(m[0].to_i) hours = m[2] if issue && !issue_linked_to_same_commit?(issue) diff --git a/redmine/hmac.diff b/redmine/hmac.diff deleted file mode 100644 index 197960b..0000000 --- a/redmine/hmac.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- usr/local/bundle/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb.old 2018-10-07 08:53:33.612724431 +0000 -+++ usr/local/bundle/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb 2018-10-07 08:54:03.016525355 +0000 -@@ -39,6 +39,6 @@ - def CryptUtil.hmac_sha1(key, text) -- if Digest.const_defined? :HMAC -- Digest::HMAC.new(key,Digest::SHA1).update(text).digest -+ if defined? OpenSSL -+ OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new, key, text) - else - return HMAC::SHA1.digest(key, text) - end -@@ -50,7 +50,7 @@ - - def CryptUtil.hmac_sha256(key, text) -- if Digest.const_defined? :HMAC -- Digest::HMAC.new(key,Digest::SHA256).update(text).digest -+ if defined? OpenSSL -+ OpenSSL::HMAC.digest(OpenSSL::Digest::SHA256.new, key, text) - else - return HMAC::SHA256.digest(key, text) - end
-
laforge