drbd-driver-loader: use ADD to fetch DRBD tarball and entry script

Signed-off-by: Moritz Wanzenböck <[email protected]>
piraeusdatastore · Jun 24, 2024 · c662086 · c662086
1 parent 64e7d60
commit c662086
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 27 deletions.
diff --git a/dockerfiles/drbd-driver-loader/Dockerfile.almalinux8 b/dockerfiles/drbd-driver-loader/Dockerfile.almalinux8
@@ -5,8 +5,8 @@ RUN dnf -y update-minimal --security --sec-severity=Important --sec-severity=Cri
 	dnf install -y gcc make patch diffutils perl elfutils-libelf-devel kmod && dnf clean all -y
 
 ARG DRBD_VERSION
-RUN curl -fsSL https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz -o /drbd.tar.gz && \
-    curl -fsSL https://raw.githubusercontent.com/LINBIT/drbd/master/docker/entry.sh -o /entry.sh && chmod +x /entry.sh
+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.almalinux9 b/dockerfiles/drbd-driver-loader/Dockerfile.almalinux9
@@ -5,8 +5,8 @@ RUN dnf -y update-minimal --security --sec-severity=Important --sec-severity=Cri
 	dnf install -y gcc make patch diffutils perl elfutils-libelf-devel kmod && dnf clean all -y
 
 ARG DRBD_VERSION
-RUN curl -fsSL https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz -o /drbd.tar.gz && \
-    curl -fsSL https://raw.githubusercontent.com/LINBIT/drbd/master/docker/entry.sh -o /entry.sh && chmod +x /entry.sh
+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.bionic b/dockerfiles/drbd-driver-loader/Dockerfile.bionic
@@ -6,7 +6,6 @@ RUN apt-get update && \
       ca-certificates \
       kmod \
       gnupg \
-      wget \
       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}') \
@@ -18,8 +17,8 @@ RUN apt-get update && \
     apt-get clean
 
 ARG DRBD_VERSION
-RUN wget https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz -O /drbd.tar.gz && \
-    wget https://raw.githubusercontent.com/LINBIT/drbd/master/docker/entry.sh -O /entry.sh && chmod +x /entry.sh
+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.bookworm b/dockerfiles/drbd-driver-loader/Dockerfile.bookworm
@@ -1,10 +1,10 @@
 FROM debian:bookworm
 
-RUN apt-get update && apt-get upgrade -y && apt-get install -y kmod gnupg wget make gcc patch diffutils perl elfutils curl 'linux-kbuild-*' && apt-get clean
+RUN apt-get update && apt-get upgrade -y && apt-get install -y kmod gnupg make gcc patch diffutils perl elfutils curl 'linux-kbuild-*' && apt-get clean
 
 ARG DRBD_VERSION
-RUN wget https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz -O /drbd.tar.gz && \
-    wget https://raw.githubusercontent.com/LINBIT/drbd/master/docker/entry.sh -O /entry.sh && chmod +x /entry.sh
+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.bullseye b/dockerfiles/drbd-driver-loader/Dockerfile.bullseye
@@ -1,10 +1,10 @@
 FROM debian:bullseye
 
-RUN apt-get update && apt-get upgrade -y && apt-get install -y kmod gnupg wget make gcc patch diffutils perl elfutils curl 'linux-kbuild-*' && apt-get clean
+RUN apt-get update && apt-get upgrade -y && apt-get install -y kmod gnupg make gcc patch diffutils perl elfutils curl 'linux-kbuild-*' && apt-get clean
 
 ARG DRBD_VERSION
-RUN wget https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz -O /drbd.tar.gz && \
-    wget https://raw.githubusercontent.com/LINBIT/drbd/master/docker/entry.sh -O /entry.sh && chmod +x /entry.sh
+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.buster b/dockerfiles/drbd-driver-loader/Dockerfile.buster
@@ -1,10 +1,10 @@
 FROM debian:buster
 
-RUN apt-get update && apt-get upgrade -y && apt-get install -y kmod gnupg wget make gcc patch diffutils perl elfutils curl 'linux-kbuild-*' && apt-get clean
+RUN apt-get update && apt-get upgrade -y && apt-get install -y kmod gnupg make gcc patch diffutils perl elfutils curl 'linux-kbuild-*' && apt-get clean
 
 ARG DRBD_VERSION
-RUN wget https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz -O /drbd.tar.gz && \
-    wget https://raw.githubusercontent.com/LINBIT/drbd/master/docker/entry.sh -O /entry.sh && chmod +x /entry.sh
+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.centos7 b/dockerfiles/drbd-driver-loader/Dockerfile.centos7
@@ -5,8 +5,8 @@ RUN yum -y update-minimal --security --sec-severity=Important --sec-severity=Cri
 	yum install -y gcc make patch diffutils perl kmod && yum clean all -y
 
 ARG DRBD_VERSION
-RUN curl -fsSL https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz -o /drbd.tar.gz && \
-    curl -fsSL https://raw.githubusercontent.com/LINBIT/drbd/master/docker/entry.sh -o /entry.sh && chmod +x /entry.sh
+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
@@ -6,7 +6,6 @@ RUN apt-get update && \
       ca-certificates \
       kmod \
       gnupg \
-      wget \
       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}') \
@@ -18,8 +17,8 @@ RUN apt-get update && \
     apt-get clean
 
 ARG DRBD_VERSION
-RUN wget https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz -O /drbd.tar.gz && \
-    wget https://raw.githubusercontent.com/LINBIT/drbd/master/docker/entry.sh -O /entry.sh && chmod +x /entry.sh
+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.jammy b/dockerfiles/drbd-driver-loader/Dockerfile.jammy
@@ -6,7 +6,6 @@ RUN apt-get update && \
       ca-certificates \
       kmod \
       gnupg \
-      wget \
       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}') \
@@ -18,8 +17,8 @@ RUN apt-get update && \
     apt-get clean
 
 ARG DRBD_VERSION
-RUN wget https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz -O /drbd.tar.gz && \
-    wget https://raw.githubusercontent.com/LINBIT/drbd/master/docker/entry.sh -O /entry.sh && chmod +x /entry.sh
+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.noble b/dockerfiles/drbd-driver-loader/Dockerfile.noble
@@ -6,7 +6,6 @@ RUN apt-get update && \
       ca-certificates \
       kmod \
       gpg \
-      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 \
@@ -19,8 +18,8 @@ RUN apt-get update && \
     apt-get clean
 
 ARG DRBD_VERSION
-RUN curl -fsSL https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz -o /drbd.tar.gz && \
-    curl -fsSL https://raw.githubusercontent.com/LINBIT/drbd/master/docker/entry.sh -o /entry.sh && chmod +x /entry.sh
+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