From e8fe47f27f52d9920d97f24635a971f40409f3bc Mon Sep 17 00:00:00 2001
From: antromeo <45900043+antromeo@users.noreply.github.com>
Date: Wed, 7 Feb 2024 17:53:56 +0100
Subject: [PATCH] ENG-TBD: adds node version as a var

---
 .github/workflows/multi-arch.yml |  2 ++
 Dockerfile.GitHub                |  2 ++
 Dockerfile.OCP                   |  2 ++
 utils/activate-ent.sh            | 16 +++++++++++-----
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/multi-arch.yml b/.github/workflows/multi-arch.yml
index 07ac6edc..89372362 100644
--- a/.github/workflows/multi-arch.yml
+++ b/.github/workflows/multi-arch.yml
@@ -68,6 +68,7 @@ jobs:
           build-args: |
             ENTANDO_VERSION=${{ vars.ENTANDO_RELEASE }}
             ENT_CLI_VERSION=${{ github.ref_name }}
+            NODE_VERSION=${{ vars.NODE_VERSION }}
           labels: ${{ steps.meta-ent-cli-github.outputs.labels }}
           platforms: linux/amd64
 
@@ -82,5 +83,6 @@ jobs:
             ENTANDO_VERSION=${{ vars.ENTANDO_RELEASE }}
             ENT_CLI_VERSION=${{ github.ref_name }}
             KUBECTL_RELEASE=${{ vars.KUBECTL_RELEASE }}
+            NODE_VERSION=${{ vars.NODE_VERSION }}
           labels: ${{ steps.meta-ent-cli-ocp.outputs.labels }}
           platforms: linux/amd64
diff --git a/Dockerfile.GitHub b/Dockerfile.GitHub
index aca52f8d..b8f16a3a 100644
--- a/Dockerfile.GitHub
+++ b/Dockerfile.GitHub
@@ -4,10 +4,12 @@ ARG ENT_CLI_VERSION
 ARG ENTANDO_VERSION
 ARG APP=/home/ent
 ARG BUNDLE_CLI_VERSION
+ARG NODE_VERSION
 
 ENV PATH=$APP/.entando/ent/$ENTANDO_VERSION/cli/$ENT_CLI_VERSION/bin:$APP/.entando/bin:$PATH \
     ENTANDO_ENT_HOME=$APP/.entando/ent/$ENTANDO_VERSION/cli/$ENT_CLI_VERSION \
     BUNDLE_CLI_VERSION=$BUNDLE_CLI_VERSION \
+    NODE_VERSION=$NODE_VERSION \
     HOME=$APP
 
 RUN apk add --no-cache openjdk11 maven perl bash git tree jq curl grep gcompat libstdc++ docker
diff --git a/Dockerfile.OCP b/Dockerfile.OCP
index e0b87009..fc31115b 100644
--- a/Dockerfile.OCP
+++ b/Dockerfile.OCP
@@ -5,9 +5,11 @@ ARG ENTANDO_VERSION
 ARG ENT_CLI_VERSION
 ARG KUBECTL_RELEASE
 ARG BUNDLE_CLI_VERSION
+ARG NODE_VERSION
 
 ENV BASH_ENV=/usr/local/bin/scl_enable \
     ENTANDO_VERSION=$ENTANDO_VERSION \
+    NODE_VERSION=$NODE_VERSION \
     BUNDLE_CLI_VERSION=$BUNDLE_CLI_VERSION \
     PATH=$PATH:/home/ent/.entando/ent/$ENTANDO_VERSION/cli/$ENT_CLI_VERSION/bin:/home/ent/.entando/ent/$ENTANDO_VERSION/opt/node-v14.20.0/bin \
     ENTANDO_ENT_HOME=/home/ent/.entando/ent/$ENTANDO_VERSION/cli/$ENT_CLI_VERSION \
diff --git a/utils/activate-ent.sh b/utils/activate-ent.sh
index ed5106af..717478c8 100644
--- a/utils/activate-ent.sh
+++ b/utils/activate-ent.sh
@@ -2,9 +2,15 @@
 set -eux
 
 echo "BUNDLE_CLI_VERSION: $BUNDLE_CLI_VERSION"
+echo "NODE_VERSION: $NODE_VERSION"
 
-if [ -n "$BUNDLE_CLI_VERSION" ] ; then
-    ent check-env develop --yes --entando-bundle-cli-version="$BUNDLE_CLI_VERSION" --lenient
-else
-    ent check-env develop --yes  --lenient
-fi
\ No newline at end of file
+
+if [ -n "$BUNDLE_CLI_VERSION" ]; then
+    BUNDLE_CLI_FLAG="--entando-bundle-cli-version=$BUNDLE_CLI_VERSION"
+fi
+
+if [ -n "$NODE_VERSION" ]; then
+    NODE_VERSION_FLAG="--node-version=$NODE_VERSION"
+fi
+
+ent check-env develop --yes ${BUNDLE_CLI_FLAG:=} ${NODE_VERSION_FLAG:=} --lenient
\ No newline at end of file