update bundles so it matches it uses

Every bundle is has clear purpose, thus name it accordingly. This
documents clearly the reason for the packages in the list.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

Makefile

@@ -31,13 +31,13 @@ staging-dockerfiles: $(STAGING_DOCKERFILES)
 
 main/Dockerfile.%: ci-containers.yaml generate.py templates/Dockerfile.%.j2
 	@if [ "$*" = "debian" ]; then \
-		./generate.py --distro $* --bundles base,muon,musl,coverage,coverity,python --features muon --output $@; \
+		./generate.py --distro $* --bundles nvme,muon-dep,musl,coverage,coverity,python --features muon --output $@; \
 	else \
-		./generate.py --distro $* --bundles base,muon,python --features muon --output $@; \
+		./generate.py --distro $* --bundles nvme,muon-dep,python --features muon --output $@; \
 	fi
 
 staging/Dockerfile.%: ci-containers.yaml generate.py templates/Dockerfile.%.j2
-	./generate.py --distro $* --bundle base,staging  --output $@
+	./generate.py --distro $* --bundle muon --output $@
 
 # Build targets
 build: $(BUILD_TARGETS)

ci-containers.yaml

@@ -12,7 +12,7 @@ base_images:
   alpine: "alpine:latest"
 
 bundles:
-  base:
+  nvme:
     debian:
       - clang
       - gcc
@@ -67,20 +67,6 @@ bundles:
       - keyutils-dev
       - dbus-dev
 
-  muon:
-    debian:
-      - libcurl4
-      - libarchive13
-    fedora:
-      - libcurl
-      - libarchive
-    tumbleweed:
-      - libcurl4
-      - libarchive13
-    alpine:
-      - curl
-      - libarchive
-
   musl:
     debian:
       - musl
@@ -118,7 +104,7 @@ bundles:
       - py3-pip
       - py3-virtualenv
 
-  staging:
+  muon:
     debian:
       - ca-certificates
       - cmake
@@ -134,6 +120,7 @@ bundles:
       - ca-certificates
       - cmake
       - make
+      - gcc
       - pkgconf-pkg-config
       - libcurl-devel
       - libarchive-devel
@@ -145,6 +132,7 @@ bundles:
       - ca-certificates
       - cmake
       - make
+      - gcc
       - pkg-config
       - libcurl-devel
       - libarchive-devel
@@ -156,8 +144,24 @@ bundles:
       - ca-certificates
       - cmake
       - make
+      - gcc
       - pkgconf
       - curl-dev
       - libarchive-dev
       - python3
       - py3-yaml
+
+  muon-dep:
+    debian:
+      - libcurl4
+      - libarchive13
+    fedora:
+      - libcurl
+      - libarchive
+    tumbleweed:
+      - libcurl4
+      - libarchive13
+    alpine:
+      - curl
+      - libarchive
+

staging/Dockerfile.alpine

@@ -12,20 +12,10 @@ ENV TZ=Europe/Berlin
 RUN apk update && \
     apk add musl-locales tzdata && \
     apk add \
-    gcc \
-    git \
-    meson \
-    bash \
-    linux-headers \
-    musl-dev \
-    perl \
-    json-c-dev \
-    openssl-dev \
-    keyutils-dev \
-    dbus-dev \
     ca-certificates \
     cmake \
     make \
+    gcc \
     pkgconf \
     curl-dev \
     libarchive-dev \

staging/Dockerfile.debian

@@ -14,22 +14,9 @@ RUN apt-get update && \
     apt-get install -y locales tzdata && \
     localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
     apt-get install --no-install-recommends -y \
-    clang \
-    gcc \
-    g++ \
-    git \
-    meson \
-    pkg-config \
-    swig \
-    valgrind \
-    xz-utils \
-    make \
-    libjson-c-dev \
-    libssl-dev \
-    libkeyutils-dev \
-    libdbus-1-dev \
     ca-certificates \
     cmake \
+    make \
     libpkgconf-dev \
     libcurl4-openssl-dev \
     libarchive-dev \

staging/Dockerfile.fedora

@@ -12,21 +12,10 @@ ENV TZ=Europe/Berlin
 RUN dnf update -y && \
     dnf install -y glibc-langpack-en tzdata && \
     dnf install -y \
-    clang \
-    gcc \
-    gcc-c++ \
-    git \
-    meson \
-    pkg-config \
-    swig \
-    valgrind \
-    json-c-devel \
-    openssl-devel \
-    keyutils-libs-devel \
-    dbus-devel \
     ca-certificates \
     cmake \
     make \
+    gcc \
     pkgconf-pkg-config \
     libcurl-devel \
     libarchive-devel \

staging/Dockerfile.tumbleweed

@@ -15,21 +15,10 @@ RUN zypper --non-interactive refresh && \
         glibc-locale-base \
         timezone && \
     zypper --non-interactive install --no-recommends \
-    clang \
-    gcc \
-    gcc-c++ \
-    git \
-    meson \
-    pkgconf-pkg-config \
-    swig \
-    valgrind \
-    libjson-c-devel \
-    libopenssl-devel \
-    keyutils-devel \
-    dbus-1-devel \
     ca-certificates \
     cmake \
     make \
+    gcc \
     pkg-config \
     libcurl-devel \
     libarchive-devel \