From c39b9edf8e0d350ef688dccb9f259744f3ce75aa Mon Sep 17 00:00:00 2001 From: Olivier Brisse Date: Thu, 8 Nov 2018 12:56:40 +1100 Subject: [PATCH 1/8] Bump node version --- 2.3/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 920d924..3bff2e1 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -27,7 +27,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 6.12.0 +ENV NODE_VERSION 6.14.4 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ From 55d6ae58a4d82f0bbed217c744b953409ba037e0 Mon Sep 17 00:00:00 2001 From: Olivier Brisse Date: Thu, 8 Nov 2018 22:30:58 +1100 Subject: [PATCH 2/8] enable docker build log --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 17fb0b7..35659da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: script: # Build docker image - cd 2.3/ - - docker build -t maestrano/web-ruby:travis . > /dev/null 2>&1 + - docker build -t maestrano/web-ruby:travis . #======================================= # Test with minimal parameters From bd0993200523f6a95c3ad7ae8ccd274276103abc Mon Sep 17 00:00:00 2001 From: Olivier Brisse Date: Thu, 9 May 2019 17:32:04 +1000 Subject: [PATCH 3/8] Use stretch for 2.3 Use 2.3-stretch as the base image to be consistent with the other ruby versions. We're also using stretch to run our tests on CirleCI. --- 2.3/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index b576d82..3e9c615 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.3-jessie +FROM ruby:2.3-stretch ENV MYSQL_APT_VERSION 0.8.9-1 ENV DEBIAN_FRONTEND noninteractive From b61c3090fadf502834f24f366a3b8de15c81f000 Mon Sep 17 00:00:00 2001 From: Olivier Brisse Date: Tue, 14 May 2019 23:18:26 +1000 Subject: [PATCH 4/8] [MARLIN-882] Enable S3 Signature Version 4 for aws Requests specifying Server Side Encryption with AWS KMS managed keys require AWS Signature Version 4. --- 2.3/docker-entrypoint.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/2.3/docker-entrypoint.sh b/2.3/docker-entrypoint.sh index 102d9a0..5a3a358 100644 --- a/2.3/docker-entrypoint.sh +++ b/2.3/docker-entrypoint.sh @@ -30,6 +30,8 @@ elif [ -n "$S3_URI" ]; then if [ -z "$S3_SECRET_ACCESS_KEY" ]; then opts="--no-sign-request" fi + # Setting Signature Version 4 for S3 Request Authentication + aws configure set s3.signature_version s3v4 AWS_ACCESS_KEY_ID=$S3_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY=$S3_SECRET_ACCESS_KEY AWS_DEFAULT_REGION=$S3_REGION aws s3 cp $opts $S3_URI ./ archive_file=${S3_URI##*/} echo "Unzipping $archive_file" From 85747c45aaff7fc1a76f18082964c10405e922bd Mon Sep 17 00:00:00 2001 From: Olivier Brisse Date: Thu, 8 Nov 2018 22:58:42 +1100 Subject: [PATCH 5/8] Add extra keyserver --- 2.3/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 3e9c615..08e2fae 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -36,6 +36,7 @@ RUN set -ex \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ ; do \ + gpg --keyserver pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" ; \ From 9ec8e2a529a66fc7bf07ec2fe1b4ee10f388004a Mon Sep 17 00:00:00 2001 From: Olivier Brisse Date: Thu, 21 Mar 2019 18:03:21 +1100 Subject: [PATCH 6/8] Fix invalid gem option --- 2.3/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 08e2fae..2af459e 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -92,7 +92,7 @@ RUN gem install foreman \ uglifier:2.1.1 \ uglifier:3.0.2 \ will_paginate:3.0.4 \ - --no-ri --no-rdoc --verbose + --no-document --verbose # Install python 3.5.5 as a stand alone library RUN curl https://www.python.org/ftp/python/3.5.5/Python-3.5.5.tgz | tar xzf - -C /tmp From a3ff7c4465fea7fee3fe0b5c051104722c8f6dc7 Mon Sep 17 00:00:00 2001 From: Olivier Brisse Date: Thu, 23 May 2019 13:03:10 +1000 Subject: [PATCH 7/8] Revert "use mysql-client 5.7+" This reverts commit 6bb2cb3ec36bfca1ea74c8c56943958bf9fcf793. --- 2.3/Dockerfile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 2af459e..a67e0c7 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -1,6 +1,5 @@ FROM ruby:2.3-stretch -ENV MYSQL_APT_VERSION 0.8.9-1 ENV DEBIAN_FRONTEND noninteractive # Install System libraries @@ -12,16 +11,6 @@ RUN apt-get update \ nginx \ supervisor \ awscli \ - lsb-release \ - debconf-utils - -# Use official MySQL repository -RUN wget http://dev.mysql.com/get/mysql-apt-config_${MYSQL_APT_VERSION}_all.deb -RUN echo "mysql-apt-config mysql-apt-config/select-tools select Enabled" | debconf-set-selections -RUN dpkg -i mysql-apt-config_${MYSQL_APT_VERSION}_all.deb \ - && rm -f mysql-apt-config_${MYSQL_APT_VERSION}_all.deb \ - && apt-get update \ - && apt-get install -y libmysqlclient-dev \ && rm -rf /var/lib/apt/lists/* # gpg keys listed at https://github.com/nodejs/node#release-team From 9681d8fca18d6662f8b0132c0b16beac1751a1c8 Mon Sep 17 00:00:00 2001 From: Olivier Brisse Date: Thu, 23 May 2019 13:38:46 +1000 Subject: [PATCH 8/8] Use packaged python3.5 and install pip3 As we're now using stretch as base image, Python 3.5 is already installed so we only need to install pip3 and python3-dev --- 2.3/Dockerfile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index a67e0c7..3126a58 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -11,6 +11,7 @@ RUN apt-get update \ nginx \ supervisor \ awscli \ + python3-dev \ && rm -rf /var/lib/apt/lists/* # gpg keys listed at https://github.com/nodejs/node#release-team @@ -83,18 +84,8 @@ RUN gem install foreman \ will_paginate:3.0.4 \ --no-document --verbose -# Install python 3.5.5 as a stand alone library -RUN curl https://www.python.org/ftp/python/3.5.5/Python-3.5.5.tgz | tar xzf - -C /tmp -RUN cd /tmp/Python-3.5.5 \ - && ./configure --prefix=/opt/python \ - && make \ - && make install - -# Add python3.5 to PATH -ENV PATH="${PATH}:/opt/python/bin" - -# Upgrade pip and wheel -RUN pip3 install pip==10.0.1 wheel==0.31.1 +# Install pip3 +RUN wget https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py # App Support tools RUN mkdir -p /app_support/geocoder \