Prepare versionbump

Author: Markus M. May

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.3.1-2
+current_version = 3.4.2-0
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)-(?P<image_version>\d+)
 serialize = 
 	{major}.{minor}.{patch}-{image_version}

Changelog.md

@@ -1,6 +1,11 @@
 # Changelog
 
-**3.3.1-3 (WIP)**
+**WIP**
+
+**3.4.2-1**
+- version bump to latest version of redmine (3.4.2)
+
+**3.3.1-3**
 - change SCM-creator to redmine_git_remote, which is simpler
 
 **3.3.1-2**

Dockerfile

@@ -1,7 +1,8 @@
 FROM sameersbn/ubuntu:14.04.20161014
 MAINTAINER sameer@damagehead.com
 
-ENV REDMINE_VERSION=3.3.1 \
+ENV RUBY_VERSION=2.3 \
+    REDMINE_VERSION=3.4.2 \
     REDMINE_USER="redmine" \
     REDMINE_HOME="/home/redmine" \
     REDMINE_LOG_DIR="/var/log/redmine" \
@@ -23,8 +24,8 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv E1DD270288B4E6030699E45F
  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate nginx mysql-client postgresql-client \
-      imagemagick git rsync ruby2.1 locales openssh-client gcc g++ make patch pkg-config gettext-base \
-      ruby2.1-dev libc6-dev zlib1g-dev libxml2-dev libmysqlclient18 libpq5 libyaml-0-2 libcurl3 libssl1.0.0 \
+      imagemagick git rsync ruby${RUBY_VERSION} locales openssh-client gcc g++ make patch pkg-config gettext-base \
+      ruby${RUBY_VERSION}-dev libc6-dev zlib1g-dev libxml2-dev libmysqlclient18 libpq5 libyaml-0-2 libcurl3 libssl1.0.0 \
       uuid-dev xz-utils libxslt1.1 libffi6 zlib1g gsfonts \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && gem install --no-document bundler \

Makefile

@@ -14,6 +14,7 @@ help:
 	@echo "   3. make stop        - stop redmine"
 	@echo "   4. make logs        - view logs"
 	@echo "   5. make purge       - stop and remove the container"
+	@echo "   6. make bump        - bump the version of this container"
 
 build:
 	@docker build --tag=${IMAGE_NAME} .

README.md

@@ -61,9 +61,7 @@ OpenId-Configuration: https://key.phreevpn.net/auth/realms/devopskube/.well-know
 
 ## Version
 
-Current Version: **devopskube/redmine:3.3.1-2**
-
-*P.S.: If your installation depends on various third party plugins, please stick with 2.6.xx series to avoid breakage.*
+Current Version: **devopskube/redmine:3.4.2-1**
 
 # Contributing
 

VERSION

@@ -1 +1 @@
-3.3.1
+3.4.2

assets/build/install.sh

@@ -74,6 +74,7 @@ if [[ -d ${GEM_CACHE_DIR} ]]; then
   chown -R ${REDMINE_USER}: ${REDMINE_INSTALL_DIR}/vendor/cache
 fi
 
+## START DEVOPSKUBE MODIFICATIONS
 # install redmine git_remote https://github.com/devopskube/redmine_git_remote
 REDMINE_GIT_REMOTE_VERSION=0.0.2
 exec_as_redmine wget "https://github.com/devopskube/redmine_git_remote/archive/${REDMINE_GIT_REMOTE_VERSION}.tar.gz" -O /tmp/redmine-git-remote-${REDMINE_GIT_REMOTE_VERSION}.tar.gz
@@ -86,8 +87,9 @@ exec_as_redmine git clone https://github.com/koppen/redmine_github_hook.git ${RE
 
 # install redmine_openid_connect
 exec_as_redmine git clone https://bitbucket.org/triplem74/redmine_openid_connect.git ${REDMINE_INSTALL_DIR}/plugins/redmine_openid_connect
+exec_as_redmine mkdir -p ${REDMINE_DATA_DIR}/git
+## END DEVOPSKUBE MODIFICATIONS
 
-# Install redmine and above mentioned plugin(s)
 exec_as_redmine bundle install -j$(nproc) --without development test --path ${REDMINE_INSTALL_DIR}/vendor/bundle
 
 # finalize redmine installation
@@ -201,5 +203,5 @@ stderr_logfile=${REDMINE_LOG_DIR}/supervisor/%(program_name)s.log
 EOF
 
 # purge build dependencies and cleanup apt
-DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove ${BUILD_DEPENDENCIES}
+apt-get purge -y --auto-remove ${BUILD_DEPENDENCIES}
 rm -rf /var/lib/apt/lists/*

assets/runtime/config/nginx/redmine

@@ -22,6 +22,7 @@ server {
   location {{REDMINE_RELATIVE_URL_ROOT}} {
     ## Serve static files from defined root folder.
     ## @redmine is a named location for the upstream fallback, see below.
+    ## rewrite ^{{REDMINE_RELATIVE_URL_ROOT}}(.*)$ /$1 break;
     try_files $uri index.html $uri.html @redmine;
   }
 
@@ -36,6 +37,10 @@ server {
     proxy_read_timeout      300;
     proxy_connect_timeout   300;
     proxy_redirect          off;
+    ## Long issue filters require increasing proxy buffers
+    proxy_buffers 8 8k;
+    proxy_buffer_size 32k;
+    proxy_busy_buffers_size 32k;
 
     proxy_set_header    Host                $http_host;
     proxy_set_header    X-Real-IP           $remote_addr;

assets/runtime/config/nginx/redmine-ssl

@@ -11,7 +11,7 @@ server {
   listen [::]:80 default_server;
   server_name _;
   server_tokens off;
-  
+
   ## Redirects all traffic to the HTTPS host
   return 301 https://$host:{{REDMINE_PORT}}$request_uri;
 }
@@ -69,6 +69,7 @@ server {
   location {{REDMINE_RELATIVE_URL_ROOT}} {
     ## Serve static files from defined root folder.
     ## @redmine is a named location for the upstream fallback, see below.
+    ## rewrite ^{{REDMINE_RELATIVE_URL_ROOT}}(.*)$ /$1 break;
     try_files $uri index.html $uri.html @redmine;
   }
 
@@ -83,6 +84,10 @@ server {
     proxy_read_timeout      300;
     proxy_connect_timeout   300;
     proxy_redirect          off;
+    ## Long issue filters require increasing proxy buffers
+    proxy_buffers 8 8k;
+    proxy_buffer_size 32k;
+    proxy_busy_buffers_size 32k;
 
     proxy_set_header    Host                $http_host;
     proxy_set_header    X-Real-IP           $remote_addr;

assets/runtime/config/redmine/openid_connect_init.rb

@@ -8,7 +8,7 @@
   author 'Alfonso Juan Dillera'
   description 'OpenID Connect implementation for Redmine'
   version '0.9.1'
-  url 'http://bitbucket.org/intelimina/redmine_openid_connect'
+  url 'https://bitbucket.org/triplem74/redmine_openid_connect'
   author_url 'http://github.com/adillera'
 
   settings :default => {

assets/runtime/config/redmine/settings.yml

@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2016  Jean-Philippe Lang
+# Copyright (C) 2006-2017  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

assets/runtime/env-defaults

@@ -98,10 +98,14 @@ IMAP_PORT=${IMAP_PORT:-993}
 IMAP_USER=${IMAP_USER:-${SMTP_USER}}
 IMAP_PASS=${IMAP_PASS:-${SMTP_PASS}}
 IMAP_SSL=${IMAP_SSL:-true}
+IMAP_STARTTLS=${IMAP_STARTTLS:-false}
 IMAP_INTERVAL=${IMAP_INTERVAL:-30}
 IMAP_ENABLED=${IMAP_ENABLED:-false}
 
 ## INCOMING MAIL (ADVANCED CONFIGURATION)
+IMAP_FOLDER=${IMAP_FOLDER:-}
+IMAP_MOVE_ON_SUCCESS=${IMAP_MOVE_ON_SUCCESS:-}
+IMAP_MOVE_ON_FAILURE=${IMAP_MOVE_ON_FAILURE:-}
 INCOMING_EMAIL_UNKNOWN_USER=${INCOMING_EMAIL_UNKNOWN_USER:-ignore}
 INCOMING_EMAIL_NO_PERMISSION_CHECK=${INCOMING_EMAIL_NO_PERMISSION_CHECK:-false}
 INCOMING_EMAIL_NO_ACCOUNT_NOTICE=${INCOMING_EMAIL_NO_ACCOUNT_NOTICE:-true}
@@ -131,12 +135,7 @@ else
   NGINX_X_FORWARDED_PROTO=${NGINX_X_FORWARDED_PROTO:-\$scheme}
 fi
 
-## REDMINE GIT REMOTE PLUGIN
-REDMINE_SCM_DIR=${REDMINE_SCM_DIR:-$REDMINE_DATA_DIR/git}
-
-## INITIAL SETTINGS.YML SETTINGS
-MAIL_SENDER=${MAIL_SENDER:-redmine@example.net}
-
+## DEVOPSKUBE specific
 ## SETTINGS FOR REDMINE_OPENID_CONNECT PLUGIN
 OPENID_ENABLED=${OPENDID_ENABLED:-false}
 KEYCLOAK_PROTOCOL=${KEYCLOAK_PROTOCOL:-https}