diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8e26f129aaf..583d155f178 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -42,11 +42,6 @@ updates: schedule: interval: daily - - package-ecosystem: docker - directory: /cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3 - schedule: - interval: daily - - package-ecosystem: maven directory: / schedule: diff --git a/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile b/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile index f2c2af564da..ab8e5f46077 100644 --- a/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile +++ b/JenkinsJobs/Builds/DockerImagesBuild.jenkinsfile @@ -29,7 +29,6 @@ pipeline { parallel( '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') }, - 'ubuntu-gtk3': { buildAndPushImage('ubuntu-gtk3-metacity/22.04-gtk3', 'eclipse/platformreleng-ubuntu-gtk3-metacity:22.04') }, 'opensuse-gtk3': { buildAndPushImage('opensuse-gtk3-metacity/15-gtk3', 'eclipse/platformreleng-opensuse-gtk3-metacity:15') }, failFast: false) } diff --git a/cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3/Dockerfile b/cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3/Dockerfile deleted file mode 100644 index 8bd07518e35..00000000000 --- a/cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -FROM ubuntu:24.04@sha256:dfc10878be8d8fc9c61cbff33166cb1d1fe44391539243703c72766894fa834a - -### 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 -ENTRYPOINT [ "uid_entrypoint" ] - -ENV DEBIAN_FRONTEND noninteractive -RUN apt-get install -y --no-install-recommends gpgv -RUN apt-get update && apt upgrade -y && apt dist-upgrade -y && apt-get install -y --no-install-recommends \ - libgtk-3-0 \ - tigervnc-standalone-server \ - tigervnc-common \ - tigervnc-tools \ - metacity \ - x11-xserver-utils \ - libgl1-mesa-dri \ - xfonts-base \ - xfonts-scalable \ - xfonts-100dpi \ - xfonts-75dpi \ - fonts-liberation \ - fonts-liberation2 \ - fonts-freefont-ttf \ - fonts-dejavu \ - fonts-dejavu-core \ - fonts-dejavu-extra \ - wget \ - curl \ - unzip \ - vim \ - && rm -rf /var/lib/apt/lists/* && apt autoremove -y - -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/ubuntu-gtk3-metacity/22.04-gtk3/scripts/uid_entrypoint b/cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3/scripts/uid_entrypoint deleted file mode 100644 index c44d398d593..00000000000 --- a/cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3/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/ubuntu-gtk3-metacity/22.04-gtk3/scripts/xstartup_metacity.sh b/cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3/scripts/xstartup_metacity.sh deleted file mode 100644 index eef5b2c616a..00000000000 --- a/cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3/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/ubuntu-gtk3-metacity/22.04-gtk3/scripts/xstartup_mutter.sh b/cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3/scripts/xstartup_mutter.sh deleted file mode 100644 index 1c5858e6814..00000000000 --- a/cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3/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