From 5ea0d04baf62ebd4406afbe6da703ce1bdf4af60 Mon Sep 17 00:00:00 2001 From: The Oh Brothers Bot Date: Sat, 2 Sep 2023 11:11:55 +0000 Subject: [PATCH] Enhancement: Bump v1.24 variants to 1.24.17 Signed-off-by: The Oh Brothers Bot --- .github/workflows/ci-master-pr.yml | 32 +++++------ README.md | 4 +- generate/definitions/versions.json | 2 +- variants/v1.24.17-alpine-3.15/Dockerfile | 19 +++++++ .../v1.24.17-alpine-3.15/docker-entrypoint.sh | 10 ++++ .../Dockerfile | 57 +++++++++++++++++++ .../docker-entrypoint.sh | 10 ++++ 7 files changed, 115 insertions(+), 19 deletions(-) create mode 100644 variants/v1.24.17-alpine-3.15/Dockerfile create mode 100644 variants/v1.24.17-alpine-3.15/docker-entrypoint.sh create mode 100644 variants/v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15/Dockerfile create mode 100644 variants/v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15/docker-entrypoint.sh diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml index 5192be2..c821c83 100644 --- a/.github/workflows/ci-master-pr.yml +++ b/.github/workflows/ci-master-pr.yml @@ -994,10 +994,10 @@ jobs: rm -rf /tmp/.buildx-cache mv /tmp/.buildx-cache-new /tmp/.buildx-cache - build-v1-24-15-alpine-3-15: + build-v1-24-17-alpine-3-15: runs-on: ubuntu-latest env: - VARIANT: v1.24.15-alpine-3.15 + VARIANT: v1.24.17-alpine-3.15 steps: - name: Checkout uses: actions/checkout@v3 @@ -1069,7 +1069,7 @@ jobs: if: github.event_name == 'pull_request' uses: docker/build-push-action@v3 with: - context: variants/v1.24.15-alpine-3.15 + context: variants/v1.24.17-alpine-3.15 platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | @@ -1083,7 +1083,7 @@ jobs: if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v3 with: - context: variants/v1.24.15-alpine-3.15 + context: variants/v1.24.17-alpine-3.15 platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | @@ -1096,7 +1096,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v3 with: - context: variants/v1.24.15-alpine-3.15 + context: variants/v1.24.17-alpine-3.15 platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | @@ -1114,10 +1114,10 @@ jobs: rm -rf /tmp/.buildx-cache mv /tmp/.buildx-cache-new /tmp/.buildx-cache - build-v1-24-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15: + build-v1-24-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15: runs-on: ubuntu-latest env: - VARIANT: v1.24.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15 + VARIANT: v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15 steps: - name: Checkout uses: actions/checkout@v3 @@ -1189,7 +1189,7 @@ jobs: if: github.event_name == 'pull_request' uses: docker/build-push-action@v3 with: - context: variants/v1.24.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15 + context: variants/v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15 platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | @@ -1203,7 +1203,7 @@ jobs: if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v3 with: - context: variants/v1.24.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15 + context: variants/v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15 platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | @@ -1216,7 +1216,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v3 with: - context: variants/v1.24.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15 + context: variants/v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15 platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | @@ -3644,8 +3644,8 @@ jobs: - build-v1-26-8-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 - build-v1-25-13-alpine-3-15 - build-v1-25-13-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 - - build-v1-24-15-alpine-3-15 - - build-v1-24-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 + - build-v1-24-17-alpine-3-15 + - build-v1-24-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 - build-v1-23-17-alpine-3-15 - build-v1-23-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 - build-v1-22-17-alpine-3-15 @@ -3687,8 +3687,8 @@ jobs: - build-v1-26-8-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 - build-v1-25-13-alpine-3-15 - build-v1-25-13-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 - - build-v1-24-15-alpine-3-15 - - build-v1-24-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 + - build-v1-24-17-alpine-3-15 + - build-v1-24-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 - build-v1-23-17-alpine-3-15 - build-v1-23-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 - build-v1-22-17-alpine-3-15 @@ -3732,8 +3732,8 @@ jobs: - build-v1-26-8-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 - build-v1-25-13-alpine-3-15 - build-v1-25-13-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 - - build-v1-24-15-alpine-3-15 - - build-v1-24-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 + - build-v1-24-17-alpine-3-15 + - build-v1-24-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 - build-v1-23-17-alpine-3-15 - build-v1-23-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-15 - build-v1-22-17-alpine-3-15 diff --git a/README.md b/README.md index 755e462..f9e2e50 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ Dockerized `kubectl` with useful tools. | `:v1.26.8-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15` | [View](variants/v1.26.8-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15) | | `:v1.25.13-alpine-3.15` | [View](variants/v1.25.13-alpine-3.15) | | `:v1.25.13-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15` | [View](variants/v1.25.13-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15) | -| `:v1.24.15-alpine-3.15` | [View](variants/v1.24.15-alpine-3.15) | -| `:v1.24.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15` | [View](variants/v1.24.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15) | +| `:v1.24.17-alpine-3.15` | [View](variants/v1.24.17-alpine-3.15) | +| `:v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15` | [View](variants/v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15) | | `:v1.23.17-alpine-3.15` | [View](variants/v1.23.17-alpine-3.15) | | `:v1.23.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15` | [View](variants/v1.23.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15) | | `:v1.22.17-alpine-3.15` | [View](variants/v1.22.17-alpine-3.15) | diff --git a/generate/definitions/versions.json b/generate/definitions/versions.json index be0467a..e597af3 100644 --- a/generate/definitions/versions.json +++ b/generate/definitions/versions.json @@ -3,7 +3,7 @@ "1.27.5", "1.26.8", "1.25.13", - "1.24.15", + "1.24.17", "1.23.17", "1.22.17", "1.21.14", diff --git a/variants/v1.24.17-alpine-3.15/Dockerfile b/variants/v1.24.17-alpine-3.15/Dockerfile new file mode 100644 index 0000000..3a98b9c --- /dev/null +++ b/variants/v1.24.17-alpine-3.15/Dockerfile @@ -0,0 +1,19 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.24.17/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/v1.24.17-alpine-3.15/docker-entrypoint.sh b/variants/v1.24.17-alpine-3.15/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/v1.24.17-alpine-3.15/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15/Dockerfile b/variants/v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15/Dockerfile new file mode 100644 index 0000000..3d64550 --- /dev/null +++ b/variants/v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15/Dockerfile @@ -0,0 +1,57 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.24.17/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +RUN set -eux; \ + wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \ + chmod +x /usr/local/bin/sops; \ + sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \ + sops --version + +RUN apk add --no-cache gnupg + +RUN apk add --no-cache openssh-client + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15/docker-entrypoint.sh b/variants/v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/v1.24.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.15/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file