From 937cfa3d038130e9fee57551fa79d8372a0d8daf Mon Sep 17 00:00:00 2001
From: "Andrew W. Harn" <andrew.harn@broadcom.com>
Date: Wed, 8 May 2024 13:12:39 -0400
Subject: [PATCH] Update dockerfiles to Node 18, add python3 pre-req to minimal

Signed-off-by: Andrew W. Harn <andrew.harn@broadcom.com>
---
 cli/basic-with-nvm/Dockerfile | 4 ++--
 cli/basic/Dockerfile          | 2 +-
 cli/jenkins-agent/Dockerfile  | 2 +-
 cli/minimal/Dockerfile        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cli/basic-with-nvm/Dockerfile b/cli/basic-with-nvm/Dockerfile
index 1cc2ba2..e314d3f 100644
--- a/cli/basic-with-nvm/Dockerfile
+++ b/cli/basic-with-nvm/Dockerfile
@@ -19,7 +19,7 @@ ENV ENV=${bashEnv}
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
-ENV DEFAULT_NODE_VERSION=16.17.0
+ENV DEFAULT_NODE_VERSION=18
 ENV DEBIAN_FRONTEND="noninteractive"
 ARG loginFile=pam.d.config
 
@@ -32,7 +32,7 @@ RUN apt-get update -qqy &&\
     apt-get -qqy install --no-install-recommends git curl libxss1 vim nano openssh-server software-properties-common cmake gnome-keyring libsecret-1-dev dbus-x11 &&\
     apt-get -q autoremove &&\
     mkdir -p /var/run/sshd &&\
-    curl -fsSL https://deb.nodesource.com/setup_16.x | bash - &&\
+    curl -fsSL "https://deb.nodesource.com/setup_${DEFAULT_NODE_VERSION}.x" | bash - &&\
     apt-get -qqy install nodejs build-essential &&\
     apt-get -q autoremove &&\
     apt-get -qqy clean &&\
diff --git a/cli/basic/Dockerfile b/cli/basic/Dockerfile
index 6e8166c..5800402 100644
--- a/cli/basic/Dockerfile
+++ b/cli/basic/Dockerfile
@@ -18,7 +18,7 @@ ENV ENV=${bashEnv}
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
-ENV DEFAULT_NODE_VERSION=16
+ENV DEFAULT_NODE_VERSION=18
 ENV DEBIAN_FRONTEND="noninteractive"
 ARG loginFile=pam.d.config
 
diff --git a/cli/jenkins-agent/Dockerfile b/cli/jenkins-agent/Dockerfile
index 43f6ffe..ed48c7e 100644
--- a/cli/jenkins-agent/Dockerfile
+++ b/cli/jenkins-agent/Dockerfile
@@ -13,7 +13,7 @@ FROM ubuntu:focal
 USER root
 
 ARG IMAGE_VERSION_ARG
-ARG DEFAULT_NODE_VERSION=${IMAGE_VERSION_ARG:-16}
+ARG DEFAULT_NODE_VERSION=${IMAGE_VERSION_ARG:-18}
 ENV DEBIAN_FRONTEND="noninteractive"
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
diff --git a/cli/minimal/Dockerfile b/cli/minimal/Dockerfile
index 2f2a999..5a38659 100644
--- a/cli/minimal/Dockerfile
+++ b/cli/minimal/Dockerfile
@@ -9,7 +9,7 @@
 FROM ubuntu:focal
 
 USER root
-ENV DEFAULT_NODE_VERSION=16
+ENV DEFAULT_NODE_VERSION=18
 ENV ZOWE_VERSION=zowe-v2-lts
 ENV DEBIAN_FRONTEND="noninteractive"
 
@@ -18,7 +18,7 @@ RUN useradd zowe --shell /bin/bash --create-home && echo 'zowe:zowe' | chpasswd
 RUN echo "cd ~" >> /home/zowe/.bashrc
 
 # Install Node, plugin prereqs
-RUN apt-get update && apt-get install -y curl build-essential && curl -fsSL https://deb.nodesource.com/setup_${DEFAULT_NODE_VERSION}.x | bash - && apt-get install -y nodejs && apt-get -q autoremove && apt-get -q clean -y && rm -rf /var/lib/apt/lists/* /var/cache/apt/*.bin
+RUN apt-get update && apt-get install -y curl build-essential python3 && curl -fsSL https://deb.nodesource.com/setup_${DEFAULT_NODE_VERSION}.x | bash - && apt-get install -y nodejs && apt-get -q autoremove && apt-get -q clean -y && rm -rf /var/lib/apt/lists/* /var/cache/apt/*.bin
 
 # Install Zowe CLI
 RUN npm install -g @zowe/cli@${ZOWE_VERSION} --ignore-scripts