Skip to content

Commit b5f2b35

Browse files
authored
Merge pull request #50 from gtt-project/ftr/update-dependencies
Upgrades dependencies, fixes #44 and fixes #36
2 parents a5d52f9 + f1bae9a commit b5f2b35

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.6-slim-buster
1+
FROM ruby:2.7-slim-buster
22

33
# explicitly set uid/gid to guarantee that it won't change in the future
44
# the values 999:999 are identical to the current user/group id assigned
@@ -44,7 +44,7 @@ RUN set -eux; \
4444
chown redmine:redmine "$HOME"; \
4545
chmod 1777 "$HOME"
4646

47-
ARG REDMINE_VERSION="4.2.1"
47+
ARG REDMINE_VERSION="4.2.3"
4848
ARG REDMICA_VERSION=""
4949
# ENV REDMINE_DOWNLOAD_SHA256 ad4109c3425f1cfe4c8961f6ae6494c76e20d81ed946caa1e297d9eda13b41b4
5050

@@ -71,7 +71,7 @@ ARG PATCH_DIRS=""
7171
COPY patches/ ./patches/
7272

7373
# for GTT gem native extensions
74-
ARG GEM_PG_VERSION="1.1.4"
74+
ARG GEM_PG_VERSION="1.2.3"
7575
COPY Gemfile.local ./
7676
COPY plugins/ ./plugins/
7777

Gemfile.local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ source 'https://rubygems.org'
22

33
# each plugin's native extensions should be added to here
44
gem "rgeo"
5-
gem "pg", (ENV['GEM_PG_VERSION'] ? "~> #{ENV['GEM_PG_VERSION']}" : "~> 1.1.4")
5+
gem "pg", (ENV['GEM_PG_VERSION'] ? "~> #{ENV['GEM_PG_VERSION']}" : "~> 1.2.3")

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
context: ./
88
dockerfile: ./Dockerfile
99
args:
10-
REDMINE_VERSION: 4.2.2
10+
REDMINE_VERSION: 4.2.3
1111
REDMICA_VERSION: ""
1212
GEM_PG_VERSION: ${GEM_PG_VERSION}
1313
PATCH_STRIP: 1
@@ -53,7 +53,7 @@ services:
5353
restart: always
5454

5555
mapfish-print:
56-
image: camptocamp/mapfish_print:3.27
56+
image: camptocamp/mapfish_print:3.28
5757
ports:
5858
- 8080:8080
5959
environment:

0 commit comments

Comments
 (0)