Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to use debian:stretch #130

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:jessie
FROM debian:stretch
MAINTAINER Jeremy Shimko <[email protected]>

RUN groupadd -r node && useradd -m -g node node
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions dev.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:jessie
FROM debian:stretch
MAINTAINER Jeremy Shimko <[email protected]>

RUN groupadd -r node && useradd -m -g node node
Expand All @@ -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
Expand Down
23 changes: 1 addition & 22 deletions scripts/install-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions scripts/install-mongo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ 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 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

Expand Down