From c3d176c20b04027289432d38a54ba3916f198f2c Mon Sep 17 00:00:00 2001
From: Adam Kolodziejczyk <adam.kolodziejczyk@snowflake.com>
Date: Fri, 4 Oct 2024 15:05:20 +0200
Subject: [PATCH] SNOW-940415 test chaiguard image with node 18

---
 Jenkinsfile                    | 2 +-
 ci/_init.sh                    | 9 ++++-----
 ci/image/scripts/entrypoint.sh | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index fad449aaf..5fec5151f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,7 @@ timestamps {
       string(name: 'branch', value: 'main'),
       string(name: 'client_git_commit', value: scmInfo.GIT_COMMIT),
       string(name: 'client_git_branch', value: scmInfo.GIT_BRANCH),
-      string(name: 'TARGET_DOCKER_TEST_IMAGE', value: 'nodejs-centos7-node14'),
+      string(name: 'TARGET_DOCKER_TEST_IMAGE', value: 'nodejs-chainguard-node18'),
       string(name: 'parent_job', value: env.JOB_NAME),
       string(name: 'parent_build_number', value: env.BUILD_NUMBER)
     ]
diff --git a/ci/_init.sh b/ci/_init.sh
index 907648ff8..a1a9a5625 100755
--- a/ci/_init.sh
+++ b/ci/_init.sh
@@ -15,19 +15,18 @@ fi
 export DRIVER_NAME=nodejs
 
 # Build images
-BUILD_IMAGE_VERSION=2
+BUILD_IMAGE_VERSION=1
 
 # Test Images
-TEST_IMAGE_VERSION=2
+TEST_IMAGE_VERSION=1
 
 declare -A BUILD_IMAGE_NAMES=(
-    [$DRIVER_NAME-centos7-node14]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-centos7-node14-build:$BUILD_IMAGE_VERSION
+    [$DRIVER_NAME-chainguard-node18]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-chainguard-node18-build:$BUILD_IMAGE_VERSION
 )
 export BUILD_IMAGE_NAMES
 
 declare -A TEST_IMAGE_NAMES=(
-    [$DRIVER_NAME-centos7-fips]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-centos7-fips-test:$BUILD_IMAGE_VERSION
-    [$DRIVER_NAME-centos7-node14]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-centos7-node14-test:$BUILD_IMAGE_VERSION
+    [$DRIVER_NAME-chainguard-node18]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-chainguard-node18-test:$TEST_IMAGE_VERSION
 
 )
 export TEST_IMAGE_NAMES
diff --git a/ci/image/scripts/entrypoint.sh b/ci/image/scripts/entrypoint.sh
index 4932cbde4..b4ed90c48 100644
--- a/ci/image/scripts/entrypoint.sh
+++ b/ci/image/scripts/entrypoint.sh
@@ -6,7 +6,7 @@
 USER_ID=${LOCAL_USER_ID:-9001}
 
 echo "Starting with UID : $USER_ID"
-useradd --shell /bin/bash -u $USER_ID -o -c "" -m user
+adduser --shell /bin/bash -u $USER_ID -D user
 export HOME=/home/user
 
-exec /usr/local/bin/gosu user "$@"
+exec /usr/bin/gosu user "$@"