diff --git a/cje-production/dockerfiles/debian/swtgtk3nativebuild/Dockerfile b/cje-production/dockerfiles/debian/swtgtk3nativebuild/Dockerfile index e4274a07425..ec18df8143a 100644 --- a/cje-production/dockerfiles/debian/swtgtk3nativebuild/Dockerfile +++ b/cje-production/dockerfiles/debian/swtgtk3nativebuild/Dockerfile @@ -17,9 +17,6 @@ RUN apt-get update -qq && apt-get install -qq -y \ freeglut3-dev \ webkit2gtk-driver -# There is purposefully no JDK in this image. If a particular build needs JDK it installs -# it in the Jenkinsfile. - ENV HOME=/home/swtbuild ENV DISPLAY :0 RUN useradd -u 10001 -d ${HOME} testuser diff --git a/cje-production/dockerfiles/debian/swtnativebuild/Dockerfile b/cje-production/dockerfiles/debian/swtnativebuild/Dockerfile index b2891acc39c..7dbacc67824 100644 --- a/cje-production/dockerfiles/debian/swtnativebuild/Dockerfile +++ b/cje-production/dockerfiles/debian/swtnativebuild/Dockerfile @@ -16,8 +16,7 @@ RUN apt-get update -qq && apt-get install -qq -y \ libgtk-3-dev \ libgtk-4-dev \ freeglut3-dev \ - webkit2gtk-driver \ - default-jdk + webkit2gtk-driver ENV HOME=/home/swtbuild ENV DISPLAY :0 @@ -32,6 +31,5 @@ RUN chgrp -R 0 ${HOME} && chmod -R g=u ${HOME} RUN localedef -i en_US -f UTF-8 en_US.UTF-8 ENV LANG=en_US.UTF-8 -ENV SWT_JAVA_HOME=/usr/lib/jvm/default-java/ -USER 10001 \ No newline at end of file +USER 10001 diff --git a/cje-production/dockerfiles/debian/swtnativebuild/scripts/uid_entrypoint b/cje-production/dockerfiles/debian/swtnativebuild/scripts/uid_entrypoint index c44d398d593..e96c4e5c7d9 100644 --- a/cje-production/dockerfiles/debian/swtnativebuild/scripts/uid_entrypoint +++ b/cje-production/dockerfiles/debian/swtnativebuild/scripts/uid_entrypoint @@ -4,4 +4,4 @@ if ! whoami > /dev/null 2>&1; then echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd fi fi -exec "$@" \ No newline at end of file +exec "$@"