diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 index 4a8eaac..4c2fee7 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,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 @@ -75,4 +74,4 @@ WORKDIR $APP_BUNDLE_DIR/bundle # start the app ENTRYPOINT ["./entrypoint.sh"] -CMD ["node", "main.js"] +CMD ["node", "main.js"] \ No newline at end of file diff --git a/HISTORY.md b/HISTORY.md old mode 100644 new mode 100755 diff --git a/LICENSE.md b/LICENSE.md old mode 100644 new mode 100755 diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh index 927471e..be0abb1 100755 --- a/scripts/install-deps.sh +++ b/scripts/install-deps.sh @@ -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) @@ -21,7 +20,7 @@ if [ -f $APP_SOURCE_DIR/launchpad.conf ]; then fi fi -apt-get install -y --no-install-recommends curl bzip2 libarchive-tools build-essential python git wget +apt-get install -y --no-install-recommends curl bzip2 libarchive-tools build-essential python git wget gnupg2 dirmngr # install gosu @@ -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