From 2c5b5700eb64046f715f0c8a6b693be6483e78d0 Mon Sep 17 00:00:00 2001 From: Khaled Farah Date: Sun, 31 Mar 2019 17:15:22 +0400 Subject: [PATCH 1/4] fix to build issues --- Dockerfile | 5 ++--- HISTORY.md | 0 LICENSE.md | 0 scripts/install-deps.sh | 7 +++---- 4 files changed, 5 insertions(+), 7 deletions(-) mode change 100644 => 100755 Dockerfile mode change 100644 => 100755 HISTORY.md mode change 100644 => 100755 LICENSE.md diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 index 3e7f1c4..c12f6ed --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stable MAINTAINER Jeremy Shimko RUN groupadd -r node && useradd -m -g node node @@ -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 @@ -74,4 +73,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 ef10605..7be4630 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 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 @@ -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 From 88bd807c1755782eb1eb994118de92e087163c92 Mon Sep 17 00:00:00 2001 From: Daniel Gustaw Date: Fri, 10 Sep 2021 13:56:12 +0200 Subject: [PATCH 2/4] jesse to stable --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3e7f1c4..e47c072 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stable MAINTAINER Jeremy Shimko RUN groupadd -r node && useradd -m -g node node From d1644f073a79b7d7da5be1093d9af83f68fddfdf Mon Sep 17 00:00:00 2001 From: Daniel Gustaw Date: Fri, 10 Sep 2021 13:56:40 +0200 Subject: [PATCH 3/4] jessie to stable in dev --- dev.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev.dockerfile b/dev.dockerfile index 8911919..861577b 100644 --- a/dev.dockerfile +++ b/dev.dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stable MAINTAINER Jeremy Shimko RUN groupadd -r node && useradd -m -g node node From defa2ad1eb45b267927a6e6b3dc2b86f18dacdd9 Mon Sep 17 00:00:00 2001 From: Daniel Gustaw Date: Fri, 10 Sep 2021 18:09:06 +0200 Subject: [PATCH 4/4] Probaly fixed bsdtar problem --- .gitignore | 1 + scripts/install-deps.sh | 2 +- scripts/install-meteor.sh | 2 +- scripts/post-build-cleanup.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..485dee6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh index 7be4630..be0abb1 100755 --- a/scripts/install-deps.sh +++ b/scripts/install-deps.sh @@ -20,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 gnupg2 dirmngr +apt-get install -y --no-install-recommends curl bzip2 libarchive-tools build-essential python git wget gnupg2 dirmngr # install gosu diff --git a/scripts/install-meteor.sh b/scripts/install-meteor.sh index 4a49a4d..962b23c 100755 --- a/scripts/install-meteor.sh +++ b/scripts/install-meteor.sh @@ -19,7 +19,7 @@ else # replace tar command with bsdtar in the install script (bsdtar -xf "$TARBALL_FILE" -C "$INSTALL_TMPDIR") # https://github.com/jshimko/meteor-launchpad/issues/39 - sed -i.bak "s/tar -xzf.*/bsdtar -xf \"\$TARBALL_FILE\" -C \"\$INSTALL_TMPDIR\"/g" /tmp/install_meteor.sh + sed -i.bak "s/tar -xzf.*/tar -xf \"\$TARBALL_FILE\" -C \"\$INSTALL_TMPDIR\"/g" /tmp/install_meteor.sh # install printf "\n[-] Installing Meteor $METEOR_VERSION...\n\n" diff --git a/scripts/post-build-cleanup.sh b/scripts/post-build-cleanup.sh index e388e01..77bcb8a 100755 --- a/scripts/post-build-cleanup.sh +++ b/scripts/post-build-cleanup.sh @@ -28,7 +28,7 @@ rm -rf /opt/nodejs/bin/npm rm -rf /opt/nodejs/lib/node_modules/npm/ # remove os dependencies -apt-get purge -y --auto-remove apt-transport-https build-essential bsdtar bzip2 ca-certificates curl git python +apt-get purge -y --auto-remove apt-transport-https build-essential libarchive-tools bzip2 ca-certificates curl git python apt-get -y autoremove apt-get -y clean apt-get -y autoclean