From 1434cafc7945c79312f39b509ddc8b3e479e9720 Mon Sep 17 00:00:00 2001 From: Aleksandr Mezin Date: Sat, 27 Apr 2024 06:46:53 +0300 Subject: [PATCH] [ci skip] Remove distros with GNOME older than 43 --- .github/workflows/common.yml | 9 --------- debian.dockerfile | 1 - fedora.dockerfile | 4 +--- suse.dockerfile | 1 - 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index 8b6e36b..7df889d 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -33,15 +33,9 @@ jobs: - image: fedora-40 dockerfile: fedora.dockerfile - - image: centos-9 - dockerfile: fedora.dockerfile - - image: debian-12 dockerfile: debian.dockerfile - - image: ubuntu-22.04 - dockerfile: debian.dockerfile - - image: ubuntu-23.10 dockerfile: debian.dockerfile @@ -54,9 +48,6 @@ jobs: - image: opensuse-tumbleweed dockerfile: suse.dockerfile - - image: opensuse-leap-15.5 - dockerfile: suse.dockerfile - - image: opensuse-leap-15.6 dockerfile: suse.dockerfile diff --git a/debian.dockerfile b/debian.dockerfile index 926a6dd..273f220 100644 --- a/debian.dockerfile +++ b/debian.dockerfile @@ -1,7 +1,6 @@ ARG base_image=ubuntu-24.04 FROM debian:12@sha256:1aadfee8d292f64b045adb830f8a58bfacc15789ae5f489a0fedcd517a862cb9 AS debian-12 -FROM ubuntu:22.04@sha256:6d7b5d3317a71adb5e175640150e44b8b9a9401a7dd394f44840626aff9fa94d AS ubuntu-22.04 FROM ubuntu:23.10@sha256:bfae41cea51761ae450db6080b586a8c35334c756b511c06b393ae565a34cab4 AS ubuntu-23.10 FROM ubuntu:24.04@sha256:562456a05a0dbd62a671c1854868862a4687bf979a96d48ae8e766642cd911e8 AS ubuntu-24.04 diff --git a/fedora.dockerfile b/fedora.dockerfile index 695d0d9..367dffe 100644 --- a/fedora.dockerfile +++ b/fedora.dockerfile @@ -3,12 +3,10 @@ ARG base_image=fedora-40 FROM registry.fedoraproject.org/fedora:38@sha256:6349d2df6b4322c5690df1bb7743c45c356e20471dda69f27218cd9ba4a6c3c7 AS fedora-38 FROM registry.fedoraproject.org/fedora:39@sha256:2423c8f6171fff40d86e4d93610585b0906cd063d9488d89cbe76517540f7c33 AS fedora-39 FROM registry.fedoraproject.org/fedora:40@sha256:9870a116ac770429d424f6e03d44ab9d57062ae6b20b8c1283a19aa2bd985f88 AS fedora-40 -FROM quay.io/centos/centos:stream9@sha256:9aff9c6de7b4eb3618a73f7b4fc203318d512538d7b7f25966c855d46225bd23 AS centos-9 FROM ${base_image} -RUN if grep -i centos /etc/os-release; then dnf install -y epel-release --nodocs --setopt install_weak_deps=False; fi && \ - dnf install -y gnome-session-xsession gnome-extensions-app gjs gdm vte291 \ +RUN dnf install -y gnome-session-xsession gnome-extensions-app gjs gdm vte291 \ xorg-x11-server-Xvfb mesa-dri-drivers wl-clipboard \ PackageKit PackageKit-glib libhandy \ --nodocs --setopt install_weak_deps=False && dnf clean all -y diff --git a/suse.dockerfile b/suse.dockerfile index db7741a..6baa189 100644 --- a/suse.dockerfile +++ b/suse.dockerfile @@ -1,7 +1,6 @@ ARG base_image=opensuse-tumbleweed FROM opensuse/tumbleweed:latest@sha256:15c379af6fef707cb6274be8e683bb0e184f8cae99e269be146416fa32f78793 AS opensuse-tumbleweed -FROM opensuse/leap:15.5@sha256:165b2a35380bf408b0939c4198e5b013e9a2db5ccd173fcb82429204b8b2e61a AS opensuse-leap-15.5 FROM opensuse/leap:15.6@sha256:8b764b0497b17a85ef5ac8f388ead8449d4e334e8a741d6529c45be2e14d66e5 AS opensuse-leap-15.6 FROM ${base_image}