Merge opnesuse families into one

kairos-io · Oct 25, 2023 · 8a597a7 · 8a597a7
1 parent 1ad015a
commit 8a597a7
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 144 deletions.
diff --git a/.github/flavors.json b/.github/flavors.json
@@ -1,6 +1,6 @@
 [
     {
-        "family": "opensuse-leap",
+        "family": "opensuse",
         "flavor": "opensuse",
         "flavorRelease": "leap-15.5",
         "variant": "standard",
@@ -10,7 +10,7 @@
         "worker": "self-hosted"
     },
     {
-        "family": "opensuse-leap",
+        "family": "opensuse",
         "flavor": "opensuse",
         "flavorRelease": "leap-15.5",
         "variant": "core",
@@ -20,7 +20,7 @@
         "worker": "self-hosted"
     },
     {
-        "family": "opensuse-leap",
+        "family": "opensuse",
         "flavor": "opensuse",
         "flavorRelease": "leap-15.5",
         "variant": "standard",
@@ -30,7 +30,7 @@
         "worker": "ubuntu-latest"
     },
     {
-        "family": "opensuse-leap",
+        "family": "opensuse",
         "flavor": "opensuse",
         "flavorRelease": "leap-15.5",
         "variant": "core",
@@ -40,7 +40,7 @@
         "worker": "ubuntu-latest"
     },
     {
-        "family": "opensuse-leap",
+        "family": "opensuse",
         "flavor": "opensuse",
         "flavorRelease": "leap-15.5",
         "variant": "core",
@@ -50,7 +50,7 @@
         "worker": "ubuntu-latest"
     },
     {
-        "family": "opensuse-tumbleweed",
+        "family": "opensuse",
         "flavor": "opensuse",
         "flavorRelease": "tumbleweed",
         "variant": "standard",
@@ -60,7 +60,7 @@
         "worker": "self-hosted"
     },
     {
-        "family": "opensuse-tumbleweed",
+        "family": "opensuse",
         "flavor": "opensuse",
         "flavorRelease": "tumbleweed",
         "variant": "core",
@@ -70,7 +70,7 @@
         "worker": "self-hosted"
     },
     {
-        "family": "opensuse-tumbleweed",
+        "family": "opensuse",
         "flavor": "opensuse",
         "flavorRelease": "tumbleweed",
         "variant": "standard",
@@ -80,7 +80,7 @@
         "worker": "ubuntu-latest"
     },
     {
-        "family": "opensuse-tumbleweed",
+        "family": "opensuse",
         "flavor": "opensuse",
         "flavorRelease": "tumbleweed",
         "variant": "core",

diff --git a/images/Dockerfile.opensuse-tumbleweed → images/Dockerfile.opensuse b/images/Dockerfile.opensuse-tumbleweed → images/Dockerfile.opensuse
@@ -2,31 +2,28 @@
 ####                           ARGS                        ####
 ###############################################################
 ARG MODEL=generic
-ARG BASE_IMAGE=opensuse/tumbleweed
+ARG BASE_IMAGE
+ARG FLAVOR_RELEASE
 
-###############################################################
-####                        Upstream                       ####
-###############################################################
-FROM $BASE_IMAGE AS upstream
+FROM $BASE_IMAGE AS base
 
-###############################################################
-####                      Arch Config                      ####
-###############################################################
-FROM upstream AS amd64-config
-RUN zypper removerepo repo-openh264
+FROM base AS leap-15.5-repo
+RUN zypper ar -G https://download.opensuse.org/repositories/utilities/15.5/utilities.repo && \
+    zypper ref
 
+FROM base AS tumbleweed-repo-amd64
+RUN zypper removerepo repo-openh264 && \
+    zypper ref
 
-FROM upstream AS arm64-config
+FROM base AS tumbleweed-repo-arm64
 RUN zypper ar https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/ aarch64 && \
     zypper ref
 
-###############################################################
-####                         Common                        ####
-###############################################################
-FROM ${TARGETARCH}-config AS common
+FROM tumbleweed-repo-${TARGETARCH} AS tumbleweed-repo
 RUN zypper ar -G https://download.opensuse.org/repositories/utilities/openSUSE_Factory/utilities.repo && \
     zypper ref
 
+FROM ${FLAVOR_RELEASE}-repo AS common
 RUN zypper in --force-resolution -y \
     bash-completion \
     conntrack-tools \
@@ -114,6 +111,7 @@ RUN zypper in --force-resolution -y \
 ###############################################################
 FROM ${TARGETARCH} AS generic
 RUN zypper in --force-resolution -y \
+    lldpd \
     qemu-guest-agent \
     && zypper cc
 
@@ -130,8 +128,17 @@ RUN zypper in --force-resolution -y \
     && zypper cc
 COPY rpi/config.txt /boot/config.txt
 
-FROM rpicommon AS rpi3
-FROM rpicommon AS rpi4
+FROM rpicommon AS rpi-leap-15.5
+# somehow these two are needed in leap
+RUN zypper in --force-resolution -y \
+    grub2-i386-pc \
+    grub2-x86_64-efi \
+    && zypper cc \
+
+FROM rpicommon AS rpi-tumbleweed
+
+FROM rpi-${FLAVOR_RELEASE} AS rpi3
+FROM rpi-${FLAVOR_RELEASE} AS rpi4
 
 ###############################################################
 ####               Post-Process Common to All              ####

diff --git a/images/Dockerfile.opensuse-leap b/images/Dockerfile.opensuse-leap