Upgrade galaxy base image to latest ubuntu LTS. Also update cached no…

…de js versions
meteor · Apr 23, 2021 · 93d0399 · 93d0399
1 parent 44d2c23
commit 93d0399
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/galaxy-app/Dockerfile b/galaxy-app/Dockerfile
@@ -1,4 +1,4 @@
-FROM meteor/ubuntu:20160830T182201Z_0f378f5
+FROM meteor/ubuntu:20210319
 
 # Make sure we have xz-utils so we can untar node binary, and jq to parse
 # star.json to choose the npm version.
@@ -9,7 +9,7 @@ RUN apt-get update && \
 ADD ./app /app
 RUN mkdir -p /app/bundle
 
-# Include some popular versions of Node (last updated 2018-Jun-26; see
+# Include some popular versions of Node (last updated 2020-Apr-23; see
 # docs/galaxy/base_image.md in the internal services repo for details on how to
 # collect these stats). This reduces the size of the non-base image layers and
 # speeds up app builds for apps using these versions. Other versions will still
@@ -22,7 +22,15 @@ RUN mkdir -p /app/bundle
 # Node is installed in a base image and npm is upgraded in the next image. So
 # it's OK for setup.sh to install both Node and npm for older versions, but not
 # for us to "cache" older Node versions.
-RUN NODE_VERSION="8.9.4" /app/install_node.sh
-RUN NODE_VERSION="8.11.1" /app/install_node.sh
+#2.1
+RUN NODE_VERSION="12.22.0" /app/install_node.sh
+#2.0
+RUN NODE_VERSION="12.20.1" /app/install_node.sh
+#1.10.2
+RUN NODE_VERSION="12.16.1" /app/install_node.sh
+#1.8.1
+RUN NODE_VERSION="8.15.1" /app/install_node.sh
+
+
 
 CMD ["/app/run.sh"]
diff --git a/galaxy-puppeteer/Dockerfile b/galaxy-puppeteer/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && \
 ADD ./app /app
 RUN mkdir -p /app/bundle
 
-# Include some popular versions of Node (last updated 2018-Jun-26; see
+# Include some popular versions of Node (last updated 2020-Apr-23; see
 # docs/galaxy/base_image.md in the internal services repo for details on how to
 # collect these stats). This reduces the size of the non-base image layers and
 # speeds up app builds for apps using these versions. Other versions will still
@@ -22,7 +22,14 @@ RUN mkdir -p /app/bundle
 # Node is installed in a base image and npm is upgraded in the next image. So
 # it's OK for setup.sh to install both Node and npm for older versions, but not
 # for us to "cache" older Node versions.
+#2.1
+RUN NODE_VERSION="12.22.0" /app/install_node.sh
+#2.0
 RUN NODE_VERSION="12.20.1" /app/install_node.sh
+#1.10.2
+RUN NODE_VERSION="12.16.1" /app/install_node.sh
+#1.8.1
+RUN NODE_VERSION="8.15.1" /app/install_node.sh
 
 RUN apt-get update \
     && apt-get install -y wget gnupg \