diff --git a/dockerfiles/docker-bake.hcl b/dockerfiles/docker-bake.hcl index 771a694..9017f5f 100644 --- a/dockerfiles/docker-bake.hcl +++ b/dockerfiles/docker-bake.hcl @@ -16,10 +16,10 @@ variable "CACHE" { variable VERSIONS { default = { - DRBD = ["9.2.13", "9.1.23"] + DRBD = ["9.2.14"] DRBD_REACTOR = "1.8.0-1" K8S_AWAIT_ELECTION = "v0.4.1" - KTLS_UTILS = "1.0.0-1" + KTLS_UTILS = "1.1.0-1" LINSTOR = "1.31.1-1" } } @@ -134,12 +134,10 @@ target "drbd-driver-loader" { matrix = { drbd_version = VERSIONS["DRBD"] distro = [ - "centos7", "centos8", "almalinux8", "almalinux9", - "bionic", - "focal", + "almalinux10", "jammy", "noble", "bullseye", diff --git a/dockerfiles/drbd-driver-loader/Dockerfile.centos7 b/dockerfiles/drbd-driver-loader/Dockerfile.almalinux10 similarity index 51% rename from dockerfiles/drbd-driver-loader/Dockerfile.centos7 rename to dockerfiles/drbd-driver-loader/Dockerfile.almalinux10 index 81ef949..95932a9 100644 --- a/dockerfiles/drbd-driver-loader/Dockerfile.centos7 +++ b/dockerfiles/drbd-driver-loader/Dockerfile.almalinux10 @@ -1,9 +1,8 @@ -FROM centos:centos7 +FROM almalinux:10 MAINTAINER Roland Kammerer -RUN sed -e 's/^mirrorlist=/#mirrorlist=/' -e 's%^#baseurl=http://mirror.centos.org%baseurl=http://vault.centos.org%' -i /etc/yum.repos.d/*.repo && \ - yum -y update-minimal --security --sec-severity=Important --sec-severity=Critical && \ - yum install -y gcc make patch diffutils perl kmod && yum clean all -y +RUN dnf -y update-minimal --security --sec-severity=Important --sec-severity=Critical && \ + dnf install -y gcc make patch diffutils perl elfutils-libelf-devel kmod && dnf clean all -y ARG DRBD_VERSION ADD https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz /drbd.tar.gz diff --git a/dockerfiles/drbd-driver-loader/Dockerfile.bionic b/dockerfiles/drbd-driver-loader/Dockerfile.bionic deleted file mode 100644 index 35e8642..0000000 --- a/dockerfiles/drbd-driver-loader/Dockerfile.bionic +++ /dev/null @@ -1,24 +0,0 @@ -FROM ubuntu:bionic - -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get install --no-install-recommends -y \ - ca-certificates \ - kmod \ - gnupg \ - make \ - # Ubuntu has multiple kernel versions that may be using different gcc versions: use the dkms package to install them all - $(apt-get install -s dkms | awk '/^Inst gcc/{print $2}') \ - patch \ - diffutils \ - perl \ - elfutils \ - curl && \ - apt-get clean - -ARG DRBD_VERSION -ADD https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz /drbd.tar.gz -ADD --chmod=0755 https://raw.githubusercontent.com/LINBIT/drbd/master/docker/entry.sh /entry.sh - -ENV LB_HOW compile -ENTRYPOINT /entry.sh diff --git a/dockerfiles/drbd-driver-loader/Dockerfile.focal b/dockerfiles/drbd-driver-loader/Dockerfile.focal deleted file mode 100644 index d05a672..0000000 --- a/dockerfiles/drbd-driver-loader/Dockerfile.focal +++ /dev/null @@ -1,24 +0,0 @@ -FROM ubuntu:focal - -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get install --no-install-recommends -y \ - ca-certificates \ - kmod \ - gnupg \ - make \ - # Ubuntu has multiple kernel versions that may be using different gcc versions: use the dkms package to install them all - $(apt-get install -s dkms | awk '/^Inst gcc/{print $2}') \ - patch \ - diffutils \ - perl \ - elfutils \ - curl && \ - apt-get clean - -ARG DRBD_VERSION -ADD https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz /drbd.tar.gz -ADD --chmod=0755 https://raw.githubusercontent.com/LINBIT/drbd/master/docker/entry.sh /entry.sh - -ENV LB_HOW compile -ENTRYPOINT /entry.sh