From e3cddebf68b7a58d89550b40cab7d36a51406a46 Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 2 Jun 2024 14:35:34 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile.10 Dockerfile.12 Dockerfile.14 Dockerfile.16 Dockerfile.18 Dockerfile.20 --- Dockerfile.10 | 8 +++++--- Dockerfile.12 | 8 +++++--- Dockerfile.14 | 8 +++++--- Dockerfile.16 | 8 +++++--- Dockerfile.18 | 8 +++++--- Dockerfile.20 | 8 +++++--- 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/Dockerfile.10 b/Dockerfile.10 index 4432260..62ef148 100644 --- a/Dockerfile.10 +++ b/Dockerfile.10 @@ -20,10 +20,10 @@ ARG NODE_MANAGER="fnm" ARG IMAGE_REPO="casjaysdevdocker/nodejs" ARG IMAGE_VERSION="${NODE_VERSION}" -ARG CONTAINER_VERSION="" +ARG CONTAINER_VERSION="${NODE_VERSION}" ARG PULL_URL="casjaysdev/debian" -ARG DISTRO_VERSION="latest" +ARG DISTRO_VERSION="$IMAGE_VERSION" ARG BUILD_VERSION="${BUILD_DATE}" FROM tianon/gosu:latest AS gosu @@ -45,6 +45,8 @@ ARG DEFAULT_CONF_DIR ARG DEFAULT_TEMPLATE_DIR ARG DISTRO_VERSION ARG PHP_VERSION +ARG NODE_VERSION +ARG NODE_MANAGER ARG PACK_LIST="bash \ " @@ -138,7 +140,7 @@ RUN \ RUN set -ex; \ echo "Custom Applications"; \ - export PHP_VERSION=$PHP_VERSION NODE_VERSION=$NODE_VERSION NODE_MANAGER=$NODE_MANAGER; \ + export PHP_VERSION="${PHP_VERSION}}" NODE_VERSION="${NODE_VERSION}" NODE_MANAGER="${NODE_MANAGER}"; \ bash -c "$(curl -q -LSsf "https://github.com/templatemgr/nodejs/raw/main/install.sh")"; \ echo "" diff --git a/Dockerfile.12 b/Dockerfile.12 index 8b668dd..ed4bea9 100644 --- a/Dockerfile.12 +++ b/Dockerfile.12 @@ -20,10 +20,10 @@ ARG NODE_MANAGER="fnm" ARG IMAGE_REPO="casjaysdevdocker/nodejs" ARG IMAGE_VERSION="${NODE_VERSION}" -ARG CONTAINER_VERSION="" +ARG CONTAINER_VERSION="${NODE_VERSION}" ARG PULL_URL="casjaysdev/debian" -ARG DISTRO_VERSION="latest" +ARG DISTRO_VERSION="$IMAGE_VERSION" ARG BUILD_VERSION="${BUILD_DATE}" FROM tianon/gosu:latest AS gosu @@ -45,6 +45,8 @@ ARG DEFAULT_CONF_DIR ARG DEFAULT_TEMPLATE_DIR ARG DISTRO_VERSION ARG PHP_VERSION +ARG NODE_VERSION +ARG NODE_MANAGER ARG PACK_LIST="bash \ " @@ -138,7 +140,7 @@ RUN \ RUN set -ex; \ echo "Custom Applications"; \ - export PHP_VERSION=$PHP_VERSION NODE_VERSION=$NODE_VERSION NODE_MANAGER=$NODE_MANAGER; \ + export PHP_VERSION="${PHP_VERSION}}" NODE_VERSION="${NODE_VERSION}" NODE_MANAGER="${NODE_MANAGER}"; \ bash -c "$(curl -q -LSsf "https://github.com/templatemgr/nodejs/raw/main/install.sh")"; \ echo "" diff --git a/Dockerfile.14 b/Dockerfile.14 index a7c487f..993e035 100644 --- a/Dockerfile.14 +++ b/Dockerfile.14 @@ -20,10 +20,10 @@ ARG NODE_MANAGER="fnm" ARG IMAGE_REPO="casjaysdevdocker/nodejs" ARG IMAGE_VERSION="${NODE_VERSION}" -ARG CONTAINER_VERSION="" +ARG CONTAINER_VERSION="${NODE_VERSION}" ARG PULL_URL="casjaysdev/debian" -ARG DISTRO_VERSION="latest" +ARG DISTRO_VERSION="$IMAGE_VERSION" ARG BUILD_VERSION="${BUILD_DATE}" FROM tianon/gosu:latest AS gosu @@ -45,6 +45,8 @@ ARG DEFAULT_CONF_DIR ARG DEFAULT_TEMPLATE_DIR ARG DISTRO_VERSION ARG PHP_VERSION +ARG NODE_VERSION +ARG NODE_MANAGER ARG PACK_LIST="bash \ " @@ -138,7 +140,7 @@ RUN \ RUN set -ex; \ echo "Custom Applications"; \ - export PHP_VERSION=$PHP_VERSION NODE_VERSION=$NODE_VERSION NODE_MANAGER=$NODE_MANAGER; \ + export PHP_VERSION="${PHP_VERSION}}" NODE_VERSION="${NODE_VERSION}" NODE_MANAGER="${NODE_MANAGER}"; \ bash -c "$(curl -q -LSsf "https://github.com/templatemgr/nodejs/raw/main/install.sh")"; \ echo "" diff --git a/Dockerfile.16 b/Dockerfile.16 index d4a179f..10f057d 100644 --- a/Dockerfile.16 +++ b/Dockerfile.16 @@ -20,10 +20,10 @@ ARG NODE_MANAGER="fnm" ARG IMAGE_REPO="casjaysdevdocker/nodejs" ARG IMAGE_VERSION="${NODE_VERSION}" -ARG CONTAINER_VERSION="" +ARG CONTAINER_VERSION="${NODE_VERSION}" ARG PULL_URL="casjaysdev/debian" -ARG DISTRO_VERSION="latest" +ARG DISTRO_VERSION="$IMAGE_VERSION" ARG BUILD_VERSION="${BUILD_DATE}" FROM tianon/gosu:latest AS gosu @@ -45,6 +45,8 @@ ARG DEFAULT_CONF_DIR ARG DEFAULT_TEMPLATE_DIR ARG DISTRO_VERSION ARG PHP_VERSION +ARG NODE_VERSION +ARG NODE_MANAGER ARG PACK_LIST="bash \ " @@ -138,7 +140,7 @@ RUN \ RUN set -ex; \ echo "Custom Applications"; \ - export PHP_VERSION=$PHP_VERSION NODE_VERSION=$NODE_VERSION NODE_MANAGER=$NODE_MANAGER; \ + export PHP_VERSION="${PHP_VERSION}}" NODE_VERSION="${NODE_VERSION}" NODE_MANAGER="${NODE_MANAGER}"; \ bash -c "$(curl -q -LSsf "https://github.com/templatemgr/nodejs/raw/main/install.sh")"; \ echo "" diff --git a/Dockerfile.18 b/Dockerfile.18 index f36cb7f..ed9a4e3 100644 --- a/Dockerfile.18 +++ b/Dockerfile.18 @@ -20,10 +20,10 @@ ARG NODE_MANAGER="fnm" ARG IMAGE_REPO="casjaysdevdocker/nodejs" ARG IMAGE_VERSION="${NODE_VERSION}" -ARG CONTAINER_VERSION="" +ARG CONTAINER_VERSION="${NODE_VERSION}" ARG PULL_URL="casjaysdev/debian" -ARG DISTRO_VERSION="latest" +ARG DISTRO_VERSION="$IMAGE_VERSION" ARG BUILD_VERSION="${BUILD_DATE}" FROM tianon/gosu:latest AS gosu @@ -45,6 +45,8 @@ ARG DEFAULT_CONF_DIR ARG DEFAULT_TEMPLATE_DIR ARG DISTRO_VERSION ARG PHP_VERSION +ARG NODE_VERSION +ARG NODE_MANAGER ARG PACK_LIST="bash \ " @@ -138,7 +140,7 @@ RUN \ RUN set -ex; \ echo "Custom Applications"; \ - export PHP_VERSION=$PHP_VERSION NODE_VERSION=$NODE_VERSION NODE_MANAGER=$NODE_MANAGER; \ + export PHP_VERSION="${PHP_VERSION}}" NODE_VERSION="${NODE_VERSION}" NODE_MANAGER="${NODE_MANAGER}"; \ bash -c "$(curl -q -LSsf "https://github.com/templatemgr/nodejs/raw/main/install.sh")"; \ echo "" diff --git a/Dockerfile.20 b/Dockerfile.20 index 1fb76e7..3ba8933 100644 --- a/Dockerfile.20 +++ b/Dockerfile.20 @@ -20,10 +20,10 @@ ARG NODE_MANAGER="fnm" ARG IMAGE_REPO="casjaysdevdocker/nodejs" ARG IMAGE_VERSION="${NODE_VERSION}" -ARG CONTAINER_VERSION="" +ARG CONTAINER_VERSION="${NODE_VERSION}" ARG PULL_URL="casjaysdev/debian" -ARG DISTRO_VERSION="latest" +ARG DISTRO_VERSION="$IMAGE_VERSION" ARG BUILD_VERSION="${BUILD_DATE}" FROM tianon/gosu:latest AS gosu @@ -45,6 +45,8 @@ ARG DEFAULT_CONF_DIR ARG DEFAULT_TEMPLATE_DIR ARG DISTRO_VERSION ARG PHP_VERSION +ARG NODE_VERSION +ARG NODE_MANAGER ARG PACK_LIST="bash \ " @@ -138,7 +140,7 @@ RUN \ RUN set -ex; \ echo "Custom Applications"; \ - export PHP_VERSION=$PHP_VERSION NODE_VERSION=$NODE_VERSION NODE_MANAGER=$NODE_MANAGER; \ + export PHP_VERSION="${PHP_VERSION}}" NODE_VERSION="${NODE_VERSION}" NODE_MANAGER="${NODE_MANAGER}"; \ bash -c "$(curl -q -LSsf "https://github.com/templatemgr/nodejs/raw/main/install.sh")"; \ echo ""