Nodesource script not required for buster

michaelmcandrew · Jun 28, 2021 · 8bc5014 · 8bc5014
1 parent 87fe9a6
commit 8bc5014
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 17 deletions.
diff --git a/civicrm/Dockerfile b/civicrm/Dockerfile
@@ -26,13 +26,15 @@ FROM php:7.3-apache-stretch
 # * vim
 # * less
 
+# debian stretch requires nodejs setup script
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-  apt-transport-https
+  apt-transport-https \
+  && curl -sL https://deb.nodesource.com/setup_14.x | bash -
 
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
-  && apt-get update \
+RUN apt-get update \
   && apt-get install -y --no-install-recommends \
+  apt-transport-https \
   bash-completion \
   default-mysql-client \
   git \

diff --git a/publish/civicrm/php7.2/Dockerfile b/publish/civicrm/php7.2/Dockerfile
@@ -26,13 +26,15 @@ FROM php:7.2-apache-stretch
 # * vim
 # * less
 
+# debian stretch requires nodejs setup script
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-  apt-transport-https
+  apt-transport-https \
+  && curl -sL https://deb.nodesource.com/setup_14.x | bash -
 
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
-  && apt-get update \
+RUN apt-get update \
   && apt-get install -y --no-install-recommends \
+  apt-transport-https \
   bash-completion \
   default-mysql-client \
   git \

diff --git a/publish/civicrm/php7.3/Dockerfile b/publish/civicrm/php7.3/Dockerfile
@@ -26,13 +26,15 @@ FROM php:7.3-apache-stretch
 # * vim
 # * less
 
+# debian stretch requires nodejs setup script
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-  apt-transport-https
+  apt-transport-https \
+  && curl -sL https://deb.nodesource.com/setup_14.x | bash -
 
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
-  && apt-get update \
+RUN apt-get update \
   && apt-get install -y --no-install-recommends \
+  apt-transport-https \
   bash-completion \
   default-mysql-client \
   git \

diff --git a/publish/civicrm/php7.4/Dockerfile b/publish/civicrm/php7.4/Dockerfile
@@ -26,13 +26,10 @@ FROM php:7.4-apache-buster
 # * vim
 # * less
 
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
-  apt-transport-https
 
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
-  && apt-get update \
+RUN apt-get update \
   && apt-get install -y --no-install-recommends \
+  apt-transport-https \
   bash-completion \
   default-mysql-client \
   git \

diff --git a/publish/templates/civicrm/Dockerfile.twig b/publish/templates/civicrm/Dockerfile.twig
@@ -30,13 +30,17 @@ FROM php:{{ php_version }}-apache-buster
 # * vim
 # * less
 
+{% if php_version in ['7.2', '7.3'] %}
+# debian stretch requires nodejs setup script
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-  apt-transport-https
+  apt-transport-https \
+  && curl -sL https://deb.nodesource.com/setup_14.x | bash -
+{% endif %}
 
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
-  && apt-get update \
+RUN apt-get update \
   && apt-get install -y --no-install-recommends \
+  apt-transport-https \
   bash-completion \
   default-mysql-client \
   git \