From e1fc18ad84726a570288ef99d74609039c1e1fc9 Mon Sep 17 00:00:00 2001 From: johnnyutahio Date: Tue, 26 Mar 2019 14:02:27 -0600 Subject: [PATCH 1/3] updated to use debian:stretch --- Dockerfile | 2 +- scripts/install-deps.sh | 23 +---------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3e7f1c4..c0a08c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch MAINTAINER Jeremy Shimko RUN groupadd -r node && useradd -m -g node node diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh index ef10605..2bbe068 100755 --- a/scripts/install-deps.sh +++ b/scripts/install-deps.sh @@ -21,25 +21,4 @@ if [ -f $APP_SOURCE_DIR/launchpad.conf ]; then fi fi -apt-get install -y --no-install-recommends curl bzip2 bsdtar build-essential python git wget - - -# install gosu - -dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" - -wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" -wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" - -export GNUPGHOME="$(mktemp -d)" - -gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --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 - -gosu nobody true - -apt-get purge -y --auto-remove wget +apt-get install -y --no-install-recommends curl bzip2 bsdtar build-essential python git gnupg gosu From dba31d9f0732de4829e44548bf754488ad2b84ea Mon Sep 17 00:00:00 2001 From: johnnyutahio Date: Wed, 27 Mar 2019 14:04:32 -0600 Subject: [PATCH 2/3] updated install-mongo.sh to refer to stretch --- dev.dockerfile | 2 +- scripts/install-mongo.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev.dockerfile b/dev.dockerfile index 8911919..8703d27 100644 --- a/dev.dockerfile +++ b/dev.dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch MAINTAINER Jeremy Shimko RUN groupadd -r node && useradd -m -g node node diff --git a/scripts/install-mongo.sh b/scripts/install-mongo.sh index 6d41857..555bd83 100755 --- a/scripts/install-mongo.sh +++ b/scripts/install-mongo.sh @@ -11,7 +11,7 @@ if [ "$INSTALL_MONGO" = true ]; then apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 0C49F3730359A14518585931BC711F9BA15703C6 - echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/$MONGO_MAJOR main" > /etc/apt/sources.list.d/mongodb-org.list + echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/$MONGO_MAJOR main" > /etc/apt/sources.list.d/mongodb-org.list apt-get update From e67b7ce1e2b804f6ed5728ededcacd4cee4cd003 Mon Sep 17 00:00:00 2001 From: johnnyutahio Date: Fri, 29 Mar 2019 15:17:38 -0600 Subject: [PATCH 3/3] Changed default Mongo DB version to 4.0.8 --- Dockerfile | 4 ++-- dev.dockerfile | 4 ++-- scripts/install-mongo.sh | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index c0a08c0..263d62d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,8 @@ RUN groupadd -r node && useradd -m -g node node ENV GOSU_VERSION 1.10 # MongoDB -ENV MONGO_VERSION 3.4.10 -ENV MONGO_MAJOR 3.4 +ENV MONGO_VERSION 4.0.8 +ENV MONGO_MAJOR 4.0 ENV MONGO_PACKAGE mongodb-org # PhantomJS diff --git a/dev.dockerfile b/dev.dockerfile index 8703d27..aa707c3 100644 --- a/dev.dockerfile +++ b/dev.dockerfile @@ -9,8 +9,8 @@ ENV DEV_BUILD true ENV GOSU_VERSION 1.10 # MongoDB -ENV MONGO_VERSION 3.4.10 -ENV MONGO_MAJOR 3.4 +ENV MONGO_VERSION 4.0.8 +ENV MONGO_MAJOR 4.0 ENV MONGO_PACKAGE mongodb-org # PhantomJS diff --git a/scripts/install-mongo.sh b/scripts/install-mongo.sh index 555bd83..feff322 100755 --- a/scripts/install-mongo.sh +++ b/scripts/install-mongo.sh @@ -9,7 +9,9 @@ fi if [ "$INSTALL_MONGO" = true ]; then printf "\n[-] Installing MongoDB ${MONGO_VERSION}...\n\n" - apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 0C49F3730359A14518585931BC711F9BA15703C6 + apt install dirmngr + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 + apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 0C49F3730359A14518585931BC711F9BA15703C6 echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/$MONGO_MAJOR main" > /etc/apt/sources.list.d/mongodb-org.list