From fa2fd22b85b7ca3477d77bea6047172ef1d734d0 Mon Sep 17 00:00:00 2001 From: ange Date: Fri, 10 May 2024 12:01:12 +0200 Subject: [PATCH 01/10] feat: remove kubectl from base image --- .gitea/workflows/build.yaml | 3 --- debian/Dockerfile | 13 ++----------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 39070ea..c4264eb 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,10 +1,7 @@ -name: test - on: push jobs: build: - name: test runs-on: debian steps: - uses: actions/checkout@v1 diff --git a/debian/Dockerfile b/debian/Dockerfile index 0b169e1..9a76701 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -1,13 +1,3 @@ -FROM debian:12-slim as kubectl -RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - git \ - && rm -rf /var/lib/apt/lists/* -ENV K8S_VERSION=v1.27 -RUN V="$(git ls-remote --tags --refs --sort=version:refname https://github.com/kubernetes/kubernetes "$K8S_VERSION.*" | awk -F/ 'END{print $NF}')" \ - && curl -Lo /kubectl "https://dl.k8s.io/release/$V/bin/linux/amd64/kubectl" - FROM debian:12-slim ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -16,4 +6,5 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ git \ jq \ && rm -rf /var/lib/apt/lists/* -COPY --from=kubectl --chmod=0755 /kubectl /usr/local/bin/ +RUN useradd -m app +USER app From 0923bb7500ac8361efbbf0356e15e77b24dbaaa8 Mon Sep 17 00:00:00 2001 From: ange Date: Fri, 10 May 2024 12:39:43 +0200 Subject: [PATCH 02/10] feat: kubectl --- debian/Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/Dockerfile b/debian/Dockerfile index 9a76701..ed414b5 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -1,3 +1,13 @@ +FROM debian:12-slim as kubectl +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates \ + curl \ + && rm -rf /var/lib/apt/lists/* +RUN V="$(curl -sSL https://dl.k8s.io/release/stable.txt)" \ + && curl -sSL \ + -o /kubectl "https://dl.k8s.io/release/$V/bin/linux/amd64/kubectl" + FROM debian:12-slim ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -6,5 +16,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ git \ jq \ && rm -rf /var/lib/apt/lists/* +COPY --from=kubectl --chmod=0755 /kubectl /usr/local/bin/kubectl RUN useradd -m app USER app From ad23ec2d7f11c1cc8676610e73da73ae38e396e9 Mon Sep 17 00:00:00 2001 From: ange Date: Fri, 10 May 2024 12:43:39 +0200 Subject: [PATCH 03/10] feat: curl --- debian/Dockerfile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index ed414b5..3d5c9ff 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -1,21 +1,15 @@ -FROM debian:12-slim as kubectl -ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - && rm -rf /var/lib/apt/lists/* -RUN V="$(curl -sSL https://dl.k8s.io/release/stable.txt)" \ - && curl -sSL \ - -o /kubectl "https://dl.k8s.io/release/$V/bin/linux/amd64/kubectl" - FROM debian:12-slim ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ + curl \ gettext-base \ git \ jq \ && rm -rf /var/lib/apt/lists/* -COPY --from=kubectl --chmod=0755 /kubectl /usr/local/bin/kubectl +RUN V="$(curl -sSL https://dl.k8s.io/release/stable.txt)" \ + && curl -sSL --create-file-mode 0755 \ + -o /usr/local/bin/kubectl \ + "https://dl.k8s.io/release/$V/bin/linux/amd64/kubectl" RUN useradd -m app USER app From 7320dc37ee9e45c6c3ff4b83e02a73cb4af00ffb Mon Sep 17 00:00:00 2001 From: ange Date: Fri, 10 May 2024 12:55:19 +0200 Subject: [PATCH 04/10] fix: curl --create-file-mode !local --- debian/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index 3d5c9ff..c36323a 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -8,8 +8,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ jq \ && rm -rf /var/lib/apt/lists/* RUN V="$(curl -sSL https://dl.k8s.io/release/stable.txt)" \ - && curl -sSL --create-file-mode 0755 \ - -o /usr/local/bin/kubectl \ - "https://dl.k8s.io/release/$V/bin/linux/amd64/kubectl" + && curl -sSLo /usr/local/bin/kubectl \ + "https://dl.k8s.io/release/$V/bin/linux/amd64/kubectl" \ + && chmod 0755 /usr/local/bin/kubectl RUN useradd -m app USER app From de8000923a509859a9bdb15a85dc80f3b3efca25 Mon Sep 17 00:00:00 2001 From: ange Date: Wed, 9 Oct 2024 07:35:19 +0700 Subject: [PATCH 05/10] feat: disable registry cache --- .gitea/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index c4264eb..e219934 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -10,3 +10,4 @@ jobs: dockerfile: debian/Dockerfile image: actions/debian:latest password: "${{ secrets.PKGRW }}" + cache: false From e893466e8647c3d490c64c9730ac5c9802caae24 Mon Sep 17 00:00:00 2001 From: ange Date: Mon, 18 Nov 2024 10:41:33 +0000 Subject: [PATCH 06/10] feat: openssh-client --- debian/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/Dockerfile b/debian/Dockerfile index c36323a..a788927 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gettext-base \ git \ jq \ + openssh-client \ && rm -rf /var/lib/apt/lists/* RUN V="$(curl -sSL https://dl.k8s.io/release/stable.txt)" \ && curl -sSLo /usr/local/bin/kubectl \ From 91624ed7a9ba0a26d48db54c71ef6d253e774d54 Mon Sep 17 00:00:00 2001 From: ange Date: Sat, 4 Oct 2025 18:03:45 +0000 Subject: [PATCH 07/10] bump: trixie-20250929-slim --- debian/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index a788927..8931713 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:12-slim +FROM docker.io/debian:trixie-20250929-slim ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ @@ -8,9 +8,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ jq \ openssh-client \ && rm -rf /var/lib/apt/lists/* -RUN V="$(curl -sSL https://dl.k8s.io/release/stable.txt)" \ - && curl -sSLo /usr/local/bin/kubectl \ - "https://dl.k8s.io/release/$V/bin/linux/amd64/kubectl" \ +RUN curl -sLo /usr/local/bin/kubectl \ + "https://dl.k8s.io/release/v1.34.1/bin/linux/amd64/kubectl" \ && chmod 0755 /usr/local/bin/kubectl RUN useradd -m app USER app From 6c0a8f7d4b3ccde7bb863f391c7d0c133068d056 Mon Sep 17 00:00:00 2001 From: ange Date: Sun, 19 Oct 2025 17:16:08 +0000 Subject: [PATCH 08/10] docs: add link to kubectl latest --- debian/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/Dockerfile b/debian/Dockerfile index 8931713..a64afd3 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ jq \ openssh-client \ && rm -rf /var/lib/apt/lists/* +# https://dl.k8s.io/release/stable.txt RUN curl -sLo /usr/local/bin/kubectl \ "https://dl.k8s.io/release/v1.34.1/bin/linux/amd64/kubectl" \ && chmod 0755 /usr/local/bin/kubectl From 7eea4487202f149c6f136f35e051118eb1656d30 Mon Sep 17 00:00:00 2001 From: ange Date: Sun, 19 Oct 2025 17:41:28 +0000 Subject: [PATCH 09/10] feat: yq --- debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index a64afd3..0120f18 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -5,8 +5,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ gettext-base \ git \ - jq \ openssh-client \ + yq \ && rm -rf /var/lib/apt/lists/* # https://dl.k8s.io/release/stable.txt RUN curl -sLo /usr/local/bin/kubectl \ From f8f8c01a0bbe6ddd71d04f286d33cd73978bba05 Mon Sep 17 00:00:00 2001 From: ange Date: Wed, 22 Oct 2025 03:56:39 +0000 Subject: [PATCH 10/10] fix: replace gitea by forgejo --- {.gitea => .forgejo}/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename {.gitea => .forgejo}/workflows/build.yaml (87%) diff --git a/.gitea/workflows/build.yaml b/.forgejo/workflows/build.yaml similarity index 87% rename from .gitea/workflows/build.yaml rename to .forgejo/workflows/build.yaml index e219934..5c61f86 100644 --- a/.gitea/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -5,7 +5,7 @@ jobs: runs-on: debian steps: - uses: actions/checkout@v1 - - uses: actions/kaniko@v1 + - uses: actions/buildkit@v1 with: dockerfile: debian/Dockerfile image: actions/debian:latest