diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4d21badd8a1..1fe7a25e5fb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,11 +10,6 @@ updates: schedule: interval: daily - - package-ecosystem: docker - directory: /cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild - schedule: - interval: daily - - package-ecosystem: docker directory: /cje-production/dockerfiles/opensuse-gtk3-metacity/15-gtk3 schedule: diff --git a/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile b/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile index 9c6604ad1ac..1846ca345ef 100644 --- a/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile +++ b/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile @@ -26,7 +26,6 @@ pipeline { parallel( 'debian-swtnative': { buildAndPushImage('debian/swtnativebuild', 'eclipse/platformreleng-debian-swtnativebuild:12') }, 'centos9-gtk4': { buildAndPushImage('centos-gtk4-mutter/9-gtk4', 'eclipse/platformreleng-centos-gtk4-mutter:9') }, - 'centos9-gtk4-swt': { buildAndPushImage('centos-gtk4-mutter/9-swtBuild', 'eclipse/platformreleng-centos-swt-build:9') }, 'opensuse-gtk3': { buildAndPushImage('opensuse-gtk3-metacity/15-gtk3', 'eclipse/platformreleng-opensuse-gtk3-metacity:15') }, failFast: false) } diff --git a/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/Dockerfile b/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/Dockerfile deleted file mode 100644 index d81bcd97033..00000000000 --- a/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -ARG FROM_TAG="9" -FROM quay.io/centos/centos:stream${FROM_TAG} - -### user name recognition at runtime w/ an arbitrary uid - for OpenShift deployments -COPY scripts/uid_entrypoint /usr/local/bin/uid_entrypoint -RUN chmod u+x /usr/local/bin/uid_entrypoint && \ - chgrp 0 /usr/local/bin/uid_entrypoint && \ - chmod g=u /usr/local/bin/uid_entrypoint /etc/passwd -### end - -ENTRYPOINT [ "uid_entrypoint" ] -RUN dnf -y update && dnf -y install \ - gtk3 \ - gtk4 \ - tigervnc-server \ - tigervnc \ - mutter \ - xorg-x11-server-utils \ - mesa-libGL \ - xorg-x11-fonts-misc \ - xorg-x11-fonts-75dpi \ - xorg-x11-fonts-Type1 \ - xorg-x11-fonts-100dpi \ - liberation-fonts \ - unzip \ - zip \ - bzip2 \ - lsof \ - wget \ - curl-minimal \ - webkit2gtk3 \ - webkit2gtk3-devel \ - gtk3-devel \ - gtk4-devel \ - java-17-openjdk-devel \ - webkit2gtk3-devel \ - make \ - gcc \ - mesa-libGLU-devel \ - mesa-libGL-devel \ - libXt-devel \ - libXtst-devel \ - libXScrnSaver \ - freetype \ - glibc-locale-source \ - glibc-langpack-en \ - nss \ - nspr \ - nss-util \ - && dnf clean all - -# -i: specify the locale definition file -# -f: specify the character set -RUN localedef -i en_US -f UTF-8 en_US.UTF-8 -ENV LANG=en_US.UTF-8 - -ENV HOME=/home/vnc -ENV DISPLAY :0 - -RUN mkdir -p ${HOME}/.vnc && chmod -R 775 ${HOME} \ - && echo "123456" | vncpasswd -f > ${HOME}/.vnc/passwd \ - && chmod 600 ${HOME}/.vnc/passwd - -# Create a custom vnc xstartup file -COPY scripts/xstartup_metacity.sh ${HOME}/.vnc/xstartup.sh -# Make $HOME open to the 'root' group (so Jenkins/OpenShift user can write there) -RUN chgrp -R 0 ${HOME} && chmod -R g=u ${HOME} - -USER 10001 diff --git a/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/scripts/uid_entrypoint b/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/scripts/uid_entrypoint deleted file mode 100644 index c44d398d593..00000000000 --- a/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/scripts/uid_entrypoint +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env sh -if ! whoami > /dev/null 2>&1; then - if [ -w /etc/passwd ]; 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 diff --git a/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/scripts/xstartup_metacity.sh b/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/scripts/xstartup_metacity.sh deleted file mode 100644 index eef5b2c616a..00000000000 --- a/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/scripts/xstartup_metacity.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env /bin/sh - -[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup -[ -r ${HOME}/.Xresources ] && xrdb ${HOME}/.Xresources - -Xvnc ${DISPLAY} -geometry 1440x900 -depth 16 -dpi 100 -PasswordFile ${HOME}/.vnc/passwd & -sleep 2 -xsetroot -solid grey -vncconfig -iconic & -xhost + -metacity --replace --sm-disable --display=${DISPLAY} & \ No newline at end of file diff --git a/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/scripts/xstartup_mutter.sh b/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/scripts/xstartup_mutter.sh deleted file mode 100644 index 1c5858e6814..00000000000 --- a/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/scripts/xstartup_mutter.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env /bin/sh - -[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup -[ -r ${HOME}/.Xresources ] && xrdb ${HOME}/.Xresources - -Xvnc ${DISPLAY} -geometry 1440x900 -depth 16 -dpi 100 -PasswordFile ${HOME}/.vnc/passwd & -sleep 2 -xsetroot -solid grey -vncconfig -iconic & -xhost + -mutter --replace --sm-disable --display=${DISPLAY} & \ No newline at end of file