Skip to content

Commit

Permalink
Merge pull request #115 from infosiftr/ruby-version
Browse files Browse the repository at this point in the history
Update Redmine 3.3 to use Ruby 2.3, remove Redmine 3.2 (Ruby 2.2 only -- now EOL)
  • Loading branch information
tianon committed May 24, 2018
2 parents 6283032 + bd4e9e8 commit 358b045
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 265 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ services: docker
env:
- VERSION=3.4
- VERSION=3.3
- VERSION=3.2

install:
- git clone https://github.com/docker-library/official-images.git ~/official-images
Expand Down
91 changes: 0 additions & 91 deletions 3.2/Dockerfile

This file was deleted.

152 changes: 0 additions & 152 deletions 3.2/docker-entrypoint.sh

This file was deleted.

18 changes: 0 additions & 18 deletions 3.2/passenger/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion 3.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.2-slim
FROM ruby:2.3-slim

# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
RUN groupadd -r redmine && useradd -r -g redmine redmine
Expand Down
3 changes: 1 addition & 2 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ set -eo pipefail
# see https://www.redmine.org/projects/redmine/wiki/redmineinstall
defaultRubyVersion='2.4'
declare -A rubyVersions=(
[3.3]='2.2'
[3.2]='2.2'
[3.3]='2.3'
)

cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
Expand Down

0 comments on commit 358b045

Please sign in to comment.