Merge pull request #948 from srbala/add-el9

weaveworks · Oct 20, 2022 · e376664 · e376664
2 parents 7ab61c6 + 420f515
commit e376664
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/images/Makefile b/images/Makefile
@@ -148,8 +148,10 @@ push-all: build-all
 build-all: build-almalinux build-alpine build-amazon-kernel build-amazonlinux build-centos build-k3s build-kubeadm build-opensuse build-rockylinux build-ubuntu
 
 build-almalinux:
-	$(MAKE) ${OP} WHAT=almalinux      RELEASE=8                                        IS_LATEST=true  IS_MANIFEST_LIST=1  GOARCH=amd64
-	$(MAKE) ${OP} WHAT=almalinux      RELEASE=8                                        IS_LATEST=true  IS_MANIFEST_LIST=1  GOARCH=arm64
+	$(MAKE) ${OP} WHAT=almalinux      RELEASE=8                                                        IS_MANIFEST_LIST=1  GOARCH=amd64
+	$(MAKE) ${OP} WHAT=almalinux      RELEASE=8                                                        IS_MANIFEST_LIST=1  GOARCH=arm64
+	$(MAKE) ${OP} WHAT=almalinux      RELEASE=9                                        IS_LATEST=true  IS_MANIFEST_LIST=1  GOARCH=amd64
+	$(MAKE) ${OP} WHAT=almalinux      RELEASE=9                                        IS_LATEST=true  IS_MANIFEST_LIST=1  GOARCH=arm64
 
 build-alpine:
 ifeq ($(OP),build)
@@ -181,8 +183,10 @@ build-opensuse:
 	$(MAKE) ${OP} WHAT=opensuse       RELEASE=tumbleweed
 
 build-rockylinux:
-	$(MAKE) ${OP} WHAT=rockylinux      RELEASE=8                                        IS_LATEST=true  IS_MANIFEST_LIST=1  GOARCH=amd64  DIGEST=f0d7460b97156f6c8ea2ae73152bc11fe410d272387d60ddff36dfcea22ef689
-	$(MAKE) ${OP} WHAT=rockylinux      RELEASE=8                                        IS_LATEST=true  IS_MANIFEST_LIST=1  GOARCH=arm64  DIGEST=e98dd481db7973d701f8695df7be1b2393261cf273aa68a89d873b7b134588df
+	$(MAKE) ${OP} WHAT=rockylinux      RELEASE=8                                                       IS_MANIFEST_LIST=1  GOARCH=amd64
+	$(MAKE) ${OP} WHAT=rockylinux      RELEASE=8                                                       IS_MANIFEST_LIST=1  GOARCH=arm64
+	$(MAKE) ${OP} WHAT=rockylinux      RELEASE=9                                       IS_LATEST=true  IS_MANIFEST_LIST=1  GOARCH=amd64
+	$(MAKE) ${OP} WHAT=rockylinux      RELEASE=9                                       IS_LATEST=true  IS_MANIFEST_LIST=1  GOARCH=arm64
 
 build-ubuntu:
 	$(MAKE) ${OP} WHAT=ubuntu         RELEASE=16.04                                                    IS_MANIFEST_LIST=0

diff --git a/images/almalinux/Dockerfile b/images/almalinux/Dockerfile
@@ -21,7 +21,7 @@ RUN dnf -y install --setopt=install_weak_deps=False --setopt=tsflags=nodocs \
     dnf clean all
 
 # Create the following files, but unset them
-RUN echo "" > /etc/machine-id && echo "" > /var/lib/dbus/machine-id
+RUN echo "" > /etc/machine-id && mkdir -p /var/lib/dbus/ && echo "" > /var/lib/dbus/machine-id
 
 # This container image doesn't have locales installed. Disable forwarding the
 # user locale env variables or we get warnings such as:

diff --git a/images/rockylinux/Dockerfile b/images/rockylinux/Dockerfile
@@ -1,5 +1,6 @@
-ARG DIGEST
-FROM rockylinux/rockylinux@sha256:${DIGEST}
+ARG RELEASE=8
+
+FROM DOCKERARCH/rockylinux:${RELEASE}
 
 # If we're building for another architecture than amd64, this let's us emulate an other platform's docker build.
 # If we're building normally, for amd64, this line is removed
@@ -19,7 +20,7 @@ RUN dnf -y install --setopt=install_weak_deps=False --setopt=tsflags=nodocs \
     dnf clean all
 
 # Create the following files, but unset them
-RUN echo "" > /etc/machine-id && echo "" > /var/lib/dbus/machine-id
+RUN echo "" > /etc/machine-id && mkdir -p /var/lib/dbus/ && echo "" > /var/lib/dbus/machine-id
 
 # This container image doesn't have locales installed. Disable forwarding the
 # user locale env variables or we get warnings such as: