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.

Sign up for GitHub

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

Use Debian Stretch and latest NodeJS LTS 10.15.x #135

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use Debian Stretch and latest NodeJS LTS 10.15.x #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd2d867
Use Debian Stretch and latest NodeJS LTS 10.15.x
johndoe75 Apr 1, 2019
8b338d0
Install bcrypt
johndoe75 Apr 1, 2019
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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
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 Down Expand Up @@ -28,7 +28,7 @@ ONBUILD ARG APT_GET_INSTALL
ONBUILD ENV APT_GET_INSTALL $APT_GET_INSTALL

ONBUILD ARG NODE_VERSION
ONBUILD ENV NODE_VERSION ${NODE_VERSION:-8.9.0}
ONBUILD ENV NODE_VERSION ${NODE_VERSION:-10.15.3}

ONBUILD ARG NPM_TOKEN
ONBUILD ENV NPM_TOKEN $NPM_TOKEN
Expand Down
5 changes: 4 additions & 1 deletion scripts/build-meteor.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cd $APP_SOURCE_DIR

# Install app deps
printf "\n[-] Running npm install in app directory...\n\n"
meteor npm install
meteor npm install && meteor npm install bcrypt

# build the bundle
printf "\n[-] Building Meteor application...\n\n"
Expand All @@ -40,3 +40,6 @@ mv $BUILD_SCRIPTS_DIR/entrypoint.sh $APP_BUNDLE_DIR/bundle/entrypoint.sh

# change ownership of the app to the node user
chown -R node:node $APP_BUNDLE_DIR

# Workaround with missing fiber binary. Remove and re-install
npm uninstall fibers && npm install fibers
15 changes: 13 additions & 2 deletions scripts/install-deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apt-get update

# ensure we can get an https apt source if redirected
# https://github.com/jshimko/meteor-launchpad/issues/50
apt-get install -y apt-transport-https ca-certificates
apt-get install -y apt-transport-https ca-certificates gpg

if [ -f $APP_SOURCE_DIR/launchpad.conf ]; then
source <(grep APT_GET_INSTALL $APP_SOURCE_DIR/launchpad.conf)
Expand All @@ -33,7 +33,18 @@ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/downloa

export GNUPGHOME="$(mktemp -d)"

gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
key="B42F6819007F00F88E364FD4036A9C25BF357DD4"

# Try different key servers in case one is unresponsive
# See: https://github.com/bodastage/bts-ce-database/issues/1
for server in ha.pool.sks-keyservers.net \
hkp://p80.pool.sks-keyservers.net:80 \
keyserver.ubuntu.com \
hkp://keyserver.ubuntu.com:80 \
pgp.mit.edu; do
gpg --keyserver "$server" --recv-keys "${key}" && break || echo "Trying new server..."
done

gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu

rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc
Expand Down