Skip to content

Commit

Permalink
Move to jenkins-agent-base:4.5 (#407)
Browse files Browse the repository at this point in the history
  • Loading branch information
pabrahamsson authored Oct 8, 2020
1 parent 5ced345 commit 546f928
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .applier/group_vars/seed-hosts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ templates_repo_ref: v1.4.16
jenkins_agents:
build:
ansible:
BUILDER_IMAGE_NAME: quay.io/openshift/origin-jenkins-agent-base:4.4
BUILDER_IMAGE_NAME: quay.io/openshift/origin-jenkins-agent-base:4.5
DOCKERFILE_PATH: Dockerfile
NAME: jenkins-agent-ansible
SOURCE_CONTEXT_DIR: jenkins-agents/jenkins-agent-ansible
Expand All @@ -25,7 +25,7 @@ jenkins_agents:
helm: {}
mongodb: {}
mvn:
BUILDER_IMAGE_NAME: quay.io/openshift/origin-jenkins-agent-maven:4.4
BUILDER_IMAGE_NAME: quay.io/openshift/origin-jenkins-agent-maven:4.5
npm: {}
python: {}
ruby: {}
Expand Down
2 changes: 1 addition & 1 deletion jenkins-agents/jenkins-agent-arachni/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/openshift/origin-jenkins-agent-base:4.4
FROM quay.io/openshift/origin-jenkins-agent-base:4.5

ARG VERSION=1.5.1
ARG WEB_VERSION=0.5.12
Expand Down
2 changes: 1 addition & 1 deletion jenkins-agents/jenkins-agent-erlang/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/openshift/origin-jenkins-agent-base:4.4
FROM quay.io/openshift/origin-jenkins-agent-base:4.5

ARG ERLANG_VERSION=22.1.4
ARG REBAR3_VERSION=3.12.0
Expand Down
2 changes: 1 addition & 1 deletion jenkins-agents/jenkins-agent-golang/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/openshift/origin-jenkins-agent-base:4.4
FROM quay.io/openshift/origin-jenkins-agent-base:4.5

ENV GO_VERSION_DEFAULT=1.10.2 \
GOROOT=/usr/local/go \
Expand Down
2 changes: 1 addition & 1 deletion jenkins-agents/jenkins-agent-gradle/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/openshift/origin-jenkins-agent-base:4.4
FROM quay.io/openshift/origin-jenkins-agent-base:4.5

ENV GRADLE_VERSION=6.3
ENV GRADLE_USER_HOME=/home/jenkins/.gradle
Expand Down
2 changes: 1 addition & 1 deletion jenkins-agents/jenkins-agent-helm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/openshift/origin-jenkins-agent-base:4.4
FROM quay.io/openshift/origin-jenkins-agent-base:4.5

ARG VERSION=3.2.0
ARG YQ_VERSION=3.3.0
Expand Down
2 changes: 1 addition & 1 deletion jenkins-agents/jenkins-agent-image-mgmt/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN curl -L https://github.com/containers/skopeo/archive/v${SKOPEO_VERSION}.tar.
cd /tmp/skopeo && \
make binary-local DISABLE_CGO=1

FROM quay.io/openshift/origin-jenkins-agent-base:4.4
FROM quay.io/openshift/origin-jenkins-agent-base:4.5

MAINTAINER Andrew Block <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion jenkins-agents/jenkins-agent-mongodb/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/openshift/origin-jenkins-agent-base:4.4
FROM quay.io/openshift/origin-jenkins-agent-base:4.5

USER root

Expand Down
2 changes: 1 addition & 1 deletion jenkins-agents/jenkins-agent-mvn/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM quay.io/openshift/origin-jenkins-agent-maven:4.4
FROM quay.io/openshift/origin-jenkins-agent-maven:4.5
ADD settings.xml $HOME/.m2/settings.xml
2 changes: 1 addition & 1 deletion jenkins-agents/jenkins-agent-npm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#invoke npm in jenkinsfile: sh "scl enable rh-nodejs6 'npm run build'"
FROM quay.io/openshift/origin-jenkins-agent-base:4.4
FROM quay.io/openshift/origin-jenkins-agent-base:4.5

ENV NODEJS_VERSION=12 \
NPM_CONFIG_PREFIX=$HOME/.npm-global \
Expand Down
2 changes: 1 addition & 1 deletion jenkins-agents/jenkins-agent-python/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/openshift/origin-jenkins-agent-base:4.4
FROM quay.io/openshift/origin-jenkins-agent-base:4.5

EXPOSE 8080

Expand Down
2 changes: 1 addition & 1 deletion jenkins-agents/jenkins-agent-ruby/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/openshift/origin-jenkins-agent-base:4.4
FROM quay.io/openshift/origin-jenkins-agent-base:4.5

ENV RUBY_VERSION=2.6 \
RUBY_SHORT_VERSION=26 \
Expand Down
2 changes: 1 addition & 1 deletion jenkins-agents/jenkins-agent-rust/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/openshift/origin-jenkins-agent-base:4.4
FROM quay.io/openshift/origin-jenkins-agent-base:4.5

LABEL com.redhat.component="jenkins-agent-rust-ubi7-docker" \
name="openshift/origin-jenkins-agent-rust-ubi7" \
Expand Down

0 comments on commit 546f928

Please sign in to comment.