Merge pull request #5703 from makhov/backport-5697-to-release-1.31

[Backport release-1.31] Debian-based distros support in the build pipeline

Author: makhov

build/Dockerfile

@@ -9,7 +9,15 @@ RUN set -ex; \
   arm*) binutils=binutils-gold ;; \
     *)    binutils=binutils ;; \
   esac; \
-  apk add --no-cache make gcc musl-dev "$binutils"
+  if [ ! -z "$(which apt)" ]; then \
+     apt update && apt install -y make gcc; \
+  elif [ ! -z "$(which apk)" ]; then \
+     apk add --no-cache make gcc musl-dev "$binutils"; \
+  else \
+     echo "unsupported package manager"; \
+     exit 1; \
+  fi
+
 
 ENV \
   HOME="/run/k0s-build" \

embedded-bins/containerd/Dockerfile

@@ -3,10 +3,20 @@ FROM $BUILDIMAGE AS build
 
 ENV GOPATH=/go
 
-RUN apk upgrade -U -a && apk add \
-	build-base git \
-	btrfs-progs-dev btrfs-progs-static \
-	protoc bash
+RUN if [ ! -z "$(which apt)" ]; then \
+       apt update && apt install -y \
+        build-essential git \
+        btrfs-progs protobuf-compiler \
+        bash; \
+    elif [ ! -z "$(which apk)" ]; then \
+       apk upgrade -U -a && apk add \
+        build-base git \
+        btrfs-progs-dev btrfs-progs-static \
+        protoc bash; \
+    else \
+       echo "unsupported package manager"; \
+       exit 1; \
+    fi
 
 ARG VERSION
 RUN mkdir -p $GOPATH/src/github.com/containerd/containerd

embedded-bins/etcd/Dockerfile

@@ -1,7 +1,15 @@
 ARG BUILDIMAGE
 FROM $BUILDIMAGE AS build
 
-RUN apk add build-base git
+RUN if [ ! -z "$(which apt)" ]; then \
+       apt update && apt install -y build-essential git; \
+    elif [ ! -z "$(which apk)" ]; then \
+       apk add build-base git; \
+    else \
+       echo "unsupported package manager"; \
+       exit 1; \
+    fi
+
 
 ARG VERSION
 RUN cd / && git -c advice.detachedHead=false clone -b v$VERSION --depth=1 https://github.com/etcd-io/etcd.git

embedded-bins/iptables/Dockerfile

@@ -1,10 +1,19 @@
 ARG BUILDIMAGE
 FROM $BUILDIMAGE AS build
 
-RUN apk add build-base curl pkgconf \
-	linux-headers \
-	libmnl-dev libmnl-static \
-	libnftnl-dev
+RUN if [ ! -z "$(which apt)" ]; then \
+       apt update && apt install -y build-essential curl \
+        pkg-config \
+        libmnl-dev libnftnl-dev; \
+    elif [ ! -z "$(which apk)" ]; then \
+       apk add build-base curl pkgconf \
+         linux-headers \
+         libmnl-dev libmnl-static \
+         libnftnl-dev; \
+    else \
+       echo "unsupported package manager"; \
+       exit 1; \
+    fi
 
 ARG VERSION
 RUN curl --proto '=https' --tlsv1.2 -L https://www.netfilter.org/projects/iptables/files/iptables-$VERSION.tar.xz \

embedded-bins/keepalived/Dockerfile

@@ -1,10 +1,19 @@
 ARG BUILDIMAGE
 FROM $BUILDIMAGE AS build
 
-RUN apk add build-base curl \
-	linux-headers \
-	openssl-dev openssl-libs-static \
-	libnl3-dev libnl3-static
+RUN if [ ! -z "$(which apt)" ]; then \
+       apt update && apt install -y build-essential curl \
+        openssl libssl-dev \
+        libnl-3-dev libnl-3-200 libnl-genl-3-dev; \
+    elif [ ! -z "$(which apk)" ]; then \
+       apk add build-base curl \
+        linux-headers \
+        openssl-dev openssl-libs-static \
+        libnl3-dev libnl3-static; \
+    else \
+       echo "unsupported package manager"; \
+       exit 1; \
+    fi
 
 ARG VERSION
 RUN curl --proto '=https' --tlsv1.2 -L https://www.keepalived.org/software/keepalived-$VERSION.tar.gz \

embedded-bins/kine/Dockerfile

@@ -1,7 +1,14 @@
 ARG BUILDIMAGE
 FROM $BUILDIMAGE AS build
 
-RUN apk add build-base git
+RUN if [ ! -z "$(which apt)" ]; then \
+       apt update && apt install -y build-essential git; \
+    elif [ ! -z "$(which apk)" ]; then \
+       apk add build-base git; \
+    else \
+       echo "unsupported package manager"; \
+       exit 1; \
+    fi
 
 ARG VERSION
 RUN cd / && git -c advice.detachedHead=false clone -b v$VERSION --depth=1 https://github.com/rancher/kine.git

embedded-bins/konnectivity/Dockerfile

@@ -1,7 +1,14 @@
 ARG BUILDIMAGE
 FROM $BUILDIMAGE AS build
 
-RUN apk add build-base git make protoc
+RUN if [ ! -z "$(which apt)" ]; then \
+       apt update && apt install -y build-essential make protobuf-compiler git; \
+    elif [ ! -z "$(which apk)" ]; then \
+       apk add build-base git make protoc; \
+    else \
+       echo "unsupported package manager"; \
+       exit 1; \
+    fi
 
 ARG VERSION
 RUN git -c advice.detachedHead=false clone -b v$VERSION --depth=1 https://github.com/kubernetes-sigs/apiserver-network-proxy.git /apiserver-network-proxy

embedded-bins/kubernetes/Dockerfile

@@ -2,7 +2,15 @@ ARG BUILDIMAGE
 FROM $BUILDIMAGE AS build
 
 ARG VERSION
-RUN apk add build-base git linux-headers rsync grep coreutils bash
+
+RUN if [ ! -z "$(which apt)" ]; then \
+       apt update && apt install -y build-essential git rsync grep coreutils bash; \
+    elif [ ! -z "$(which apk)" ]; then \
+       apk add build-base git linux-headers rsync grep coreutils bash; \
+    else \
+       echo "unsupported package manager"; \
+       exit 1; \
+    fi
 
 RUN mkdir -p $GOPATH/src/github.com/kubernetes/kubernetes
 RUN git -c advice.detachedHead=false clone -b v$VERSION --depth=1 https://github.com/kubernetes/kubernetes.git $GOPATH/src/github.com/kubernetes/kubernetes
@@ -46,3 +54,4 @@ RUN \
 
 FROM scratch
 COPY --from=build out/* /bin/
+

embedded-bins/runc/Dockerfile

@@ -1,8 +1,16 @@
 ARG BUILDIMAGE
 FROM $BUILDIMAGE AS build
 
-RUN apk add build-base git \
-	curl linux-headers gperf bash pkgconf cmd:tail
+RUN if [ ! -z "$(which apt)" ]; then \
+       apt update && apt install -y build-essential git \
+        curl gperf bash pkg-config; \
+    elif [ ! -z "$(which apk)" ]; then \
+       apk add build-base git \
+       	curl linux-headers gperf bash pkgconf cmd:tail; \
+    else \
+       echo "unsupported package manager"; \
+       exit 1; \
+    fi
 
 ENV GOPATH=/go