From b134e3804c75b0feba3dd14c5dcdb6a94e010760 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Tue, 27 Nov 2018 09:16:26 +0100 Subject: [PATCH 1/3] Bump to version 3.4.6; install ruby-rmagick package; fix formatting; #13 --- Dockerfile | 23 ++++++----------------- dogu.json | 2 +- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index eb87877..5804da5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ # registry.cloudogu.com/official/redmine -FROM registry.cloudogu.com/official/base:3.5-5 -MAINTAINER Robert Auer +FROM registry.cloudogu.com/official/base:3.7-1 -LABEL NAME="official/redmine" -LABEL VERSION="3.4.2" +LABEL NAME="official/redmine" \ + VERSION="3.4.6" \ + maintainer="robert.auer@cloudogu.com" # set environment variables -ENV REDMINE_VERSION=3.4.2 \ +ENV REDMINE_VERSION=3.4.6 \ CAS_PLUGIN_VERSION=1.2.13 \ ACTIVERECORD_SESSION_STORE_PLUGIN_VERSION=0.0.1 \ RUBYCASVERSION=2.3.13 \ @@ -25,12 +25,12 @@ RUN set -x \ # add user and group && addgroup -S "${USER}" -g 1000 \ && adduser -S -h "${WORKDIR}" -G "${USER}" -u 1000 -s /bin/bash "${USER}" \ - # install runtime packages && apk --no-cache add --virtual /.run-deps \ postgresql-client \ sqlite-libs \ imagemagick \ + ruby-rmagick \ tzdata \ ruby \ ruby-bigdecimal \ @@ -39,7 +39,6 @@ RUN set -x \ libffi \ su-exec \ git \ - # install build dependencies && apk --no-cache add --virtual /.build-deps \ build-base \ @@ -52,15 +51,12 @@ RUN set -x \ patch \ coreutils \ libffi-dev \ - # update ruby gems && echo 'gem: --no-document' > /etc/gemrc \ && 2>/dev/null 1>&2 gem update --system --quiet \ - # install redmine && mkdir -p ${WORKDIR} \ && curl -L http://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz | tar xfz - --strip-components=1 -C ${WORKDIR} \ - # set temporary database configuration for bundle install && DATABASE_TYPE=postgresql \ DATABASE_IP=localhost \ @@ -68,26 +64,21 @@ RUN set -x \ DATABASE_USER=redmine \ DATABASE_USER_PASSWORD=redmine \ eval "echo \"$(cat ${WORKDIR}/config/database.yml.tpl)\"" > ${WORKDIR}/config/database.yml \ - # Install (available) rubycas-client version && git clone https://github.com/cloudogu/rubycas-client.git \ && cd rubycas-client \ && gem build rubycas-client.gemspec \ && gem install rubycas-client-${RUBYCASVERSION}.gem \ && cd ..; rm -rf rubycas-client \ - # install redmine required gems && echo 'gem "activerecord-session_store"' >> ${WORKDIR}/Gemfile \ && echo 'gem "activerecord-deprecated_finders", require: "active_record/deprecated_finders"' >> ${WORKDIR}/Gemfile \ # json gem missing in default installation? && echo 'gem "json"' >> ${WORKDIR}/Gemfile \ - # install required gems && cd ${WORKDIR}; RAILS_ENV="production" bundle install --without development test \ - # override environment to run redmine with a context path "/redmine" && mv ${WORKDIR}/config/environment.ces.rb ${WORKDIR}/config/environment.rb \ - # install core plugins && mkdir -p "${WORKDIR}/plugins" \ # install cas plugin @@ -100,10 +91,8 @@ RUN set -x \ && curl -sL \ https://github.com/pencil/redmine_activerecord_session_store/archive/v${ACTIVERECORD_SESSION_STORE_PLUGIN_VERSION}.tar.gz \ | tar xfz - --strip-components=1 -C "${WORKDIR}/plugins/redmine_activerecord_session_store" \ - # install plugin gems && cd ${WORKDIR}; RAILS_ENV="production" bundle install --without development test \ - # cleanup && gem cleanup all \ && rm -rf /root/* /tmp/* $(gem env gemdir)/cache \ diff --git a/dogu.json b/dogu.json index a44d491..4c03a8a 100644 --- a/dogu.json +++ b/dogu.json @@ -1,6 +1,6 @@ { "Name": "official/redmine", - "Version": "3.4.2-6", + "Version": "3.4.6-1", "DisplayName": "Redmine", "Description": "Redmine is a flexible project management web application", "Category": "Development Apps", From 058029bc403810aa66480109c07094b098825858 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Tue, 27 Nov 2018 10:59:43 +0100 Subject: [PATCH 2/3] Use latest base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5804da5..f0049d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # registry.cloudogu.com/official/redmine -FROM registry.cloudogu.com/official/base:3.7-1 +FROM registry.cloudogu.com/official/base:3.7-4 LABEL NAME="official/redmine" \ VERSION="3.4.6" \ From c5f567809758531ce1ed3f84a6e2fa0f2f48e133 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Tue, 27 Nov 2018 11:00:24 +0100 Subject: [PATCH 3/3] Get more output out of startup script --- resources/startup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/startup.sh b/resources/startup.sh index 4858358..143e9a9 100755 --- a/resources/startup.sh +++ b/resources/startup.sh @@ -5,25 +5,25 @@ set -o pipefail source /etc/ces/functions.sh -# get variables for templates +echo "get variables for templates" FQDN=$(doguctl config --global fqdn) DOMAIN=$(doguctl config --global domain) ADMIN_GROUP=$(doguctl config --global 'admin_group') MAIL_ADDRESS=$(doguctl config -d "redmine@${DOMAIN}" --global mail_address) RELAYHOST="postfix" -# database connection +echo "get data for database connection" DATABASE_TYPE=postgresql DATABASE_IP=postgresql DATABASE_USER=$(doguctl config -e sa-postgresql/username) DATABASE_USER_PASSWORD=$(doguctl config -e sa-postgresql/password) DATABASE_DB=$(doguctl config -e sa-postgresql/database) -# redmine environment +echo "set redmine environment variables" RAILS_ENV=production REDMINE_LANG=en -# plugin locations +echo "get plugin locations" PLUGIN_STORE="/var/tmp/redmine/plugins" PLUGIN_DIRECTORY="${WORKDIR}/plugins"