Skip to content

Commit

Permalink
Merge pull request #108 from appuio/add-oc-4.15
Browse files Browse the repository at this point in the history
Add oc 4.15
  • Loading branch information
haasad authored Jul 24, 2024
2 parents df6e860 + 3c80480 commit a3d55de
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 21 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
- "4.12"
- "4.13"
- "4.14"
- "4.15"
steps:
- uses: actions/checkout@v4
- name: Set up Docker Buildx
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# For supported versions see:
# https://access.redhat.com/support/policy/updates/openshift/#dates
VERSIONS = v4.11 v4.12 v4.13 v4.14
VERSIONS = v4.11 v4.12 v4.13 v4.14 v4.15
# Also update in `.github/workflows/build.yml`!

all: clean $(addsuffix /Dockerfile, $(VERSIONS))
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ Also ships the binaries for `helm`, `kustomize`, `kubeval`, `sops`, `yq` and Pyt

The built images are available from [Docker Hub][hub] and [Red Hat Quay.io][quay]

- `docker.io/appuio/oc:v4.15`
- `quay.io/appuio/oc:v4.15`
- `docker.io/appuio/oc:v4.14`
- `quay.io/appuio/oc:v4.14`
- `docker.io/appuio/oc:v4.13`
Expand Down
10 changes: 5 additions & 5 deletions v4.11/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM registry.access.redhat.com/ubi9-minimal:9.4-1194

ENV VERSION=latest-4.11 \
HELM3_VERSION=v3.15.2 \
HELM3_VERSION=v3.15.3 \
KUBEVAL_VERSION=v0.16.1 \
KUSTOMIZE_VERSION=v5.4.2 \
KUSTOMIZE_VERSION=v5.4.3 \
SEISO_VERSION=v1.0.0 \
SOPS_VERSION=v3.8.1 \
SOPS_VERSION=v3.9.0 \
YQ_VERSION=v4.44.2 \
ARCHIVE=openshift-client-linux \
HELM3_SHA256SUM=2694b91c3e501cff57caf650e639604a274645f61af2ea4d601677b746b44fe2 \
HELM3_SHA256SUM=ad871aecb0c9fd96aa6702f6b79e87556c8998c2e714a4959bf71ee31282ac9c \
KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \
KUSTOMIZE_SHA256SUM=881c6e9007c7ea2b9ecc214d13f4cdd1f837635dcf4db49ce4479898f7d911a3 \
KUSTOMIZE_SHA256SUM=3669470b454d865c8184d6bce78df05e977c9aea31c30df3c669317d43bcc7a7 \
SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \
SHA256SUM= \
YQ_SHA256SUM=246b781828353a59fb04ffaada241f78a8f3f25c623047b40306def1f6806e71 \
Expand Down
10 changes: 5 additions & 5 deletions v4.12/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM registry.access.redhat.com/ubi9-minimal:9.4-1194

ENV VERSION=latest-4.12 \
HELM3_VERSION=v3.15.2 \
HELM3_VERSION=v3.15.3 \
KUBEVAL_VERSION=v0.16.1 \
KUSTOMIZE_VERSION=v5.4.2 \
KUSTOMIZE_VERSION=v5.4.3 \
SEISO_VERSION=v1.0.0 \
SOPS_VERSION=v3.8.1 \
SOPS_VERSION=v3.9.0 \
YQ_VERSION=v4.44.2 \
ARCHIVE=openshift-client-linux \
HELM3_SHA256SUM=2694b91c3e501cff57caf650e639604a274645f61af2ea4d601677b746b44fe2 \
HELM3_SHA256SUM=ad871aecb0c9fd96aa6702f6b79e87556c8998c2e714a4959bf71ee31282ac9c \
KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \
KUSTOMIZE_SHA256SUM=881c6e9007c7ea2b9ecc214d13f4cdd1f837635dcf4db49ce4479898f7d911a3 \
KUSTOMIZE_SHA256SUM=3669470b454d865c8184d6bce78df05e977c9aea31c30df3c669317d43bcc7a7 \
SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \
SHA256SUM= \
YQ_SHA256SUM=246b781828353a59fb04ffaada241f78a8f3f25c623047b40306def1f6806e71 \
Expand Down
10 changes: 5 additions & 5 deletions v4.13/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM registry.access.redhat.com/ubi9-minimal:9.4-1194

ENV VERSION=latest-4.13 \
HELM3_VERSION=v3.15.2 \
HELM3_VERSION=v3.15.3 \
KUBEVAL_VERSION=v0.16.1 \
KUSTOMIZE_VERSION=v5.4.2 \
KUSTOMIZE_VERSION=v5.4.3 \
SEISO_VERSION=v1.0.0 \
SOPS_VERSION=v3.8.1 \
SOPS_VERSION=v3.9.0 \
YQ_VERSION=v4.44.2 \
ARCHIVE=openshift-client-linux \
HELM3_SHA256SUM=2694b91c3e501cff57caf650e639604a274645f61af2ea4d601677b746b44fe2 \
HELM3_SHA256SUM=ad871aecb0c9fd96aa6702f6b79e87556c8998c2e714a4959bf71ee31282ac9c \
KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \
KUSTOMIZE_SHA256SUM=881c6e9007c7ea2b9ecc214d13f4cdd1f837635dcf4db49ce4479898f7d911a3 \
KUSTOMIZE_SHA256SUM=3669470b454d865c8184d6bce78df05e977c9aea31c30df3c669317d43bcc7a7 \
SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \
SHA256SUM= \
YQ_SHA256SUM=246b781828353a59fb04ffaada241f78a8f3f25c623047b40306def1f6806e71 \
Expand Down
10 changes: 5 additions & 5 deletions v4.14/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM registry.access.redhat.com/ubi9-minimal:9.4-1194

ENV VERSION=latest-4.14 \
HELM3_VERSION=v3.15.2 \
HELM3_VERSION=v3.15.3 \
KUBEVAL_VERSION=v0.16.1 \
KUSTOMIZE_VERSION=v5.4.2 \
KUSTOMIZE_VERSION=v5.4.3 \
SEISO_VERSION=v1.0.0 \
SOPS_VERSION=v3.8.1 \
SOPS_VERSION=v3.9.0 \
YQ_VERSION=v4.44.2 \
ARCHIVE=openshift-client-linux \
HELM3_SHA256SUM=2694b91c3e501cff57caf650e639604a274645f61af2ea4d601677b746b44fe2 \
HELM3_SHA256SUM=ad871aecb0c9fd96aa6702f6b79e87556c8998c2e714a4959bf71ee31282ac9c \
KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \
KUSTOMIZE_SHA256SUM=881c6e9007c7ea2b9ecc214d13f4cdd1f837635dcf4db49ce4479898f7d911a3 \
KUSTOMIZE_SHA256SUM=3669470b454d865c8184d6bce78df05e977c9aea31c30df3c669317d43bcc7a7 \
SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \
SHA256SUM= \
YQ_SHA256SUM=246b781828353a59fb04ffaada241f78a8f3f25c623047b40306def1f6806e71 \
Expand Down
71 changes: 71 additions & 0 deletions v4.15/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
FROM registry.access.redhat.com/ubi9-minimal:9.4-1134

ENV VERSION=latest-4.15 \
HELM3_VERSION=v3.15.3 \
KUBEVAL_VERSION=v0.16.1 \
KUSTOMIZE_VERSION=v5.4.3 \
SEISO_VERSION=v1.0.0 \
SOPS_VERSION=v3.9.0 \
YQ_VERSION=v4.44.2 \
ARCHIVE=openshift-client-linux \
HELM3_SHA256SUM=ad871aecb0c9fd96aa6702f6b79e87556c8998c2e714a4959bf71ee31282ac9c \
KUBEVAL_SHA256SUM=2d6f9bda1423b93787fa05d9e8dfce2fc1190fefbcd9d0936b9635f3f78ba790 \
KUSTOMIZE_SHA256SUM=3669470b454d865c8184d6bce78df05e977c9aea31c30df3c669317d43bcc7a7 \
SEISO_SHA256SUM=40484059c23993b4e8d6b0add3debebb31ed1155b49a5ebdae987698b3176202 \
SHA256SUM= \
YQ_SHA256SUM=246b781828353a59fb04ffaada241f78a8f3f25c623047b40306def1f6806e71 \
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" \
OKD_DOWNLOAD_BASE_URL="https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp" \
SEISO_RELEASES_URL="https://github.com/appuio/seiso/releases/download" \
SOPS_RELEASES_URL="https://github.com/getsops/sops/releases/download" \
YQ_RELEASES_URL="https://github.com/mikefarah/yq/releases/download" \
JQ_URL="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64" \
OC_PLUGINS_REPO="https://github.com/appuio/oc-plugins" \
KUBECTL_PLUGINS_PATH="/opt/kube/plugins"

RUN set -x && \
URL="${OKD_DOWNLOAD_BASE_URL}/${VERSION}/${ARCHIVE}.tar.gz" && \
HELM3_URL="${HELM_RELEASES_URL}/helm-${HELM3_VERSION}-linux-amd64.tar.gz" && \
KUBEVAL_URL="${KUBEVAL_RELEASES_URL}/${KUBEVAL_VERSION}/kubeval-linux-amd64.tar.gz" && \
KUSTOMIZE_URL="${KUSTOMIZE_RELEASES_URL}/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz" && \
SEISO_URL="${SEISO_RELEASES_URL}/${SEISO_VERSION}/seiso_linux_amd64" && \
SOPS_URL="${SOPS_RELEASES_URL}/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux.amd64" && \
YQ_URL="${YQ_RELEASES_URL}/${YQ_VERSION}/yq_linux_amd64" && \
microdnf install -y tar gzip git python3 diffutils && \
cd /tmp && \
curl -sSL "$URL" -o /tmp/oc.tgz && \
curl -sSL "$HELM3_URL" -o /tmp/helm3.tgz && \
curl -sSL "$JQ_URL" -o /bin/jq && \
curl -sSL "$KUBEVAL_URL" -o /tmp/kubeval.tgz && \
curl -sSL "$KUSTOMIZE_URL" -o /tmp/kustomize.tgz && \
curl -sSL "$SEISO_URL" -o /bin/seiso && \
curl -sSL "$SOPS_URL" -o /bin/sops && \
curl -sSL "$YQ_URL" -o /bin/yq && \
echo "${HELM3_SHA256SUM} /tmp/helm3.tgz" > /tmp/HELM3_CHECKSUM && \
echo "${KUBEVAL_SHA256SUM} /tmp/kubeval.tgz" > /tmp/KUBEVAL_CHECKSUM && \
echo "${KUSTOMIZE_SHA256SUM} /tmp/kustomize.tgz" > /tmp/KUSTOMIZE_CHECKSUM && \
echo "${SEISO_SHA256SUM} /bin/seiso" > /tmp/SEISO_CHECKSUM && \
echo "${SHA256SUM} /tmp/oc.tgz" > /tmp/CHECKSUM && \
echo "${YQ_SHA256SUM} /bin/yq" > /tmp/YQ_CHECKSUM && \
[ ! -z "$SHA256SUM" ] && sha256sum -c /tmp/CHECKSUM || echo "oc sha not checked" && \
sha256sum -c /tmp/HELM3_CHECKSUM && \
sha256sum -c /tmp/KUBEVAL_CHECKSUM && \
sha256sum -c /tmp/KUSTOMIZE_CHECKSUM && \
sha256sum -c /tmp/SEISO_CHECKSUM && \
sha256sum -c /tmp/YQ_CHECKSUM && \
tar -xzvf /tmp/oc.tgz && \
rm -rf -v "/tmp/linux-amd64" && \
tar -xzvf /tmp/helm3.tgz && \
mv -v "/tmp/linux-amd64/helm" /bin/helm3 && \
tar -xzvf /tmp/kustomize.tgz && \
tar -xzvf /tmp/kubeval.tgz && \
chmod 755 /tmp/kustomize /bin/seiso /bin/jq /bin/sops /bin/yq && \
mv -v "/tmp/oc" /bin/ && \
mv -v "/tmp/kubeval" /bin/ && \
mv -v "/tmp/kustomize" /bin/ && \
ln -s /bin/oc /bin/kubectl && \
ln -s /bin/helm3 /bin/helm && \
rm -rf /tmp/* && \
git clone --depth=1 ${OC_PLUGINS_REPO} ${KUBECTL_PLUGINS_PATH}

0 comments on commit a3d55de

Please sign in to comment.