Updated debian version in dev.docker + added nointeractive frontedn o…

…n debian image
jshimko · Dec 14, 2021 · ea6ce13 · ea6ce13
1 parent 67d6f41
commit ea6ce13
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,6 @@
 FROM debian:stable
 MAINTAINER Jeremy Shimko <[email protected]>
+ARG DEBIAN_FRONTEND=noninteractive
 
 RUN groupadd -r node && useradd -m -g node node
 
@@ -28,7 +29,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:-14.17.4}
 
 ONBUILD ARG NPM_TOKEN
 ONBUILD ENV NPM_TOKEN $NPM_TOKEN

diff --git a/dev.dockerfile b/dev.dockerfile
@@ -1,5 +1,6 @@
-FROM debian:jessie
+FROM debian:stable
 MAINTAINER Jeremy Shimko <[email protected]>
+ARG DEBIAN_FRONTEND=noninteractive
 
 RUN groupadd -r node && useradd -m -g node node
 
@@ -34,7 +35,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:-14.17.4}
 
 ONBUILD ARG INSTALL_MONGO
 ONBUILD ENV INSTALL_MONGO ${INSTALL_MONGO:-true}

diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh
@@ -21,7 +21,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 libarchive-tools build-essential python git wget
 
 
 # install gosu

diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,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 libarchive-tools build-essential python git wget
     # install gosu
@@ Expand Down @@