Skip to content

Commit

Permalink
fix to build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
khaledfarah committed Mar 31, 2019
1 parent 60da3d0 commit 2c5b570
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:jessie
FROM debian:stable
MAINTAINER Jeremy Shimko <[email protected]>

RUN groupadd -r node && useradd -m -g node node
Expand All @@ -22,7 +22,6 @@ ENV BUILD_SCRIPTS_DIR /opt/build_scripts
# Add entrypoint and build scripts
COPY scripts $BUILD_SCRIPTS_DIR
RUN chmod -R 750 $BUILD_SCRIPTS_DIR

# Define all --build-arg options
ONBUILD ARG APT_GET_INSTALL
ONBUILD ENV APT_GET_INSTALL $APT_GET_INSTALL
Expand Down Expand Up @@ -74,4 +73,4 @@ WORKDIR $APP_BUNDLE_DIR/bundle

# start the app
ENTRYPOINT ["./entrypoint.sh"]
CMD ["node", "main.js"]
CMD ["node", "main.js"]
Empty file modified HISTORY.md
100644 → 100755
Empty file.
Empty file modified LICENSE.md
100644 → 100755
Empty file.
7 changes: 3 additions & 4 deletions scripts/install-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ 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

if [ -f $APP_SOURCE_DIR/launchpad.conf ]; then
source <(grep APT_GET_INSTALL $APP_SOURCE_DIR/launchpad.conf)

Expand All @@ -21,7 +20,7 @@ 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
apt-get install -y --no-install-recommends curl bzip2 bsdtar build-essential python git wget gnupg2 dirmngr


# install gosu
Expand All @@ -33,8 +32,8 @@ 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
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu
#gpg --keyserver hkps://hkps.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

Expand Down

0 comments on commit 2c5b570

Please sign in to comment.