diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 802006c..bbb089e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,10 +14,10 @@ jobs: strategy: matrix: oc: - - "4.10" - "4.11" - "4.12" - "4.13" + - "4.14" steps: - uses: actions/checkout@v4 - name: Set up Docker Buildx diff --git a/Makefile b/Makefile index 9538596..d8df20e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # For supported versions see: # https://access.redhat.com/support/policy/updates/openshift/#dates -VERSIONS = v4.10 v4.11 v4.12 v4.13 +VERSIONS = v4.11 v4.12 v4.13 v4.14 # Also update in `.github/workflows/build.yml`! all: clean $(addsuffix /Dockerfile, $(VERSIONS)) diff --git a/README.md b/README.md index ab34364..68d2dc5 100644 --- a/README.md +++ b/README.md @@ -11,23 +11,20 @@ A container image that can be used in CI/CD pipelines to deploy apps to OpenShift. -Also ships the binaries for `helm`, `kustomize`, `kubeval`, `sops`, `yq` and the [moreutils]( -https://joeyh.name/code/moreutils/) package, for your convenience. +Also ships the binaries for `helm`, `kustomize`, `kubeval`, `sops`, `yq` and Python3, for your convenience. ## Container Images The built images are available from [Docker Hub][hub] and [Red Hat Quay.io][quay] +- `docker.io/appuio/oc:v4.14` +- `quay.io/appuio/oc:v4.14` +- `docker.io/appuio/oc:v4.13` +- `quay.io/appuio/oc:v4.13` - `docker.io/appuio/oc:v4.12` - `quay.io/appuio/oc:v4.12` - `docker.io/appuio/oc:v4.11` - `quay.io/appuio/oc:v4.11` -- `docker.io/appuio/oc:v4.10` -- `quay.io/appuio/oc:v4.10` -- `docker.io/appuio/oc:v4.9` -- `quay.io/appuio/oc:v4.9` -- `docker.io/appuio/oc:v4.8` -- `quay.io/appuio/oc:v4.8` ## Development diff --git a/src/Dockerfile b/src/Dockerfile index e1fc735..505aaf2 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/centos:7@sha256:be65f488b7764ad3638f236b7b515b3678369a5124c47b8d32916d6487418ea4 +FROM registry.access.redhat.com/ubi9-minimal:9.3 ENV VERSION=%%VERSION%% \ HELM3_VERSION=%%HELM3_VERSION%% \ @@ -33,6 +33,7 @@ RUN set -x && \ SEISO_URL="${SEISO_RELEASES_URL}/${SEISO_VERSION}/seiso_linux_amd64" && \ SOPS_URL="${SOPS_RELEASES_URL}/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux" && \ YQ_URL="${YQ_RELEASES_URL}/${YQ_VERSION}/yq_linux_amd64" && \ + microdnf install -y tar gzip git python3 && \ cd /tmp && \ curl -sSL "$URL" -o /tmp/oc.tgz && \ curl -sSL "$HELM3_URL" -o /tmp/helm3.tgz && \ @@ -67,7 +68,4 @@ RUN set -x && \ ln -s /bin/oc /bin/kubectl && \ ln -s /bin/helm3 /bin/helm && \ rm -rf /tmp/* && \ - yum install -y epel-release git gettext && \ - yum install -y moreutils && \ - yum clean all -y && \ git clone --depth=1 ${OC_PLUGINS_REPO} ${KUBECTL_PLUGINS_PATH} diff --git a/v4.11/Dockerfile b/v4.11/Dockerfile index 14e6e35..c337897 100644 --- a/v4.11/Dockerfile +++ b/v4.11/Dockerfile @@ -1,19 +1,19 @@ -FROM docker.io/library/centos:7@sha256:be65f488b7764ad3638f236b7b515b3678369a5124c47b8d32916d6487418ea4 +FROM registry.access.redhat.com/ubi9-minimal:9.3 ENV VERSION=latest-4.11 \ - HELM3_VERSION=v3.12.3 \ + HELM3_VERSION=v3.13.2 \ KUBEVAL_VERSION=v0.16.1 \ - KUSTOMIZE_VERSION=v5.1.1 \ + KUSTOMIZE_VERSION=v5.2.1 \ SEISO_VERSION=v1.0.0 \ - SOPS_VERSION=v3.7.3 \ - YQ_VERSION=v4.35.1 \ + SOPS_VERSION=v3.8.1 \ + YQ_VERSION=v4.40.4 \ ARCHIVE=openshift-client-linux \ - HELM3_SHA256SUM=1b2313cd198d45eab00cc37c38f6b1ca0a948ba279c29e322bdf426d406129b5 \ + HELM3_SHA256SUM=55a8e6dce87a1e52c61e0ce7a89bf85b38725ba3e8deb51d4a08ade8a2c70b2d \ KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \ - KUSTOMIZE_SHA256SUM=3b30477a7ff4fb6547fa77d8117e66d995c2bdd526de0dafbf8b7bcb9556c85d \ + KUSTOMIZE_SHA256SUM=88346543206b889f9287c0b92c70708040ecd5aad54dd33019c4d6579cd24de8 \ SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \ SHA256SUM= \ - YQ_SHA256SUM=bd695a6513f1196aeda17b174a15e9c351843fb1cef5f9be0af170f2dd744f08 \ + YQ_SHA256SUM=f9163412d9aa2aa55e888fdcaf2b4053ada20074be35f701424caa7163100704 \ HELM_RELEASES_URL="https://get.helm.sh" \ KUBEVAL_RELEASES_URL="https://github.com/instrumenta/kubeval/releases/download" \ KUSTOMIZE_RELEASES_URL="https://github.com/kubernetes-sigs/kustomize/releases/download" \ @@ -33,6 +33,7 @@ RUN set -x && \ SEISO_URL="${SEISO_RELEASES_URL}/${SEISO_VERSION}/seiso_linux_amd64" && \ SOPS_URL="${SOPS_RELEASES_URL}/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux" && \ YQ_URL="${YQ_RELEASES_URL}/${YQ_VERSION}/yq_linux_amd64" && \ + microdnf install -y tar gzip git python3 && \ cd /tmp && \ curl -sSL "$URL" -o /tmp/oc.tgz && \ curl -sSL "$HELM3_URL" -o /tmp/helm3.tgz && \ @@ -67,7 +68,4 @@ RUN set -x && \ ln -s /bin/oc /bin/kubectl && \ ln -s /bin/helm3 /bin/helm && \ rm -rf /tmp/* && \ - yum install -y epel-release git gettext && \ - yum install -y moreutils && \ - yum clean all -y && \ git clone --depth=1 ${OC_PLUGINS_REPO} ${KUBECTL_PLUGINS_PATH} diff --git a/v4.12/Dockerfile b/v4.12/Dockerfile index 72c48ba..abe39fa 100644 --- a/v4.12/Dockerfile +++ b/v4.12/Dockerfile @@ -1,19 +1,19 @@ -FROM docker.io/library/centos:7@sha256:be65f488b7764ad3638f236b7b515b3678369a5124c47b8d32916d6487418ea4 +FROM registry.access.redhat.com/ubi9-minimal:9.3 ENV VERSION=latest-4.12 \ - HELM3_VERSION=v3.12.3 \ + HELM3_VERSION=v3.13.2 \ KUBEVAL_VERSION=v0.16.1 \ - KUSTOMIZE_VERSION=v5.1.1 \ + KUSTOMIZE_VERSION=v5.2.1 \ SEISO_VERSION=v1.0.0 \ - SOPS_VERSION=v3.7.3 \ - YQ_VERSION=v4.35.1 \ + SOPS_VERSION=v3.8.1 \ + YQ_VERSION=v4.40.4 \ ARCHIVE=openshift-client-linux \ - HELM3_SHA256SUM=1b2313cd198d45eab00cc37c38f6b1ca0a948ba279c29e322bdf426d406129b5 \ + HELM3_SHA256SUM=55a8e6dce87a1e52c61e0ce7a89bf85b38725ba3e8deb51d4a08ade8a2c70b2d \ KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \ - KUSTOMIZE_SHA256SUM=3b30477a7ff4fb6547fa77d8117e66d995c2bdd526de0dafbf8b7bcb9556c85d \ + KUSTOMIZE_SHA256SUM=88346543206b889f9287c0b92c70708040ecd5aad54dd33019c4d6579cd24de8 \ SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \ SHA256SUM= \ - YQ_SHA256SUM=bd695a6513f1196aeda17b174a15e9c351843fb1cef5f9be0af170f2dd744f08 \ + YQ_SHA256SUM=f9163412d9aa2aa55e888fdcaf2b4053ada20074be35f701424caa7163100704 \ HELM_RELEASES_URL="https://get.helm.sh" \ KUBEVAL_RELEASES_URL="https://github.com/instrumenta/kubeval/releases/download" \ KUSTOMIZE_RELEASES_URL="https://github.com/kubernetes-sigs/kustomize/releases/download" \ @@ -33,6 +33,7 @@ RUN set -x && \ SEISO_URL="${SEISO_RELEASES_URL}/${SEISO_VERSION}/seiso_linux_amd64" && \ SOPS_URL="${SOPS_RELEASES_URL}/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux" && \ YQ_URL="${YQ_RELEASES_URL}/${YQ_VERSION}/yq_linux_amd64" && \ + microdnf install -y tar gzip git python3 && \ cd /tmp && \ curl -sSL "$URL" -o /tmp/oc.tgz && \ curl -sSL "$HELM3_URL" -o /tmp/helm3.tgz && \ @@ -67,7 +68,4 @@ RUN set -x && \ ln -s /bin/oc /bin/kubectl && \ ln -s /bin/helm3 /bin/helm && \ rm -rf /tmp/* && \ - yum install -y epel-release git gettext && \ - yum install -y moreutils && \ - yum clean all -y && \ git clone --depth=1 ${OC_PLUGINS_REPO} ${KUBECTL_PLUGINS_PATH} diff --git a/v4.13/Dockerfile b/v4.13/Dockerfile index d4ead49..cdfa807 100644 --- a/v4.13/Dockerfile +++ b/v4.13/Dockerfile @@ -1,19 +1,19 @@ -FROM docker.io/library/centos:7@sha256:be65f488b7764ad3638f236b7b515b3678369a5124c47b8d32916d6487418ea4 +FROM registry.access.redhat.com/ubi9-minimal:9.3 ENV VERSION=latest-4.13 \ - HELM3_VERSION=v3.12.3 \ + HELM3_VERSION=v3.13.2 \ KUBEVAL_VERSION=v0.16.1 \ - KUSTOMIZE_VERSION=v5.1.1 \ + KUSTOMIZE_VERSION=v5.2.1 \ SEISO_VERSION=v1.0.0 \ - SOPS_VERSION=v3.7.3 \ - YQ_VERSION=v4.35.1 \ + SOPS_VERSION=v3.8.1 \ + YQ_VERSION=v4.40.4 \ ARCHIVE=openshift-client-linux \ - HELM3_SHA256SUM=1b2313cd198d45eab00cc37c38f6b1ca0a948ba279c29e322bdf426d406129b5 \ + HELM3_SHA256SUM=55a8e6dce87a1e52c61e0ce7a89bf85b38725ba3e8deb51d4a08ade8a2c70b2d \ KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \ - KUSTOMIZE_SHA256SUM=3b30477a7ff4fb6547fa77d8117e66d995c2bdd526de0dafbf8b7bcb9556c85d \ + KUSTOMIZE_SHA256SUM=88346543206b889f9287c0b92c70708040ecd5aad54dd33019c4d6579cd24de8 \ SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \ SHA256SUM= \ - YQ_SHA256SUM=bd695a6513f1196aeda17b174a15e9c351843fb1cef5f9be0af170f2dd744f08 \ + YQ_SHA256SUM=f9163412d9aa2aa55e888fdcaf2b4053ada20074be35f701424caa7163100704 \ HELM_RELEASES_URL="https://get.helm.sh" \ KUBEVAL_RELEASES_URL="https://github.com/instrumenta/kubeval/releases/download" \ KUSTOMIZE_RELEASES_URL="https://github.com/kubernetes-sigs/kustomize/releases/download" \ @@ -33,6 +33,7 @@ RUN set -x && \ SEISO_URL="${SEISO_RELEASES_URL}/${SEISO_VERSION}/seiso_linux_amd64" && \ SOPS_URL="${SOPS_RELEASES_URL}/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux" && \ YQ_URL="${YQ_RELEASES_URL}/${YQ_VERSION}/yq_linux_amd64" && \ + microdnf install -y tar gzip git python3 && \ cd /tmp && \ curl -sSL "$URL" -o /tmp/oc.tgz && \ curl -sSL "$HELM3_URL" -o /tmp/helm3.tgz && \ @@ -67,7 +68,4 @@ RUN set -x && \ ln -s /bin/oc /bin/kubectl && \ ln -s /bin/helm3 /bin/helm && \ rm -rf /tmp/* && \ - yum install -y epel-release git gettext && \ - yum install -y moreutils && \ - yum clean all -y && \ git clone --depth=1 ${OC_PLUGINS_REPO} ${KUBECTL_PLUGINS_PATH} diff --git a/v4.10/Dockerfile b/v4.14/Dockerfile similarity index 84% rename from v4.10/Dockerfile rename to v4.14/Dockerfile index 731e5da..a099ea6 100644 --- a/v4.10/Dockerfile +++ b/v4.14/Dockerfile @@ -1,19 +1,19 @@ -FROM docker.io/library/centos:7@sha256:be65f488b7764ad3638f236b7b515b3678369a5124c47b8d32916d6487418ea4 +FROM registry.access.redhat.com/ubi9-minimal:9.3 -ENV VERSION=latest-4.10 \ - HELM3_VERSION=v3.12.3 \ +ENV VERSION=latest-4.14 \ + HELM3_VERSION=v3.13.2 \ KUBEVAL_VERSION=v0.16.1 \ - KUSTOMIZE_VERSION=v5.1.1 \ + KUSTOMIZE_VERSION=v5.2.1 \ SEISO_VERSION=v1.0.0 \ - SOPS_VERSION=v3.7.3 \ - YQ_VERSION=v4.35.1 \ + SOPS_VERSION=v3.8.1 \ + YQ_VERSION=v4.40.4 \ ARCHIVE=openshift-client-linux \ - HELM3_SHA256SUM=1b2313cd198d45eab00cc37c38f6b1ca0a948ba279c29e322bdf426d406129b5 \ + HELM3_SHA256SUM=55a8e6dce87a1e52c61e0ce7a89bf85b38725ba3e8deb51d4a08ade8a2c70b2d \ KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \ - KUSTOMIZE_SHA256SUM=3b30477a7ff4fb6547fa77d8117e66d995c2bdd526de0dafbf8b7bcb9556c85d \ + KUSTOMIZE_SHA256SUM=88346543206b889f9287c0b92c70708040ecd5aad54dd33019c4d6579cd24de8 \ SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \ SHA256SUM= \ - YQ_SHA256SUM=bd695a6513f1196aeda17b174a15e9c351843fb1cef5f9be0af170f2dd744f08 \ + YQ_SHA256SUM=f9163412d9aa2aa55e888fdcaf2b4053ada20074be35f701424caa7163100704 \ HELM_RELEASES_URL="https://get.helm.sh" \ KUBEVAL_RELEASES_URL="https://github.com/instrumenta/kubeval/releases/download" \ KUSTOMIZE_RELEASES_URL="https://github.com/kubernetes-sigs/kustomize/releases/download" \ @@ -33,6 +33,7 @@ RUN set -x && \ SEISO_URL="${SEISO_RELEASES_URL}/${SEISO_VERSION}/seiso_linux_amd64" && \ SOPS_URL="${SOPS_RELEASES_URL}/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux" && \ YQ_URL="${YQ_RELEASES_URL}/${YQ_VERSION}/yq_linux_amd64" && \ + microdnf install -y tar gzip git python3 && \ cd /tmp && \ curl -sSL "$URL" -o /tmp/oc.tgz && \ curl -sSL "$HELM3_URL" -o /tmp/helm3.tgz && \ @@ -67,7 +68,4 @@ RUN set -x && \ ln -s /bin/oc /bin/kubectl && \ ln -s /bin/helm3 /bin/helm && \ rm -rf /tmp/* && \ - yum install -y epel-release git gettext && \ - yum install -y moreutils && \ - yum clean all -y && \ git clone --depth=1 ${OC_PLUGINS_REPO} ${KUBECTL_PLUGINS_PATH}