Fix ubuntu build issues and add docker images build and Makefile to d…

…o that
jfv-opensource · Apr 16, 2024 · b1826a5 · b1826a5
1 parent 7ce66a5
commit b1826a5
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 8 deletions.
diff --git a/.github/workflows/test-km.yml b/.github/workflows/test-km.yml
@@ -20,7 +20,7 @@ jobs:
   km_matrix:
     strategy:
       matrix:
-        os: [ubuntu-22.04, ubuntu-20.04]
+        os: [ ubuntu-24.04, ubuntu-22.04, ubuntu-20.04]
     runs-on: ${{ matrix.os }}
     steps:
         # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

diff --git a/Makefile b/Makefile
@@ -24,6 +24,8 @@ clean: common-clean
 	-rm -f debian/*.1 
 	-rm -f usr/bin/*
 	-rmdir usr/bin usr
+	-rm -Rf docker/debian/*/build
+	-rm -Rf docker/ubuntu/*/build
 
 .PHONY: debian build
 debian: 
@@ -32,9 +34,41 @@ debian:
 debian-clean:
 	debclean
 
-docker: common-build
-	cp -f build/km build/km.sh
-	cp -f build/kc build/kc.sh
-	cp -f build/kw build/kw.sh
-	cp -f build/klb build/klb.sh
-	docker build -t kubetools .
+docker: docker-debian-bookworm docker-ubuntu-focal docker-ubuntu-jammy docker-ubuntu-noble
+
+docker-debian-bookworm: common-build
+	mkdir -p docker/debian/bookworm/build/
+	cp -f build/km docker/debian/bookworm/build/km.sh
+	cp -f build/kc docker/debian/bookworm/build/kc.sh
+	cp -f build/kw docker/debian/bookworm/build/kw.sh
+	cp -f build/klb docker/debian/bookworm/build/klb.sh
+	docker build -t kubetools-debian docker/debian/bookworm/
+
+docker-ubuntu-focal: common-build
+	mkdir -p docker/ubuntu/focal/build/
+	cp -f build/km docker/ubuntu/focal/build/km.sh
+	cp -f build/kc docker/ubuntu/focal/build/kc.sh
+	cp -f build/kw docker/ubuntu/focal/build/kw.sh
+	cp -f build/klb docker/ubuntu/focal/build/klb.sh
+	-docker rmi kubetools-ubuntu-focal
+	docker build -t kubetools-ubuntu-focal docker/ubuntu/focal
+
+docker-ubuntu-jammy: common-build
+	mkdir -p docker/ubuntu/jammy/build/
+	cp -f build/km docker/ubuntu/jammy/build/km.sh
+	cp -f build/kc docker/ubuntu/jammy/build/kc.sh
+	cp -f build/kw docker/ubuntu/jammy/build/kw.sh
+	cp -f build/klb docker/ubuntu/jammy/build/klb.sh
+	-docker rmi kubetools-ubuntu-jammy
+	docker build -t kubetools-ubuntu-jammy docker/ubuntu/jammy
+
+
+docker-ubuntu-noble: common-build
+	mkdir -p docker/ubuntu/noble/build/
+	cp -f build/km docker/ubuntu/noble/build/km.sh
+	cp -f build/kc docker/ubuntu/noble/build/kc.sh
+	cp -f build/kw docker/ubuntu/noble/build/kw.sh
+	cp -f build/klb docker/ubuntu/noble/build/klb.sh
+	-docker rmi kubetools-ubuntu-nobble
+	docker build -t kubetools-ubuntu-nobble docker/ubuntu/noble
+
diff --git a/common b/common
@@ -61,6 +61,8 @@ function common_install() {
     apt install -y curl gnupg2 software-properties-common apt-transport-https ca-certificates > /dev/null 2>&1
     display_message_result "Installing base needed packages"
 
+    mkdir -p /etc/apt/keyrings
+
     rm -f /etc/apt/trusted.gpg.d/docker.gpg 
     curl -fsSL "https://download.docker.com/linux/$(lsb_release -a 2> /dev/null|grep 'Distributor ID:'|cut -d$'\t' -f2|tr '[:upper:]' '[:lower:]')/gpg" | gpg --dearmour -o /etc/apt/trusted.gpg.d/docker.gpg 
     display_message_result "Adding docker package repository signature"

diff --git a/Dockerfile → docker/debian/bookworm/Dockerfile b/Dockerfile → docker/debian/bookworm/Dockerfile
@@ -2,7 +2,8 @@ FROM debian:stable-slim
 
 COPY build/kc.sh build/klb.sh build/kw.sh build/km.sh /usr/bin/
 
-RUN apt update && \
+RUN mkdir -p /etc/apt/keyrings && \
+    apt update && \
     apt upgrade -y && \
     apt install -y jq curl gpg wget sshpass openssh-client && \
     curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg && \

diff --git a/docker/ubuntu/focal/Dockerfile b/docker/ubuntu/focal/Dockerfile
@@ -0,0 +1,24 @@
+FROM ubuntu:focal
+
+COPY build/kc.sh build/klb.sh build/kw.sh build/km.sh /usr/bin/
+
+RUN mkdir -p /etc/apt/keyrings && \
+    apt update && \
+    apt upgrade -y && \
+    apt install -y jq curl gpg wget sshpass openssh-client && \
+    curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg && \
+    echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list && \
+    chmod 644 /etc/apt/keyrings/kubernetes-apt-keyring.gpg && \
+    chmod 644 /etc/apt/sources.list.d/kubernetes.list && \
+    apt update && \
+    apt install -y kubectl  && \
+    # Hard cleanning
+    apt-get clean autoclean && \
+    apt-get autoremove --yes  && \
+    rm -rf /var/lib/{apt,dpkg,cache,log}/ && \
+    chmod 755 /usr/bin/kc.sh  /usr/bin/km.sh /usr/bin/kw.sh /usr/bin/klb.sh
+
+
+ENTRYPOINT ["/usr/bin/kc.sh"]
+
+
diff --git a/docker/ubuntu/jammy/Dockerfile b/docker/ubuntu/jammy/Dockerfile
@@ -0,0 +1,24 @@
+FROM ubuntu:jammy
+
+COPY build/kc.sh build/klb.sh build/kw.sh build/km.sh /usr/bin/
+
+RUN mkdir -p /etc/apt/keyrings && \
+    apt update && \
+    apt upgrade -y && \
+    apt install -y jq curl gpg wget sshpass openssh-client && \
+    curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg && \
+    echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list && \
+    chmod 644 /etc/apt/keyrings/kubernetes-apt-keyring.gpg && \
+    chmod 644 /etc/apt/sources.list.d/kubernetes.list && \
+    apt update && \
+    apt install -y kubectl  && \
+    # Hard cleanning
+    apt-get clean autoclean && \
+    apt-get autoremove --yes  && \
+    rm -rf /var/lib/{apt,dpkg,cache,log}/ && \
+    chmod 755 /usr/bin/kc.sh  /usr/bin/km.sh /usr/bin/kw.sh /usr/bin/klb.sh
+
+
+ENTRYPOINT ["/usr/bin/kc.sh"]
+
+
diff --git a/docker/ubuntu/noble/Dockerfile b/docker/ubuntu/noble/Dockerfile
@@ -0,0 +1,24 @@
+FROM ubuntu:noble
+
+COPY build/kc.sh build/klb.sh build/kw.sh build/km.sh /usr/bin/
+
+RUN mkdir -p /etc/apt/keyrings && \
+    apt update && \
+    apt upgrade -y && \
+    apt install -y jq curl gpg wget sshpass openssh-client && \
+    curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg && \
+    echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list && \
+    chmod 644 /etc/apt/keyrings/kubernetes-apt-keyring.gpg && \
+    chmod 644 /etc/apt/sources.list.d/kubernetes.list && \
+    apt update && \
+    apt install -y kubectl  && \
+    # Hard cleanning
+    apt-get clean autoclean && \
+    apt-get autoremove --yes  && \
+    rm -rf /var/lib/{apt,dpkg,cache,log}/ && \
+    chmod 755 /usr/bin/kc.sh  /usr/bin/km.sh /usr/bin/kw.sh /usr/bin/klb.sh
+
+
+ENTRYPOINT ["/usr/bin/kc.sh"]
+
+