bumping base images and renovate binaries

redhat-cop · Dec 12, 2023 · 35e0d9f · 35e0d9f
1 parent 9e1ea53
commit 35e0d9f
Show file tree

Hide file tree

Showing 19 changed files with 49 additions and 54 deletions.
diff --git a/.github/workflows/jenkins-agent-ci-pr.yaml b/.github/workflows/jenkins-agent-ci-pr.yaml
diff --git a/_test/kind/setup.sh b/_test/kind/setup.sh
@@ -3,6 +3,7 @@
 set -euo pipefail
 
 AGENT=$1
+## todo: renovate config for below
 JENKINS_CHART_VERSION="4.9.1"
 AGENT_PATH="jenkins-agents/${AGENT}"
 SCRIPT_DIR=$(dirname -- "$(readlink -f "${BASH_SOURCE[0]}" || realpath "${BASH_SOURCE[0]}")")

diff --git a/jenkins-agents/jenkins-agent-ansible/Dockerfile b/jenkins-agents/jenkins-agent-ansible/Dockerfile
@@ -1,9 +1,11 @@
 FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+
+# renovate: datasource=pypi depName=ansible-core
 ARG ANSIBLE_VERSION=2.9.13
 
 LABEL \
       release="1" \
-      version="4.8" \
+      version="4.14" \
       architecture="x86_64" \
       io.k8s.display-name="Jenkins Agent Ansible" \
       name="openshift/origin-jenkins-agent-ansible-ubi8" \

diff --git a/jenkins-agents/jenkins-agent-arachni/Dockerfile b/jenkins-agents/jenkins-agent-arachni/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14
 
 ARG VERSION=1.5.1
 ARG WEB_VERSION=0.5.12

diff --git a/jenkins-agents/jenkins-agent-argocd/Dockerfile b/jenkins-agents/jenkins-agent-argocd/Dockerfile
@@ -1,7 +1,9 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14
 
-ENV ARGOCD_VERSION=2.2.3 \
-    YQ_VERSION=v4.16.2
+# renovate: datasource=github-releases depName=argoproj/argo-cd
+ENV ARGOCD_VERSION=2.2.3
+# renovate: datasource=github-releases depName=mikefarah/yq
+ENV YQ_VERSION=v4.16.2
 
 RUN curl -sL  https://github.com/argoproj/argo-cd/releases/download/v${ARGOCD_VERSION}/argocd-linux-amd64 -o /usr/local/bin/argocd && \
     chmod -R 775 /usr/local/bin/argocd && \

diff --git a/jenkins-agents/jenkins-agent-conftest/Dockerfile b/jenkins-agents/jenkins-agent-conftest/Dockerfile
@@ -1,8 +1,11 @@
 FROM quay.io/redhat-cop/jenkins-agent-python:v1.1@sha256:64caef557f4045bc3dbe3e8b55b6ccf36a1ffc0963d0dbdaca3200ed7c2763e6
 # ^ needed to install the python yq library 🐍
 
+# renovate: datasource=github-releases depName=bats-core/bats-core
 ARG BATS_VERSION=1.2.0
+# renovate: datasource=github-releases depName=mikefarah/yq
 ARG YQ_VERSION=2.12.0
+# renovate: datasource=github-releases depName=open-policy-agent/conftest
 ARG CONFTEST_VERSION=0.23.0
 
 USER root

diff --git a/jenkins-agents/jenkins-agent-cosign/Dockerfile b/jenkins-agents/jenkins-agent-cosign/Dockerfile
@@ -1,7 +1,8 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14
 
 USER root
 
+# renovate: datasource=github-releases depName=sigstore/cosign
 ARG COSIGN_VERSION=2.0.2
 
 # Install cosign

diff --git a/jenkins-agents/jenkins-agent-erlang/Dockerfile b/jenkins-agents/jenkins-agent-erlang/Dockerfile
@@ -1,6 +1,8 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14
 
+# renovate: datasource=github-releases depName=rabbitmq/erlang-rpm
 ARG ERLANG_VERSION=22.1.4
+# renovate: datasource=github-releases depName=erlang/rebar3
 ARG REBAR3_VERSION=3.12.0
 
 RUN set -xe && \

diff --git a/jenkins-agents/jenkins-agent-golang/Dockerfile b/jenkins-agents/jenkins-agent-golang/Dockerfile
@@ -1,5 +1,6 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14
 
+# renovate: datasource=golang-version depName=go
 ARG GO_VERSION=1.15.6
 ARG SONAR_SCANNER_VERSION=4.5.0.2216
 ENV GOROOT=/usr/local/go \

diff --git a/jenkins-agents/jenkins-agent-graalvm/Dockerfile b/jenkins-agents/jenkins-agent-graalvm/Dockerfile
@@ -1,10 +1,15 @@
 FROM quay.io/openshift/origin-jenkins-agent-maven:4.14@sha256:4a8671c25216b1b44bf47a363ec37d503568fa2f75ef1a010e2284ac1cc5df46
+
 ARG GRAAL_VERSION=20.3.3.0-Final
 ENV GRAALVM_HOME=/opt/mandrelJDK
 ENV GRAAL_CE_URL=https://github.com/graalvm/mandrel/releases/download/mandrel-${GRAAL_VERSION}/mandrel-java11-linux-amd64-${GRAAL_VERSION}.tar.gz
+# renovate: datasource=github-releases depName=helm/helm
 ARG HELM_VERSION=3.6.3
+# renovate: datasource=github-releases depName=stedolan/jq
 ARG JQ_VERSION=1.6
+# renovate: datasource=repology depName=homebrew/openshift-cli
 ARG OC_VERSION=4.8
+# renovate: datasource=github-releases depName=mikefarah/yq
 ARG YQ_VERSION=4.11.2
 
 ADD settings.xml $HOME/.m2/settings.xml

diff --git a/jenkins-agents/jenkins-agent-gradle/Dockerfile b/jenkins-agents/jenkins-agent-gradle/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14
 
 ENV GRADLE_VERSION=6.3
 ENV GRADLE_USER_HOME=/home/jenkins/.gradle

diff --git a/jenkins-agents/jenkins-agent-helm/Dockerfile b/jenkins-agents/jenkins-agent-helm/Dockerfile
@@ -1,10 +1,16 @@
 FROM quay.io/openshift/origin-jenkins-agent-base:4.9
 
+# renovate: datasource=github-releases depName=helm/helm
 ARG VERSION=3.5.2
+# renovate: datasource=github-releases depName=mikefarah/yq
 ARG YQ_VERSION=v4.5.1
+# renovate: datasource=github-releases depName=helm/chart-testing
 ARG CT_VERSION=3.3.1
+# renovate: datasource=repology depName=homebrew/openshift-cli
 ARG OPENSHIFT_CLIENT_VERSION=4.8
+# renovate: datasource=github-releases depName=open-policy-agent/conftest
 ARG CONFTEST_VERSION=0.23.0
+# renovate: datasource=github-releases depName=stackrox/kube-linter
 ARG KUBE_LINTER_VERSION=0.2.3
 
 ## Required in order to avoid ct "ascii codec can't encode character" error

diff --git a/jenkins-agents/jenkins-agent-hugo/Dockerfile b/jenkins-agents/jenkins-agent-hugo/Dockerfile
@@ -1,5 +1,6 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14
 
+# renovate: datasource=github-releases depName=gohugoio/hugo
 ENV HUGO_VERSION=0.83.1
 
 RUN curl -sL https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz \

diff --git a/jenkins-agents/jenkins-agent-image-mgmt/Dockerfile b/jenkins-agents/jenkins-agent-image-mgmt/Dockerfile
@@ -1,5 +1,6 @@
-FROM registry.access.redhat.com/ubi8/go-toolset:latest as builder
+FROM registry.access.redhat.com/ubi8/go-toolset:1.20 as builder
 
+# renovate: datasource=github-releases depName=containers/skopeo
 ARG SKOPEO_VERSION=1.5.2
 
 USER root
@@ -9,9 +10,10 @@ RUN curl -L https://github.com/containers/skopeo/archive/v${SKOPEO_VERSION}.tar.
     cd /tmp/skopeo && \
     make BUILDTAGS=containers_image_openpgp DISABLE_DOCS=1 CGO_ENABLED=0 GO_DYN_FLAGS=
 
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14
 
-ARG OC_VERSION=4.9
+#todo
+ARG OC_VERSION=4.14
 
 MAINTAINER Andrew Block <[email protected]>
 

diff --git a/jenkins-agents/jenkins-agent-mongodb/Dockerfile b/jenkins-agents/jenkins-agent-mongodb/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14
 
 USER root
 

diff --git a/jenkins-agents/jenkins-agent-npm/Dockerfile b/jenkins-agents/jenkins-agent-npm/Dockerfile
@@ -1,8 +1,11 @@
 #invoke npm in jenkinsfile: sh "scl enable rh-nodejs6 'npm run build'"
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14
 
+# renovate: datasource=github-releases depName=stedolan/jq
 ARG JQ_VERSION=1.6
+# renovate: datasource=repology depName=homebrew/openshift-cli
 ARG OC_VERSION=4.8
+# renovate: datasource=github-releases depName=mikefarah/yq
 ARG YQ_VERSION=4.6.3
 
 ENV NODEJS_VERSION=16 \

diff --git a/jenkins-agents/jenkins-agent-python/Dockerfile b/jenkins-agents/jenkins-agent-python/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14
 
 EXPOSE 8080
 

diff --git a/jenkins-agents/jenkins-agent-ruby/Dockerfile b/jenkins-agents/jenkins-agent-ruby/Dockerfile
@@ -1,6 +1,7 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14
 
 ARG RUBY_VERSION=3.1
+# renovate: datasource=repology depName=homebrew/openshift-cli
 ARG OC_VERSION=4.14
 
 ENV SUMMARY="Platform for building and running Ruby $RUBY_VERSION applications" \

diff --git a/jenkins-agents/jenkins-agent-rust/Dockerfile b/jenkins-agents/jenkins-agent-rust/Dockerfile
@@ -1,8 +1,8 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.9
+FROM quay.io/openshift/origin-jenkins-agent-base:4.14
 
 LABEL com.redhat.component="jenkins-agent-rust-ubi7-docker" \
       name="openshift/origin-jenkins-agent-rust-ubi7" \
-      version="4.8" \
+      version="4.14" \
       architecture="x86_64" \
       release="1" \
       io.k8s.display_name="Jenkins Agent Rust" \