Merge centos.dockerfile into fedora.dockerfile

ddterm · Nov 13, 2024 · 826b2df · 826b2df
1 parent 75f855a
commit 826b2df
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 28 deletions.
diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
@@ -25,7 +25,7 @@ jobs:
       matrix:
         include:
           - image: centos-stream9
-            dockerfile: centos.dockerfile
+            dockerfile: fedora.dockerfile
 
           - image: fedora-39
             dockerfile: fedora.dockerfile

diff --git a/centos.dockerfile b/centos.dockerfile
diff --git a/fedora.dockerfile b/fedora.dockerfile
@@ -3,16 +3,19 @@ ARG base_image=fedora-40
 FROM docker.io/library/fedora:39@sha256:d63d63fe593749a5e8dbc8152427d40bbe0ece53d884e00e5f3b44859efa5077 AS fedora-39
 FROM docker.io/library/fedora:40@sha256:7cdd2b48396929bb8723ea2fa60e03bee39cc22e2a853cbd891587fab4eb1bc9 AS fedora-40
 FROM docker.io/library/fedora:41@sha256:3ec60eb34fa1a095c0c34dd37cead9fd38afb62612d43892fcf1d3425c32bc1e AS fedora-41
+FROM quay.io/centos/centos:stream9@sha256:e5fdd83894773a25f22fbdf0b5253c63677d0cbaf8d3a8366b165a3ef5902964 AS centos-stream9
 
 FROM ${base_image}
+ARG base_image
 
-RUN dnf install -y --nodocs --setopt install_weak_deps=False \
+RUN if [ $base_image = centos-stream9 ]; then dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm; fi && \
+    dnf install -y --nodocs --setopt install_weak_deps=False \
         gnome-session-xsession \
         gnome-extensions-app \
         gjs \
         gdm \
         vte291 \
-        vte291-gtk4 \
+        $(if [ $base_image != centos-stream9 ]; then echo vte291-gtk4; fi) \
         xorg-x11-server-Xvfb \
         mesa-dri-drivers \
         wl-clipboard \