SNOW-1937440 Fix docker image (#1313)

Author: sfc-gh-pfus

Makefile

@@ -13,7 +13,7 @@ test_setup: test_teardown
 	python3 ci/scripts/hang_webserver.py 12345 &
 
 test_teardown:
-	kill -9 $$(ps -ewf | grep hang_webserver | grep -v grep | awk '{print $$2}') || true
+	kill -9 $$(ps -ef | grep hang_webserver | grep -v grep | awk '{print $$1}') || true
 
 test: deps test_setup
 	./ci/scripts/execute_tests.sh

ci/image/scripts/entrypoint.sh

@@ -1,12 +1,15 @@
-#!/bin/bash -x
+#!/bin/bash -ex
 # Add local user
 # Either use the LOCAL_USER_ID if passed in at runtime or
 # fallback
 
 USER_ID=${LOCAL_USER_ID:-9001}
 
 echo "Starting with UID : $USER_ID"
-useradd --shell /bin/bash -u $USER_ID -o -c "" -m user
+adduser -s /bin/bash -u $USER_ID -h /home/user -D user
 export HOME=/home/user
+mkdir -p /home/user/.cache
+chown user:user /home/user/.cache
+
+exec gosu user "$@"
 
-exec /usr/local/bin/gosu user "$@"

ci/scripts/execute_tests.sh

@@ -15,7 +15,7 @@ cd $TOPDIR
 if [[ -n "$JENKINS_HOME" ]]; then
   export WORKSPACE=${WORKSPACE:-/mnt/workspace}
   go install github.com/jstemmer/go-junit-report/v2@latest
-  go test $GO_TEST_PARAMS -timeout 90m -race -v . | go-junit-report -iocopy -out $WORKSPACE/junit-go.xml
+  go test $GO_TEST_PARAMS -timeout 90m -race -v . | /home/user/go/bin/go-junit-report -iocopy -out $WORKSPACE/junit-go.xml
 else
   go test $GO_TEST_PARAMS -timeout 90m -race -coverprofile=coverage.txt -covermode=atomic -v .
 fi