From 115290c30195000ad5bf1059be83f39f58b83163 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sun, 12 Jun 2022 16:38:04 -0700
Subject: [PATCH] Add nvm for node management
Adding to the PHP images because certain WP-specific Grunt tasks rely on PHP,
so it makes sense to have it all in one place.
See also https://git.ethitter.com/gitlab/ci/wordpress/-/issues/1
---
php/5.6/Dockerfile | 2 ++
php/7.0/Dockerfile | 2 ++
php/7.1/Dockerfile | 2 ++
php/7.2/Dockerfile | 2 ++
php/7.3/Dockerfile | 2 ++
php/7.4/Dockerfile | 2 ++
php/8.1/Dockerfile | 2 ++
7 files changed, 14 insertions(+)
diff --git a/php/5.6/Dockerfile b/php/5.6/Dockerfile
index 9ea37ab..ea0fcd8 100644
--- a/php/5.6/Dockerfile
+++ b/php/5.6/Dockerfile
@@ -35,7 +35,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
&& chmod +x /usr/local/bin/composer \
&& composer --version \
+ && mkdir $NVM_DIR \
&& curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+ && . $NVM_DIR/nvm.sh \
&& nvm --version
ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/7.0/Dockerfile b/php/7.0/Dockerfile
index 76854b8..72fa36e 100644
--- a/php/7.0/Dockerfile
+++ b/php/7.0/Dockerfile
@@ -35,7 +35,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
&& chmod +x /usr/local/bin/composer \
&& composer --version \
+ && mkdir $NVM_DIR \
&& curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+ && . $NVM_DIR/nvm.sh \
&& nvm --version
ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/7.1/Dockerfile b/php/7.1/Dockerfile
index 6de65ff..78dbd25 100644
--- a/php/7.1/Dockerfile
+++ b/php/7.1/Dockerfile
@@ -35,7 +35,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
&& chmod +x /usr/local/bin/composer \
&& composer --version \
+ && mkdir $NVM_DIR \
&& curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+ && . $NVM_DIR/nvm.sh \
&& nvm --version
ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/7.2/Dockerfile b/php/7.2/Dockerfile
index 60c46d4..b76b3a4 100644
--- a/php/7.2/Dockerfile
+++ b/php/7.2/Dockerfile
@@ -36,7 +36,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
&& chmod +x /usr/local/bin/composer \
&& composer --version \
+ && mkdir $NVM_DIR \
&& curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+ && . $NVM_DIR/nvm.sh \
&& nvm --version
ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/7.3/Dockerfile b/php/7.3/Dockerfile
index 0840ee7..696c8c8 100644
--- a/php/7.3/Dockerfile
+++ b/php/7.3/Dockerfile
@@ -36,7 +36,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
&& chmod +x /usr/local/bin/composer \
&& composer --version \
+ && mkdir $NVM_DIR \
&& curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+ && . $NVM_DIR/nvm.sh \
&& nvm --version
ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/7.4/Dockerfile b/php/7.4/Dockerfile
index 78783ce..96672f6 100644
--- a/php/7.4/Dockerfile
+++ b/php/7.4/Dockerfile
@@ -36,7 +36,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
&& chmod +x /usr/local/bin/composer \
&& composer --version \
+ && mkdir $NVM_DIR \
&& curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+ && . $NVM_DIR/nvm.sh \
&& nvm --version
ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/8.1/Dockerfile b/php/8.1/Dockerfile
index 0083291..2d05777 100644
--- a/php/8.1/Dockerfile
+++ b/php/8.1/Dockerfile
@@ -36,7 +36,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
&& chmod +x /usr/local/bin/composer \
&& composer --version \
+ && mkdir $NVM_DIR \
&& curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+ && . $NVM_DIR/nvm.sh \
&& nvm --version
ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
--
GitLab