Update redmine #6298
Merged
Update redmine #6298
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/redmine@3a13d8f: Merge pull request docker-library/redmine#166 from J0WI/buster - docker-library/redmine@9aef5e5: Upgrade to Debian Buster
Diff:diff --git a/redmine_3/Dockerfile b/redmine_3/Dockerfile
index c07d135..a0393bc 100644
--- a/redmine_3/Dockerfile
+++ b/redmine_3/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.4-slim-stretch
+FROM ruby:2.4-slim-buster
# 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
@@ -97,6 +97,7 @@ RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends \
dpkg-dev \
+ freetds-dev \
gcc \
libmagickcore-dev \
libmagickwand-dev \
@@ -105,27 +106,9 @@ RUN set -eux; \
libsqlite3-dev \
make \
patch \
- \
-# tiny_tds 1.0.x requires OpenSSL 1.0
-# see https://github.com/rails-sqlserver/tiny_tds/commit/3269dd3bcfbe4201ab51aa2870a6aaddfcbdfa5d (tiny_tds 1.2.x+ is required for OpenSSL 1.1 support)
- libssl1.0-dev \
; \
rm -rf /var/lib/apt/lists/*; \
\
-# https://github.com/travis-ci/travis-ci/issues/9391 (can't let "tiny_tds" download FreeTDS for us because FTP)
-# https://github.com/rails-sqlserver/tiny_tds/pull/384 (newer version uses HTTP!)
-# https://github.com/rails-sqlserver/tiny_tds/pull/345 (... but then can't download it for us)
-# http://www.freetds.org/files/stable/?C=M;O=D
-# (if/when we update to Debian Buster and thus get FreeTDS newer than 0.95 in the distro, we can switch back to simply installing "freetds-dev" from Debian)
- wget -O freetds.tar.bz2 'http://www.freetds.org/files/stable/freetds-1.00.91.tar.bz2'; \
- echo '8d71f9f29be0fe0637e443dd3807b3fd *freetds.tar.bz2' | md5sum -c -; \
- mkdir freetds; \
- tar -xf freetds.tar.bz2 -C freetds --strip-components=1; \
- rm freetds.tar.bz2; \
- ( cd freetds && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" && ./configure --build="$gnuArch" --enable-silent-rules && make -j "$(nproc)" && make -C src install && make -C include install ); \
- rm -rf freetds; \
- gosu redmine bundle config build.tiny_tds --enable-system-freetds; \
- \
gosu redmine bundle install --without development test; \
for adapter in mysql2 postgresql sqlserver sqlite3; do \
echo "$RAILS_ENV:" > ./config/database.yml; \
diff --git a/redmine_latest/Dockerfile b/redmine_latest/Dockerfile
index 3411799..2694396 100644
--- a/redmine_latest/Dockerfile
+++ b/redmine_latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.6-slim-stretch
+FROM ruby:2.6-slim-buster
# 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
@@ -97,6 +97,7 @@ RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends \
dpkg-dev \
+ freetds-dev \
gcc \
libmagickcore-dev \
libmagickwand-dev \
@@ -105,27 +106,9 @@ RUN set -eux; \
libsqlite3-dev \
make \
patch \
- \
-# tiny_tds 1.0.x requires OpenSSL 1.0
-# see https://github.com/rails-sqlserver/tiny_tds/commit/3269dd3bcfbe4201ab51aa2870a6aaddfcbdfa5d (tiny_tds 1.2.x+ is required for OpenSSL 1.1 support)
- libssl1.0-dev \
; \
rm -rf /var/lib/apt/lists/*; \
\
-# https://github.com/travis-ci/travis-ci/issues/9391 (can't let "tiny_tds" download FreeTDS for us because FTP)
-# https://github.com/rails-sqlserver/tiny_tds/pull/384 (newer version uses HTTP!)
-# https://github.com/rails-sqlserver/tiny_tds/pull/345 (... but then can't download it for us)
-# http://www.freetds.org/files/stable/?C=M;O=D
-# (if/when we update to Debian Buster and thus get FreeTDS newer than 0.95 in the distro, we can switch back to simply installing "freetds-dev" from Debian)
- wget -O freetds.tar.bz2 'http://www.freetds.org/files/stable/freetds-1.00.91.tar.bz2'; \
- echo '8d71f9f29be0fe0637e443dd3807b3fd *freetds.tar.bz2' | md5sum -c -; \
- mkdir freetds; \
- tar -xf freetds.tar.bz2 -C freetds --strip-components=1; \
- rm freetds.tar.bz2; \
- ( cd freetds && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" && ./configure --build="$gnuArch" --enable-silent-rules && make -j "$(nproc)" && make -C src install && make -C include install ); \
- rm -rf freetds; \
- gosu redmine bundle config build.tiny_tds --enable-system-freetds; \
- \
gosu redmine bundle install --without development test; \
for adapter in mysql2 postgresql sqlserver sqlite3; do \
echo "$RAILS_ENV:" > ./config/database.yml; \ |
|
Build test of #6298; 1f057a2; $ bashbrew build redmine:4.0.4
Building bashbrew/cache:ee3b444b8d54c51d53af2b76d5b73d64f8bdf8541cad2fbaa74c555b3a95607e (redmine:4.0.4)
Tagging redmine:4.0.4
Tagging redmine:4.0
Tagging redmine:4
Tagging redmine:latest
$ test/run.sh redmine:4.0.4
testing redmine:4.0.4
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'redmine-basics' [5/5].......passed
$ bashbrew build redmine:4.0.4-passenger
Building bashbrew/cache:000a3c1dc47d8a6d0c795cea4e361826f0f2b474dd8567d33252dc07f5899304 (redmine:4.0.4-passenger)
Tagging redmine:4.0.4-passenger
Tagging redmine:4.0-passenger
Tagging redmine:4-passenger
Tagging redmine:passenger
$ test/run.sh redmine:4.0.4-passenger
testing redmine:4.0.4-passenger
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'redmine-basics' [5/5]......passed
$ bashbrew build redmine:3.4.11
Building bashbrew/cache:33faf15d8dd1ba82f6a275dfa247cd27d0220b1efc3edec5ef81b836c51296fe (redmine:3.4.11)
Tagging redmine:3.4.11
Tagging redmine:3.4
Tagging redmine:3
$ test/run.sh redmine:3.4.11
testing redmine:3.4.11
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'redmine-basics' [5/5]......passed
$ bashbrew build redmine:3.4.11-passenger
Building bashbrew/cache:e3cececcb7ea5c91b729910572402faac295bcd332ed61e51505794fe73a3a84 (redmine:3.4.11-passenger)
Tagging redmine:3.4.11-passenger
Tagging redmine:3.4-passenger
Tagging redmine:3-passenger
$ test/run.sh redmine:3.4.11-passenger
testing redmine:3.4.11-passenger
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'redmine-basics' [5/5].....passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: