completed docker changes for jdk 17 #2390

karatelabs · Sep 22, 2023 · b95796c · b95796c
1 parent 03cd29a
commit b95796c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/karate-docker/karate-chrome/entrypoint.sh b/karate-docker/karate-chrome/entrypoint.sh
@@ -18,4 +18,4 @@ if [ -z "$KARATE_SOCAT_START" ]
 fi
 [ -z "$KARATE_WIDTH" ] && export KARATE_WIDTH="1280"
 [ -z "$KARATE_HEIGHT" ] && export KARATE_HEIGHT="720"
-exec /usr/bin/supervisord
+exec /usr/bin/supervisord -c /etc/supervisord.conf
diff --git a/karate-docker/karate-chrome/supervisord.conf b/karate-docker/karate-chrome/supervisord.conf
@@ -1,14 +1,19 @@
 [supervisord]
+user=root
 nodaemon=true
 
 [unix_http_server]
 file=/tmp/supervisor.sock
+username=dummy
+password=dummy
 
 [rpcinterface:supervisor]
 supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
 serverurl=unix:///tmp/supervisor.sock
+username=dummy
+password=dummy
 
 [program:xvfb]
 command=/usr/bin/Xvfb :1 -screen 0 %(ENV_KARATE_WIDTH)sx%(ENV_KARATE_HEIGHT)sx24 +extension RANDR
@@ -62,7 +67,7 @@ autostart=%(ENV_KARATE_SOCAT_START)s
 priority=600
 
 [program:karate]
-command=%(ENV_JAVA_HOME)s/bin/java -jar karate.jar %(ENV_KARATE_OPTIONS)s
+command=/usr/bin/java -jar karate.jar %(ENV_KARATE_OPTIONS)s
 autorestart=false
 autostart=%(ENV_KARATE_START)s
 stdout_logfile=/dev/stdout