From a7feecb089729375837de55af030a79c16191de6 Mon Sep 17 00:00:00 2001 From: Gareth Healy Date: Fri, 17 Nov 2023 13:45:56 +0000 Subject: [PATCH 1/2] added renovate to clis installed --- chart-repo-pr-action/Dockerfile | 2 +- confbatstest/Dockerfile_build | 39 ++++++++++++++++++------------ github-dispatches/Dockerfile_build | 6 +++-- kyverno-cli/Dockerfile_build | 27 +++++++++++++-------- 4 files changed, 46 insertions(+), 28 deletions(-) diff --git a/chart-repo-pr-action/Dockerfile b/chart-repo-pr-action/Dockerfile index 6f2ac3a..db73c3f 100644 --- a/chart-repo-pr-action/Dockerfile +++ b/chart-repo-pr-action/Dockerfile @@ -15,7 +15,7 @@ RUN microdnf install --assumeyes --nodocs tar git diffutils && \ diff --version ## Install gh cli -RUN curl -L -O https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz && \ +RUN curl -L -O https://github.com/cli/cli/releases/download/${GH_VERSION}/gh_${GH_VERSION//v}_linux_amd64.tar.gz && \ tar -xzf gh_${GH_VERSION}_linux_amd64.tar.gz && \ mv gh_${GH_VERSION}_linux_amd64/bin/gh /usr/local/bin && \ rm -rf gh gh.tar.gz && \ diff --git a/confbatstest/Dockerfile_build b/confbatstest/Dockerfile_build index 144818d..4746372 100644 --- a/confbatstest/Dockerfile_build +++ b/confbatstest/Dockerfile_build @@ -7,40 +7,50 @@ RUN PATH="/usr/local/go/bin:$PATH" GOBIN=/tmp/go-bin go install github.com/plexs # Builder image FROM registry.access.redhat.com/ubi9/ubi:9.3-1361.1699548029@sha256:6b95efc134c2af3d45472c0a2f88e6085433df058cc210abb2bb061ac4d74359 AS builder -RUN export HELM_VERSION=3.11.1 && \ - curl -L -o /tmp/helm-v${HELM_VERSION}-linux-amd64.tar.gz https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \ - tar -C /tmp -xzf /tmp/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \ +# renovate: datasource=github-releases depName=helm/helm +ARG HELM_VERSION=v3.11.1 +# renovate: datasource=github-releases depName=stedolan/jq +ARG JQ_VERSION=1.6 +# renovate: datasource=repology depName=openshift-cli +ARG OC_VERSION=4.12.0 +# renovate: datasource=github-releases depName=open-policy-agent/opa +ARG OPA_VERSION=v0.49.2 +# renovate: datasource=github-releases depName=open-policy-agent/conftest +ARG CONFTEST_VERSION=0.39.2 +# renovate: datasource=github-releases depName=instrumenta/kubeval +ARG KUBEVAL_VERSION=latest + +RUN curl -L -o /tmp/helm-${HELM_VERSION}-linux-amd64.tar.gz https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz && \ + tar -C /tmp -xzf /tmp/helm-${HELM_VERSION}-linux-amd64.tar.gz && \ /tmp/linux-amd64/helm version -RUN export JQ_VERSION=1.6 && \ - curl -L -o /tmp/jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \ +RUN curl -L -o /tmp/jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \ chmod +x /tmp/jq-linux64 && \ /tmp/jq-linux64 --version -RUN export OC_VERSION=4.12.0 && \ - curl -L -o /tmp/openshift-client-linux.tar.gz https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_VERSION}/openshift-client-linux.tar.gz && \ +RUN curl -L -o /tmp/openshift-client-linux.tar.gz https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_VERSION}/openshift-client-linux.tar.gz && \ tar -C /tmp -xzf /tmp/openshift-client-linux.tar.gz && \ /tmp/oc version --client && \ /tmp/kubectl version --client -RUN export OPA_VERSION=v0.49.2 && \ - curl -L -o /tmp/opa_linux_amd64 https://github.com/open-policy-agent/opa/releases/download/${OPA_VERSION}/opa_linux_amd64 && \ +RUN curl -L -o /tmp/opa_linux_amd64 https://github.com/open-policy-agent/opa/releases/download/${OPA_VERSION}/opa_linux_amd64 && \ chmod +x /tmp/opa_linux_amd64 && \ /tmp/opa_linux_amd64 --help -RUN export CONFTEST_VERSION=0.39.2 && \ - curl -L -o /tmp/conftest_${CONFTEST_VERSION}_Linux_x86_64.tar.gz https://github.com/open-policy-agent/conftest/releases/download/v${CONFTEST_VERSION}/conftest_${CONFTEST_VERSION}_Linux_x86_64.tar.gz && \ +RUN curl -L -o /tmp/conftest_${CONFTEST_VERSION}_Linux_x86_64.tar.gz https://github.com/open-policy-agent/conftest/releases/download/v${CONFTEST_VERSION}/conftest_${CONFTEST_VERSION}_Linux_x86_64.tar.gz && \ tar -C /tmp -xzf /tmp/conftest_${CONFTEST_VERSION}_Linux_x86_64.tar.gz && \ /tmp/conftest --version -RUN export KUBEVAL_VERSION=latest && \ - curl -L -o /tmp/kubeval-linux-amd64.tar.gz https://github.com/instrumenta/kubeval/releases/${KUBEVAL_VERSION}/download/kubeval-linux-amd64.tar.gz && \ +RUN curl -L -o /tmp/kubeval-linux-amd64.tar.gz https://github.com/instrumenta/kubeval/releases/${KUBEVAL_VERSION}/download/kubeval-linux-amd64.tar.gz && \ tar -C /tmp -xzf /tmp/kubeval-linux-amd64.tar.gz && \ /tmp/kubeval --version # Runnable image FROM registry.access.redhat.com/ubi9/python-39:1-153.1699551718@sha256:81a000d48bca6b09e09a7b834e0b7c8b6ffb1907b7867e76df9b044e02f9a2ac +# renovate: datasource=github-releases depName=bats-core/bats-core +ARG BATS_VERSION=master + LABEL version="1.8.0" LABEL repository="http://github.com/redhat-cop/github-actions" LABEL homepage="http://github.com/redhat-cop/github-actions/confbatstest" @@ -82,8 +92,7 @@ RUN dnf upgrade --assumeyes && \ diff --version && \ bc --version -RUN export BATS_VERSION=master && \ - curl -L -o /tmp/${BATS_VERSION}.tar.gz https://github.com/bats-core/bats-core/archive/${BATS_VERSION}.tar.gz && \ +RUN curl -L -o /tmp/${BATS_VERSION}.tar.gz https://github.com/bats-core/bats-core/archive/${BATS_VERSION}.tar.gz && \ tar -C /tmp -xzf /tmp/${BATS_VERSION}.tar.gz && \ /tmp/bats-core-${BATS_VERSION}/install.sh /tmp/bats && \ ln -s /tmp/bats/bin/bats /usr/local/bin/bats && \ diff --git a/github-dispatches/Dockerfile_build b/github-dispatches/Dockerfile_build index deafe48..ecfcd70 100644 --- a/github-dispatches/Dockerfile_build +++ b/github-dispatches/Dockerfile_build @@ -1,8 +1,10 @@ # Builder image FROM registry.access.redhat.com/ubi9/ubi-minimal:9.3-1361.1699548032@sha256:c77792b8084ce5946c68f39024fa460ef7769c0eef3fce995e70299e21a7e166 AS builder -RUN export JQ_VERSION=1.6 && \ - curl -L -o /tmp/jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \ +# renovate: datasource=github-releases depName=stedolan/jq +ARG JQ_VERSION=1.6 + +RUN curl -L -o /tmp/jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \ chmod +x /tmp/jq-linux64 && \ /tmp/jq-linux64 --version diff --git a/kyverno-cli/Dockerfile_build b/kyverno-cli/Dockerfile_build index 9ab79dc..447435a 100644 --- a/kyverno-cli/Dockerfile_build +++ b/kyverno-cli/Dockerfile_build @@ -1,30 +1,38 @@ # Builder image FROM registry.access.redhat.com/ubi9/ubi:9.3-1361.1699548029@sha256:6b95efc134c2af3d45472c0a2f88e6085433df058cc210abb2bb061ac4d74359 AS builder -RUN export HELM_VERSION=3.11.1 && \ - curl -L -o /tmp/helm-v${HELM_VERSION}-linux-amd64.tar.gz https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \ +# renovate: datasource=github-releases depName=helm/helm +ARG HELM_VERSION=v3.11.1 +# renovate: datasource=github-releases depName=stedolan/jq +ARG JQ_VERSION=1.6 +# renovate: datasource=repology depName=openshift-cli +ARG OC_VERSION=4.12.0 +# renovate: datasource=github-releases depName=open-policy-agent/opa +ARG KYVERNO_VERSION=v1.9.0 + +RUN curl -L -o /tmp/helm-${HELM_VERSION}-linux-amd64.tar.gz https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz && \ tar -C /tmp -xzf /tmp/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \ /tmp/linux-amd64/helm version -RUN export JQ_VERSION=1.6 && \ - curl -L -o /tmp/jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \ +RUN curl -L -o /tmp/jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \ chmod +x /tmp/jq-linux64 && \ /tmp/jq-linux64 --version -RUN export OC_VERSION=4.12.0 && \ - curl -L -o /tmp/openshift-client-linux.tar.gz https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_VERSION}/openshift-client-linux.tar.gz && \ +RUN curl -L -o /tmp/openshift-client-linux.tar.gz https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_VERSION}/openshift-client-linux.tar.gz && \ tar -C /tmp -xzf /tmp/openshift-client-linux.tar.gz && \ /tmp/oc version --client && \ /tmp/kubectl version --client -RUN export KYVERNO_VERSION=v1.9.0 && \ - curl -L -o /tmp/kyverno-cli_${KYVERNO_VERSION}_linux_x86_64.tar.gz https://github.com/kyverno/kyverno/releases/download/${KYVERNO_VERSION}/kyverno-cli_${KYVERNO_VERSION}_linux_x86_64.tar.gz && \ +RUN curl -L -o /tmp/kyverno-cli_${KYVERNO_VERSION}_linux_x86_64.tar.gz https://github.com/kyverno/kyverno/releases/download/${KYVERNO_VERSION}/kyverno-cli_${KYVERNO_VERSION}_linux_x86_64.tar.gz && \ tar -C /tmp -xzf /tmp/kyverno-cli_${KYVERNO_VERSION}_linux_x86_64.tar.gz && \ /tmp/kyverno --help # Runnable image FROM registry.access.redhat.com/ubi9/python-39:1-153.1699551718@sha256:81a000d48bca6b09e09a7b834e0b7c8b6ffb1907b7867e76df9b044e02f9a2ac +# renovate: datasource=github-releases depName=bats-core/bats-core +ARG BATS_VERSION=master + LABEL version="1.1.0" LABEL repository="http://github.com/redhat-cop/github-actions" LABEL homepage="http://github.com/redhat-cop/github-actions/kyverno-cli" @@ -57,8 +65,7 @@ RUN dnf upgrade --assumeyes && \ diff --version && \ bc --version -RUN export BATS_VERSION=master && \ - curl -L -o /tmp/${BATS_VERSION}.tar.gz https://github.com/bats-core/bats-core/archive/${BATS_VERSION}.tar.gz && \ +RUN curl -L -o /tmp/${BATS_VERSION}.tar.gz https://github.com/bats-core/bats-core/archive/${BATS_VERSION}.tar.gz && \ tar -C /tmp -xzf /tmp/${BATS_VERSION}.tar.gz && \ /tmp/bats-core-${BATS_VERSION}/install.sh /tmp/bats && \ ln -s /tmp/bats/bin/bats /usr/local/bin/bats && \ From 8bd8d3ca564bacf98e86d6d2047efe9c91a42fee Mon Sep 17 00:00:00 2001 From: Gareth Healy Date: Fri, 17 Nov 2023 13:51:08 +0000 Subject: [PATCH 2/2] ci fix --- kyverno-cli/Dockerfile_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kyverno-cli/Dockerfile_build b/kyverno-cli/Dockerfile_build index 447435a..68bd506 100644 --- a/kyverno-cli/Dockerfile_build +++ b/kyverno-cli/Dockerfile_build @@ -11,7 +11,7 @@ ARG OC_VERSION=4.12.0 ARG KYVERNO_VERSION=v1.9.0 RUN curl -L -o /tmp/helm-${HELM_VERSION}-linux-amd64.tar.gz https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz && \ - tar -C /tmp -xzf /tmp/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \ + tar -C /tmp -xzf /tmp/helm-${HELM_VERSION}-linux-amd64.tar.gz && \ /tmp/linux-amd64/helm version RUN curl -L -o /tmp/jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \