From 6f5c04036c0d8b4350c2f409bd6033cfeea376ce Mon Sep 17 00:00:00 2001 From: Jeremy Bailey Date: Wed, 20 Dec 2017 21:04:54 -0800 Subject: [PATCH 1/7] Added Microsoft SQL Server support. Changed "gpg" keyserver to improve reliability. --- 3.2/Dockerfile | 10 +++++++--- 3.2/docker-entrypoint.sh | 13 ++++++++++++- 3.3/Dockerfile | 10 +++++++--- 3.3/docker-entrypoint.sh | 13 ++++++++++++- 3.4/Dockerfile | 10 +++++++--- 3.4/docker-entrypoint.sh | 13 ++++++++++++- Dockerfile.template | 10 +++++++--- docker-entrypoint.sh | 13 ++++++++++++- 8 files changed, 76 insertions(+), 16 deletions(-) diff --git a/3.2/Dockerfile b/3.2/Dockerfile index 25f7d9b8..dcfa29d1 100644 --- a/3.2/Dockerfile +++ b/3.2/Dockerfile @@ -14,7 +14,7 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x036A9C25BF357DD4" \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -26,7 +26,7 @@ RUN set -x \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ + && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x9A84159D7001A4E5" \ && gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \ && rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \ && chmod +x /usr/local/bin/tini \ @@ -67,12 +67,16 @@ RUN buildDeps=' \ libsqlite3-dev \ make \ patch \ + libgmp-dev \ + build-essential \ + wget \ + libc6-dev \ ' \ && set -ex \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && bundle install --without development test \ - && for adapter in mysql2 postgresql sqlite3; do \ + && for adapter in sqlserver mysql2 postgresql sqlite3; do \ echo "$RAILS_ENV:" > ./config/database.yml; \ echo " adapter: $adapter" >> ./config/database.yml; \ bundle install --without development test; \ diff --git a/3.2/docker-entrypoint.sh b/3.2/docker-entrypoint.sh index 5351c9dd..335a45a0 100755 --- a/3.2/docker-entrypoint.sh +++ b/3.2/docker-entrypoint.sh @@ -28,11 +28,14 @@ case "$1" in if [ ! -f './config/database.yml' ]; then file_env 'REDMINE_DB_MYSQL' file_env 'REDMINE_DB_POSTGRES' + file_env 'REDMINE_DB_SQLSERVER' if [ "$MYSQL_PORT_3306_TCP" ] && [ -z "$REDMINE_DB_MYSQL" ]; then export REDMINE_DB_MYSQL='mysql' elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then export REDMINE_DB_POSTGRES='postgres' + elif [ "$POSTGRES_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then + export REDMINE_DB_SQLSERVER='sqlserver' fi if [ "$REDMINE_DB_MYSQL" ]; then @@ -51,9 +54,17 @@ case "$1" in file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_POSTGRES_PASSWORD}" file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_POSTGRES_DB:-${REDMINE_DB_USERNAME:-}}" file_env 'REDMINE_DB_ENCODING' 'utf8' + elif [ "$REDMINE_DB_SQLSERVER" ]; then + adapter='sqlserver' + host="$REDMINE_DB_SQLSERVER" + file_env 'REDMINE_DB_PORT' '1433' + file_env 'REDMINE_DB_USERNAME' "${POSTGRES_ENV_SQLSERVER_USER:-administrator}" + file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_SQLSERVER_PASSWORD}" + file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_SQLSERVER_DB:-${REDMINE_DB_USERNAME:-}}" + file_env 'REDMINE_DB_ENCODING' 'utf8' else echo >&2 - echo >&2 'warning: missing REDMINE_DB_MYSQL or REDMINE_DB_POSTGRES environment variables' + echo >&2 'warning: missing REDMINE_DB_MYSQL, REDMINE_DB_POSTGRES, or REDMINE_DB_SQLSERVER environment variables' echo >&2 echo >&2 '*** Using sqlite3 as fallback. ***' echo >&2 diff --git a/3.3/Dockerfile b/3.3/Dockerfile index c2d48c50..c6a93c72 100644 --- a/3.3/Dockerfile +++ b/3.3/Dockerfile @@ -14,7 +14,7 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x036A9C25BF357DD4" \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -26,7 +26,7 @@ RUN set -x \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ + && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x9A84159D7001A4E5" \ && gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \ && rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \ && chmod +x /usr/local/bin/tini \ @@ -67,12 +67,16 @@ RUN buildDeps=' \ libsqlite3-dev \ make \ patch \ + libgmp-dev \ + build-essential \ + wget \ + libc6-dev \ ' \ && set -ex \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && bundle install --without development test \ - && for adapter in mysql2 postgresql sqlite3; do \ + && for adapter in sqlserver mysql2 postgresql sqlite3; do \ echo "$RAILS_ENV:" > ./config/database.yml; \ echo " adapter: $adapter" >> ./config/database.yml; \ bundle install --without development test; \ diff --git a/3.3/docker-entrypoint.sh b/3.3/docker-entrypoint.sh index 5351c9dd..da1f40cf 100755 --- a/3.3/docker-entrypoint.sh +++ b/3.3/docker-entrypoint.sh @@ -28,11 +28,14 @@ case "$1" in if [ ! -f './config/database.yml' ]; then file_env 'REDMINE_DB_MYSQL' file_env 'REDMINE_DB_POSTGRES' + file_env 'REDMINE_DB_SQLSERVER' if [ "$MYSQL_PORT_3306_TCP" ] && [ -z "$REDMINE_DB_MYSQL" ]; then export REDMINE_DB_MYSQL='mysql' elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then export REDMINE_DB_POSTGRES='postgres' + elif [ "$POSTGRES_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then + export REDMINE_DB_SQLSERVER='sqlserver' fi if [ "$REDMINE_DB_MYSQL" ]; then @@ -51,9 +54,17 @@ case "$1" in file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_POSTGRES_PASSWORD}" file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_POSTGRES_DB:-${REDMINE_DB_USERNAME:-}}" file_env 'REDMINE_DB_ENCODING' 'utf8' + elif [ "$REDMINE_DB_SQLSERVER" ]; then + adapter='sqlserver' + host="$REDMINE_DB_SQLSERVER" + file_env 'REDMINE_DB_PORT' '1433' + file_env 'REDMINE_DB_USERNAME' "${POSTGRES_ENV_SQLSERVER_USER:-administrator}" + file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_SQLSERVER_PASSWORD}" + file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_SQLSERVER_DB:-${REDMINE_DB_USERNAME:-}}" + file_env 'REDMINE_DB_ENCODING' 'utf8' else echo >&2 - echo >&2 'warning: missing REDMINE_DB_MYSQL or REDMINE_DB_POSTGRES environment variables' + echo >&2 'warning: missing REDMINE_DB_MYSQL, REDMINE_DB_POSTGRES, or REDMINE_DB_SQLSERVER environment variables' echo >&2 echo >&2 '*** Using sqlite3 as fallback. ***' echo >&2 diff --git a/3.4/Dockerfile b/3.4/Dockerfile index 759ef291..292385ab 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -14,7 +14,7 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x036A9C25BF357DD4" \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -26,7 +26,7 @@ RUN set -x \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ + && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x9A84159D7001A4E5" \ && gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \ && rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \ && chmod +x /usr/local/bin/tini \ @@ -67,12 +67,16 @@ RUN buildDeps=' \ libsqlite3-dev \ make \ patch \ + libgmp-dev \ + build-essential \ + wget \ + libc6-dev \ ' \ && set -ex \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && bundle install --without development test \ - && for adapter in mysql2 postgresql sqlite3; do \ + && for adapter in sqlserver mysql2 postgresql sqlite3; do \ echo "$RAILS_ENV:" > ./config/database.yml; \ echo " adapter: $adapter" >> ./config/database.yml; \ bundle install --without development test; \ diff --git a/3.4/docker-entrypoint.sh b/3.4/docker-entrypoint.sh index 5351c9dd..da1f40cf 100755 --- a/3.4/docker-entrypoint.sh +++ b/3.4/docker-entrypoint.sh @@ -28,11 +28,14 @@ case "$1" in if [ ! -f './config/database.yml' ]; then file_env 'REDMINE_DB_MYSQL' file_env 'REDMINE_DB_POSTGRES' + file_env 'REDMINE_DB_SQLSERVER' if [ "$MYSQL_PORT_3306_TCP" ] && [ -z "$REDMINE_DB_MYSQL" ]; then export REDMINE_DB_MYSQL='mysql' elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then export REDMINE_DB_POSTGRES='postgres' + elif [ "$POSTGRES_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then + export REDMINE_DB_SQLSERVER='sqlserver' fi if [ "$REDMINE_DB_MYSQL" ]; then @@ -51,9 +54,17 @@ case "$1" in file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_POSTGRES_PASSWORD}" file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_POSTGRES_DB:-${REDMINE_DB_USERNAME:-}}" file_env 'REDMINE_DB_ENCODING' 'utf8' + elif [ "$REDMINE_DB_SQLSERVER" ]; then + adapter='sqlserver' + host="$REDMINE_DB_SQLSERVER" + file_env 'REDMINE_DB_PORT' '1433' + file_env 'REDMINE_DB_USERNAME' "${POSTGRES_ENV_SQLSERVER_USER:-administrator}" + file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_SQLSERVER_PASSWORD}" + file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_SQLSERVER_DB:-${REDMINE_DB_USERNAME:-}}" + file_env 'REDMINE_DB_ENCODING' 'utf8' else echo >&2 - echo >&2 'warning: missing REDMINE_DB_MYSQL or REDMINE_DB_POSTGRES environment variables' + echo >&2 'warning: missing REDMINE_DB_MYSQL, REDMINE_DB_POSTGRES, or REDMINE_DB_SQLSERVER environment variables' echo >&2 echo >&2 '*** Using sqlite3 as fallback. ***' echo >&2 diff --git a/Dockerfile.template b/Dockerfile.template index bd576b2c..76af7835 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -14,7 +14,7 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x036A9C25BF357DD4" \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -26,7 +26,7 @@ RUN set -x \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ + && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x9A84159D7001A4E5" \ && gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \ && rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \ && chmod +x /usr/local/bin/tini \ @@ -67,12 +67,16 @@ RUN buildDeps=' \ libsqlite3-dev \ make \ patch \ + libgmp-dev \ + build-essential \ + wget \ + libc6-dev \ ' \ && set -ex \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && bundle install --without development test \ - && for adapter in mysql2 postgresql sqlite3; do \ + && for adapter in sqlserver mysql2 postgresql sqlite3; do \ echo "$RAILS_ENV:" > ./config/database.yml; \ echo " adapter: $adapter" >> ./config/database.yml; \ bundle install --without development test; \ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 5351c9dd..da1f40cf 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -28,11 +28,14 @@ case "$1" in if [ ! -f './config/database.yml' ]; then file_env 'REDMINE_DB_MYSQL' file_env 'REDMINE_DB_POSTGRES' + file_env 'REDMINE_DB_SQLSERVER' if [ "$MYSQL_PORT_3306_TCP" ] && [ -z "$REDMINE_DB_MYSQL" ]; then export REDMINE_DB_MYSQL='mysql' elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then export REDMINE_DB_POSTGRES='postgres' + elif [ "$POSTGRES_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then + export REDMINE_DB_SQLSERVER='sqlserver' fi if [ "$REDMINE_DB_MYSQL" ]; then @@ -51,9 +54,17 @@ case "$1" in file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_POSTGRES_PASSWORD}" file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_POSTGRES_DB:-${REDMINE_DB_USERNAME:-}}" file_env 'REDMINE_DB_ENCODING' 'utf8' + elif [ "$REDMINE_DB_SQLSERVER" ]; then + adapter='sqlserver' + host="$REDMINE_DB_SQLSERVER" + file_env 'REDMINE_DB_PORT' '1433' + file_env 'REDMINE_DB_USERNAME' "${POSTGRES_ENV_SQLSERVER_USER:-administrator}" + file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_SQLSERVER_PASSWORD}" + file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_SQLSERVER_DB:-${REDMINE_DB_USERNAME:-}}" + file_env 'REDMINE_DB_ENCODING' 'utf8' else echo >&2 - echo >&2 'warning: missing REDMINE_DB_MYSQL or REDMINE_DB_POSTGRES environment variables' + echo >&2 'warning: missing REDMINE_DB_MYSQL, REDMINE_DB_POSTGRES, or REDMINE_DB_SQLSERVER environment variables' echo >&2 echo >&2 '*** Using sqlite3 as fallback. ***' echo >&2 From 2e75b78ad5b6ba768382b9c182d8b4ea0304cc13 Mon Sep 17 00:00:00 2001 From: Jeremy Bailey Date: Wed, 20 Dec 2017 21:35:25 -0800 Subject: [PATCH 2/7] Removing problematic trailing whitespace. --- 3.3/docker-entrypoint.sh | 2 +- 3.4/docker-entrypoint.sh | 2 +- Dockerfile.template | 2 +- docker-entrypoint.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3.3/docker-entrypoint.sh b/3.3/docker-entrypoint.sh index da1f40cf..335a45a0 100755 --- a/3.3/docker-entrypoint.sh +++ b/3.3/docker-entrypoint.sh @@ -57,7 +57,7 @@ case "$1" in elif [ "$REDMINE_DB_SQLSERVER" ]; then adapter='sqlserver' host="$REDMINE_DB_SQLSERVER" - file_env 'REDMINE_DB_PORT' '1433' + file_env 'REDMINE_DB_PORT' '1433' file_env 'REDMINE_DB_USERNAME' "${POSTGRES_ENV_SQLSERVER_USER:-administrator}" file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_SQLSERVER_PASSWORD}" file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_SQLSERVER_DB:-${REDMINE_DB_USERNAME:-}}" diff --git a/3.4/docker-entrypoint.sh b/3.4/docker-entrypoint.sh index da1f40cf..335a45a0 100755 --- a/3.4/docker-entrypoint.sh +++ b/3.4/docker-entrypoint.sh @@ -57,7 +57,7 @@ case "$1" in elif [ "$REDMINE_DB_SQLSERVER" ]; then adapter='sqlserver' host="$REDMINE_DB_SQLSERVER" - file_env 'REDMINE_DB_PORT' '1433' + file_env 'REDMINE_DB_PORT' '1433' file_env 'REDMINE_DB_USERNAME' "${POSTGRES_ENV_SQLSERVER_USER:-administrator}" file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_SQLSERVER_PASSWORD}" file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_SQLSERVER_DB:-${REDMINE_DB_USERNAME:-}}" diff --git a/Dockerfile.template b/Dockerfile.template index 76af7835..2e944a5c 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -70,7 +70,7 @@ RUN buildDeps=' \ libgmp-dev \ build-essential \ wget \ - libc6-dev \ + libc6-dev \ ' \ && set -ex \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index da1f40cf..335a45a0 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -57,7 +57,7 @@ case "$1" in elif [ "$REDMINE_DB_SQLSERVER" ]; then adapter='sqlserver' host="$REDMINE_DB_SQLSERVER" - file_env 'REDMINE_DB_PORT' '1433' + file_env 'REDMINE_DB_PORT' '1433' file_env 'REDMINE_DB_USERNAME' "${POSTGRES_ENV_SQLSERVER_USER:-administrator}" file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_SQLSERVER_PASSWORD}" file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_SQLSERVER_DB:-${REDMINE_DB_USERNAME:-}}" From ee00c883c39879a8a8aed9b80b2a5dcc3d3d0680 Mon Sep 17 00:00:00 2001 From: Jeremy Bailey Date: Wed, 20 Dec 2017 23:04:54 -0800 Subject: [PATCH 3/7] Removing wget from build dependencies. --- 3.2/Dockerfile | 1 - 3.3/Dockerfile | 1 - 3.4/Dockerfile | 1 - Dockerfile.template | 1 - 4 files changed, 4 deletions(-) diff --git a/3.2/Dockerfile b/3.2/Dockerfile index dcfa29d1..7922a872 100644 --- a/3.2/Dockerfile +++ b/3.2/Dockerfile @@ -69,7 +69,6 @@ RUN buildDeps=' \ patch \ libgmp-dev \ build-essential \ - wget \ libc6-dev \ ' \ && set -ex \ diff --git a/3.3/Dockerfile b/3.3/Dockerfile index c6a93c72..a884bfcd 100644 --- a/3.3/Dockerfile +++ b/3.3/Dockerfile @@ -69,7 +69,6 @@ RUN buildDeps=' \ patch \ libgmp-dev \ build-essential \ - wget \ libc6-dev \ ' \ && set -ex \ diff --git a/3.4/Dockerfile b/3.4/Dockerfile index 292385ab..36b63830 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -69,7 +69,6 @@ RUN buildDeps=' \ patch \ libgmp-dev \ build-essential \ - wget \ libc6-dev \ ' \ && set -ex \ diff --git a/Dockerfile.template b/Dockerfile.template index 2e944a5c..8c5e4089 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -69,7 +69,6 @@ RUN buildDeps=' \ patch \ libgmp-dev \ build-essential \ - wget \ libc6-dev \ ' \ && set -ex \ From 43cbc4a7559ee5129af04c1794f1a010a981163b Mon Sep 17 00:00:00 2001 From: Jeremy Bailey Date: Thu, 21 Dec 2017 17:30:55 -0800 Subject: [PATCH 4/7] Applying feedback from tianon, backing out gpg keyserver changes. --- 3.2/Dockerfile | 7 +++---- 3.2/docker-entrypoint.sh | 10 +++++----- 3.3/Dockerfile | 7 +++---- 3.3/docker-entrypoint.sh | 10 +++++----- 3.4/Dockerfile | 7 +++---- 3.4/docker-entrypoint.sh | 10 +++++----- Dockerfile.template | 7 +++---- docker-entrypoint.sh | 10 +++++----- 8 files changed, 32 insertions(+), 36 deletions(-) diff --git a/3.2/Dockerfile b/3.2/Dockerfile index 7922a872..0a9aae89 100644 --- a/3.2/Dockerfile +++ b/3.2/Dockerfile @@ -14,7 +14,7 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x036A9C25BF357DD4" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -26,7 +26,7 @@ RUN set -x \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x9A84159D7001A4E5" \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ && gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \ && rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \ && chmod +x /usr/local/bin/tini \ @@ -68,14 +68,13 @@ RUN buildDeps=' \ make \ patch \ libgmp-dev \ - build-essential \ libc6-dev \ ' \ && set -ex \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && bundle install --without development test \ - && for adapter in sqlserver mysql2 postgresql sqlite3; do \ + && for adapter in mysql2 postgresql sqlserver sqlite3; do \ echo "$RAILS_ENV:" > ./config/database.yml; \ echo " adapter: $adapter" >> ./config/database.yml; \ bundle install --without development test; \ diff --git a/3.2/docker-entrypoint.sh b/3.2/docker-entrypoint.sh index 335a45a0..b8b8bfa6 100755 --- a/3.2/docker-entrypoint.sh +++ b/3.2/docker-entrypoint.sh @@ -34,7 +34,7 @@ case "$1" in export REDMINE_DB_MYSQL='mysql' elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then export REDMINE_DB_POSTGRES='postgres' - elif [ "$POSTGRES_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then + elif [ "$SQLSERVER_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then export REDMINE_DB_SQLSERVER='sqlserver' fi @@ -58,10 +58,10 @@ case "$1" in adapter='sqlserver' host="$REDMINE_DB_SQLSERVER" file_env 'REDMINE_DB_PORT' '1433' - file_env 'REDMINE_DB_USERNAME' "${POSTGRES_ENV_SQLSERVER_USER:-administrator}" - file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_SQLSERVER_PASSWORD}" - file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_SQLSERVER_DB:-${REDMINE_DB_USERNAME:-}}" - file_env 'REDMINE_DB_ENCODING' 'utf8' + file_env 'REDMINE_DB_USERNAME' '' + file_env 'REDMINE_DB_PASSWORD' '' + file_env 'REDMINE_DB_DATABASE' '' + file_env 'REDMINE_DB_ENCODING' '' else echo >&2 echo >&2 'warning: missing REDMINE_DB_MYSQL, REDMINE_DB_POSTGRES, or REDMINE_DB_SQLSERVER environment variables' diff --git a/3.3/Dockerfile b/3.3/Dockerfile index a884bfcd..03883675 100644 --- a/3.3/Dockerfile +++ b/3.3/Dockerfile @@ -14,7 +14,7 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x036A9C25BF357DD4" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -26,7 +26,7 @@ RUN set -x \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x9A84159D7001A4E5" \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ && gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \ && rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \ && chmod +x /usr/local/bin/tini \ @@ -68,14 +68,13 @@ RUN buildDeps=' \ make \ patch \ libgmp-dev \ - build-essential \ libc6-dev \ ' \ && set -ex \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && bundle install --without development test \ - && for adapter in sqlserver mysql2 postgresql sqlite3; do \ + && for adapter in mysql2 postgresql sqlserver sqlite3; do \ echo "$RAILS_ENV:" > ./config/database.yml; \ echo " adapter: $adapter" >> ./config/database.yml; \ bundle install --without development test; \ diff --git a/3.3/docker-entrypoint.sh b/3.3/docker-entrypoint.sh index 335a45a0..b8b8bfa6 100755 --- a/3.3/docker-entrypoint.sh +++ b/3.3/docker-entrypoint.sh @@ -34,7 +34,7 @@ case "$1" in export REDMINE_DB_MYSQL='mysql' elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then export REDMINE_DB_POSTGRES='postgres' - elif [ "$POSTGRES_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then + elif [ "$SQLSERVER_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then export REDMINE_DB_SQLSERVER='sqlserver' fi @@ -58,10 +58,10 @@ case "$1" in adapter='sqlserver' host="$REDMINE_DB_SQLSERVER" file_env 'REDMINE_DB_PORT' '1433' - file_env 'REDMINE_DB_USERNAME' "${POSTGRES_ENV_SQLSERVER_USER:-administrator}" - file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_SQLSERVER_PASSWORD}" - file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_SQLSERVER_DB:-${REDMINE_DB_USERNAME:-}}" - file_env 'REDMINE_DB_ENCODING' 'utf8' + file_env 'REDMINE_DB_USERNAME' '' + file_env 'REDMINE_DB_PASSWORD' '' + file_env 'REDMINE_DB_DATABASE' '' + file_env 'REDMINE_DB_ENCODING' '' else echo >&2 echo >&2 'warning: missing REDMINE_DB_MYSQL, REDMINE_DB_POSTGRES, or REDMINE_DB_SQLSERVER environment variables' diff --git a/3.4/Dockerfile b/3.4/Dockerfile index 36b63830..55947e5e 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -14,7 +14,7 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x036A9C25BF357DD4" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -26,7 +26,7 @@ RUN set -x \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x9A84159D7001A4E5" \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ && gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \ && rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \ && chmod +x /usr/local/bin/tini \ @@ -68,14 +68,13 @@ RUN buildDeps=' \ make \ patch \ libgmp-dev \ - build-essential \ libc6-dev \ ' \ && set -ex \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && bundle install --without development test \ - && for adapter in sqlserver mysql2 postgresql sqlite3; do \ + && for adapter in mysql2 postgresql sqlserver sqlite3; do \ echo "$RAILS_ENV:" > ./config/database.yml; \ echo " adapter: $adapter" >> ./config/database.yml; \ bundle install --without development test; \ diff --git a/3.4/docker-entrypoint.sh b/3.4/docker-entrypoint.sh index 335a45a0..b8b8bfa6 100755 --- a/3.4/docker-entrypoint.sh +++ b/3.4/docker-entrypoint.sh @@ -34,7 +34,7 @@ case "$1" in export REDMINE_DB_MYSQL='mysql' elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then export REDMINE_DB_POSTGRES='postgres' - elif [ "$POSTGRES_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then + elif [ "$SQLSERVER_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then export REDMINE_DB_SQLSERVER='sqlserver' fi @@ -58,10 +58,10 @@ case "$1" in adapter='sqlserver' host="$REDMINE_DB_SQLSERVER" file_env 'REDMINE_DB_PORT' '1433' - file_env 'REDMINE_DB_USERNAME' "${POSTGRES_ENV_SQLSERVER_USER:-administrator}" - file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_SQLSERVER_PASSWORD}" - file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_SQLSERVER_DB:-${REDMINE_DB_USERNAME:-}}" - file_env 'REDMINE_DB_ENCODING' 'utf8' + file_env 'REDMINE_DB_USERNAME' '' + file_env 'REDMINE_DB_PASSWORD' '' + file_env 'REDMINE_DB_DATABASE' '' + file_env 'REDMINE_DB_ENCODING' '' else echo >&2 echo >&2 'warning: missing REDMINE_DB_MYSQL, REDMINE_DB_POSTGRES, or REDMINE_DB_SQLSERVER environment variables' diff --git a/Dockerfile.template b/Dockerfile.template index 8c5e4089..c5d5789d 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -14,7 +14,7 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x036A9C25BF357DD4" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -26,7 +26,7 @@ RUN set -x \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --fetch-key "http://pgp.mit.edu/pks/lookup?op=get&search=0x9A84159D7001A4E5" \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ && gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \ && rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \ && chmod +x /usr/local/bin/tini \ @@ -68,14 +68,13 @@ RUN buildDeps=' \ make \ patch \ libgmp-dev \ - build-essential \ libc6-dev \ ' \ && set -ex \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && bundle install --without development test \ - && for adapter in sqlserver mysql2 postgresql sqlite3; do \ + && for adapter in mysql2 postgresql sqlserver sqlite3; do \ echo "$RAILS_ENV:" > ./config/database.yml; \ echo " adapter: $adapter" >> ./config/database.yml; \ bundle install --without development test; \ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 335a45a0..b8b8bfa6 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -34,7 +34,7 @@ case "$1" in export REDMINE_DB_MYSQL='mysql' elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then export REDMINE_DB_POSTGRES='postgres' - elif [ "$POSTGRES_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then + elif [ "$SQLSERVER_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then export REDMINE_DB_SQLSERVER='sqlserver' fi @@ -58,10 +58,10 @@ case "$1" in adapter='sqlserver' host="$REDMINE_DB_SQLSERVER" file_env 'REDMINE_DB_PORT' '1433' - file_env 'REDMINE_DB_USERNAME' "${POSTGRES_ENV_SQLSERVER_USER:-administrator}" - file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_SQLSERVER_PASSWORD}" - file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_SQLSERVER_DB:-${REDMINE_DB_USERNAME:-}}" - file_env 'REDMINE_DB_ENCODING' 'utf8' + file_env 'REDMINE_DB_USERNAME' '' + file_env 'REDMINE_DB_PASSWORD' '' + file_env 'REDMINE_DB_DATABASE' '' + file_env 'REDMINE_DB_ENCODING' '' else echo >&2 echo >&2 'warning: missing REDMINE_DB_MYSQL, REDMINE_DB_POSTGRES, or REDMINE_DB_SQLSERVER environment variables' From 1685538b83df4047d4ff872255bdc2eb5da302c3 Mon Sep 17 00:00:00 2001 From: Jeremy Bailey Date: Thu, 21 Dec 2017 20:31:16 -0800 Subject: [PATCH 5/7] Fixing previous attempted fix at restoring gpg keyserver. --- 3.2/Dockerfile | 2 +- 3.3/Dockerfile | 2 +- 3.4/Dockerfile | 2 +- Dockerfile.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3.2/Dockerfile b/3.2/Dockerfile index 0a9aae89..91b40185 100644 --- a/3.2/Dockerfile +++ b/3.2/Dockerfile @@ -26,7 +26,7 @@ RUN set -x \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ && gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \ && rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \ && chmod +x /usr/local/bin/tini \ diff --git a/3.3/Dockerfile b/3.3/Dockerfile index 03883675..572e0418 100644 --- a/3.3/Dockerfile +++ b/3.3/Dockerfile @@ -26,7 +26,7 @@ RUN set -x \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ && gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \ && rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \ && chmod +x /usr/local/bin/tini \ diff --git a/3.4/Dockerfile b/3.4/Dockerfile index 55947e5e..274d30f4 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -26,7 +26,7 @@ RUN set -x \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ && gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \ && rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \ && chmod +x /usr/local/bin/tini \ diff --git a/Dockerfile.template b/Dockerfile.template index c5d5789d..2eac2716 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -26,7 +26,7 @@ RUN set -x \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ && gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \ && rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \ && chmod +x /usr/local/bin/tini \ From 5cf25ce75cd3583aeb2760df7948857d63846a5c Mon Sep 17 00:00:00 2001 From: Jeremy Bailey Date: Fri, 22 Dec 2017 16:05:02 -0800 Subject: [PATCH 6/7] Removing default environment variables for SQL server (per @yosifkit) --- 3.2/docker-entrypoint.sh | 2 -- 3.3/docker-entrypoint.sh | 2 -- 3.4/docker-entrypoint.sh | 2 -- docker-entrypoint.sh | 2 -- 4 files changed, 8 deletions(-) diff --git a/3.2/docker-entrypoint.sh b/3.2/docker-entrypoint.sh index b8b8bfa6..e0a4ff5a 100755 --- a/3.2/docker-entrypoint.sh +++ b/3.2/docker-entrypoint.sh @@ -34,8 +34,6 @@ case "$1" in export REDMINE_DB_MYSQL='mysql' elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then export REDMINE_DB_POSTGRES='postgres' - elif [ "$SQLSERVER_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then - export REDMINE_DB_SQLSERVER='sqlserver' fi if [ "$REDMINE_DB_MYSQL" ]; then diff --git a/3.3/docker-entrypoint.sh b/3.3/docker-entrypoint.sh index b8b8bfa6..e0a4ff5a 100755 --- a/3.3/docker-entrypoint.sh +++ b/3.3/docker-entrypoint.sh @@ -34,8 +34,6 @@ case "$1" in export REDMINE_DB_MYSQL='mysql' elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then export REDMINE_DB_POSTGRES='postgres' - elif [ "$SQLSERVER_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then - export REDMINE_DB_SQLSERVER='sqlserver' fi if [ "$REDMINE_DB_MYSQL" ]; then diff --git a/3.4/docker-entrypoint.sh b/3.4/docker-entrypoint.sh index b8b8bfa6..e0a4ff5a 100755 --- a/3.4/docker-entrypoint.sh +++ b/3.4/docker-entrypoint.sh @@ -34,8 +34,6 @@ case "$1" in export REDMINE_DB_MYSQL='mysql' elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then export REDMINE_DB_POSTGRES='postgres' - elif [ "$SQLSERVER_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then - export REDMINE_DB_SQLSERVER='sqlserver' fi if [ "$REDMINE_DB_MYSQL" ]; then diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index b8b8bfa6..e0a4ff5a 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -34,8 +34,6 @@ case "$1" in export REDMINE_DB_MYSQL='mysql' elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then export REDMINE_DB_POSTGRES='postgres' - elif [ "$SQLSERVER_PORT_1433_TCP" ] && [ -z "$REDMINE_DB_SQLSERVER" ]; then - export REDMINE_DB_SQLSERVER='sqlserver' fi if [ "$REDMINE_DB_MYSQL" ]; then From 32d58ced64e30dfdd1695c065f2a05c886ff3b0c Mon Sep 17 00:00:00 2001 From: Jeremy Bailey Date: Tue, 2 Jan 2018 13:21:52 -0800 Subject: [PATCH 7/7] Removing libgmp-dev and libc6-dev, since they may not be required to build TinyTDS gem. --- 3.2/Dockerfile | 2 -- 3.3/Dockerfile | 2 -- 3.4/Dockerfile | 2 -- Dockerfile.template | 2 -- 4 files changed, 8 deletions(-) diff --git a/3.2/Dockerfile b/3.2/Dockerfile index 91b40185..7c9fb140 100644 --- a/3.2/Dockerfile +++ b/3.2/Dockerfile @@ -67,8 +67,6 @@ RUN buildDeps=' \ libsqlite3-dev \ make \ patch \ - libgmp-dev \ - libc6-dev \ ' \ && set -ex \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ diff --git a/3.3/Dockerfile b/3.3/Dockerfile index 572e0418..9f591752 100644 --- a/3.3/Dockerfile +++ b/3.3/Dockerfile @@ -67,8 +67,6 @@ RUN buildDeps=' \ libsqlite3-dev \ make \ patch \ - libgmp-dev \ - libc6-dev \ ' \ && set -ex \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ diff --git a/3.4/Dockerfile b/3.4/Dockerfile index 274d30f4..8b4a55d3 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -67,8 +67,6 @@ RUN buildDeps=' \ libsqlite3-dev \ make \ patch \ - libgmp-dev \ - libc6-dev \ ' \ && set -ex \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ diff --git a/Dockerfile.template b/Dockerfile.template index 2eac2716..3a0a4e02 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -67,8 +67,6 @@ RUN buildDeps=' \ libsqlite3-dev \ make \ patch \ - libgmp-dev \ - libc6-dev \ ' \ && set -ex \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \