Skip to content

Commit 682bd87

Browse files
pabrahamssonpabrahamsson
authored
Update Jenkins Agent base images to 4.8 + minor improvements (#525)
1 parent 87a98a1 commit 682bd87

File tree

19 files changed

+52
-61
lines changed

19 files changed

+52
-61
lines changed

‎jenkins-agents/jenkins-agent-ansible/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM quay.io/openshift/origin-jenkins-agent-base:4.7
1+
FROM quay.io/openshift/origin-jenkins-agent-base:4.8
22
ARG ANSIBLE_VERSION=2.9.13
33

44
LABEL \
55
release="1" \
6-
version="4.7" \
6+
version="4.8" \
77
architecture="x86_64" \
88
io.k8s.display-name="Jenkins Agent Ansible" \
99
name="openshift/origin-jenkins-agent-ansible-ubi8" \

‎jenkins-agents/jenkins-agent-arachni/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/openshift/origin-jenkins-agent-base:4.7
1+
FROM quay.io/openshift/origin-jenkins-agent-base:4.8
22

33
ARG VERSION=1.5.1
44
ARG WEB_VERSION=0.5.12

‎jenkins-agents/jenkins-agent-argocd/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/openshift/origin-jenkins-agent-base:4.7
1+
FROM quay.io/openshift/origin-jenkins-agent-base:4.8
22

33
ENV ARGOCD_VERSION=2.0.5 \
44
YQ_VERSION=v4.11.1

‎jenkins-agents/jenkins-agent-conftest/Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ ARG CONFTEST_VERSION=0.23.0
77

88
USER root
99

10-
RUN curl --fail -skL https://github.com/open-policy-agent/conftest/releases/download/v${CONFTEST_VERSION}/conftest_${CONFTEST_VERSION}_Linux_x86_64.tar.gz | tar zxf - -C /usr/local/bin conftest && \
10+
RUN curl --fail -sL https://github.com/open-policy-agent/conftest/releases/download/v${CONFTEST_VERSION}/conftest_${CONFTEST_VERSION}_Linux_x86_64.tar.gz | tar zxf - -C /usr/local/bin conftest && \
1111
curl --fail -sL https://github.com/bats-core/bats-core/archive/v${BATS_VERSION}.tar.gz | tar zxf - -C /tmp && \
1212
./tmp/bats-core-${BATS_VERSION}/install.sh /usr/local && \
1313
echo "na na na na na na na na na 🦇👨‍🦰" && \
14-
rm -rf /tmp/conftest.tar.gz /tmp/bats* && \
15-
chmod -R 775 /usr/local/bin/bats /usr/local/bin/conftest && \
14+
rm -rf /tmp/bats* && \
1615
pip install yq==${YQ_VERSION}
1716

1817
USER 1001

‎jenkins-agents/jenkins-agent-cosign/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ USER root
55
ARG COSIGN_VERSION=1.0.0
66

77
# Install cosign
8-
RUN curl -skL -o /usr/local/bin/cosign https://github.com/sigstore/cosign/releases/download/v${COSIGN_VERSION}/cosign-linux-amd64 && \
9-
chmod -R 775 /usr/local/bin/cosign
8+
RUN curl -sL -o /usr/local/bin/cosign https://github.com/sigstore/cosign/releases/download/v${COSIGN_VERSION}/cosign-linux-amd64 && \
9+
chmod 755 /usr/local/bin/cosign
1010

11-
USER 1001
11+
USER 1001

‎jenkins-agents/jenkins-agent-erlang/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/openshift/origin-jenkins-agent-base:4.7
1+
FROM quay.io/openshift/origin-jenkins-agent-base:4.8
22

33
ARG ERLANG_VERSION=22.1.4
44
ARG REBAR3_VERSION=3.12.0

‎jenkins-agents/jenkins-agent-golang/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/openshift/origin-jenkins-agent-base:4.7
1+
FROM quay.io/openshift/origin-jenkins-agent-base:4.8
22

33
ARG GO_VERSION=1.15.6
44
ARG SONAR_SCANNER_VERSION=4.5.0.2216

‎jenkins-agents/jenkins-agent-graalvm/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ENV GRAALVM_HOME=/opt/mandrelJDK
44
ENV GRAAL_CE_URL=https://github.com/graalvm/mandrel/releases/download/mandrel-${GRAAL_VERSION}/mandrel-java11-linux-amd64-${GRAAL_VERSION}.tar.gz
55
ARG HELM_VERSION=3.6.3
66
ARG JQ_VERSION=1.6
7-
ARG OC_VERSION=4.8.2
7+
ARG OC_VERSION=4.8
88
ARG YQ_VERSION=4.11.2
99

1010
ADD settings.xml $HOME/.m2/settings.xml
@@ -25,7 +25,8 @@ RUN rm -f /etc/yum.repos.d/*.repo && \
2525
curl -Lo /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64 && \
2626
chmod +x /usr/local/bin/yq && \
2727
rm -f /usr/bin/oc && \
28-
curl -L https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/${OC_VERSION}/openshift-client-linux.tar.gz | tar -C /usr/local/bin -xzf - && \
28+
curl -sL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-${OC_VERSION}/openshift-client-linux.tar.gz \
29+
| tar zxf - -C /usr/local/bin oc kubectl && \
2930
### Cleanup
3031
dnf clean all && \
3132
rm -rf /var/cache/yum

‎jenkins-agents/jenkins-agent-gradle/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM quay.io/openshift/origin-jenkins-agent-base:4.7
1+
FROM quay.io/openshift/origin-jenkins-agent-base:4.8
22

33
ENV GRADLE_VERSION=6.3
44
ENV GRADLE_USER_HOME=/home/jenkins/.gradle
55

6-
RUN curl -skL -o /tmp/gradle-bin.zip https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip && \
6+
RUN curl -sL -o /tmp/gradle-bin.zip https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip && \
77
mkdir -p /opt/gradle && \
88
unzip -q /tmp/gradle-bin.zip -d /opt/gradle && \
99
ln -sf /opt/gradle/gradle-$GRADLE_VERSION/bin/gradle /usr/local/bin/gradle && \

‎jenkins-agents/jenkins-agent-helm/Dockerfile

+15-23
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,31 @@ FROM quay.io/openshift/origin-jenkins-agent-base:4.8
33
ARG VERSION=3.5.2
44
ARG YQ_VERSION=v4.5.1
55
ARG CT_VERSION=3.3.1
6-
ARG OPENSHIFT_CLIENT_VERSION=4.7.5
6+
ARG OPENSHIFT_CLIENT_VERSION=4.8
77
ARG CONFTEST_VERSION=0.23.0
88
ARG KUBE_LINTER_VERSION=0.2.3
99

1010
## Required in order to avoid ct "ascii codec can't encode character" error
11-
ENV PYTHONIOENCODING=utf-8
11+
ENV PYTHONIOENCODING=utf-8 \
12+
LANG=C.UTF-8 \
13+
LANGUAGE=C.UTF-8 \
14+
LC_ALL=C.UTF-8
1215

1316
COPY ubi8.repo /tmp/
1417

15-
## Install helm and yq and conftest
16-
RUN curl -skL -o /tmp/helm.tar.gz https://get.helm.sh/helm-v${VERSION}-linux-amd64.tar.gz && \
17-
curl -skL -o /tmp/conftest.tar.gz https://github.com/open-policy-agent/conftest/releases/download/v${CONFTEST_VERSION}/conftest_${CONFTEST_VERSION}_Linux_x86_64.tar.gz && \
18-
curl -skL -o /tmp/kube-linter.tar.gz https://github.com/stackrox/kube-linter/releases/download/${KUBE_LINTER_VERSION}/kube-linter-linux.tar.gz && \
19-
tar -C /tmp -xzf /tmp/helm.tar.gz && \
20-
tar -C /tmp -xzf /tmp/conftest.tar.gz && \
21-
tar -C /tmp -xzf /tmp/kube-linter.tar.gz && \
22-
mv -v /tmp/linux-amd64/helm /tmp/conftest /tmp/kube-linter /usr/local/bin && \
23-
chmod -R 775 /usr/local/bin/helm /usr/local/bin/conftest /usr/local/bin/kube-linter && \
24-
rm -rf /tmp/*.tar.gz && \
25-
rm -rf /tmp/linux-amd64 && \
18+
## Install helm, yq, conftest & kube-linter
19+
RUN curl -sL https://get.helm.sh/helm-v${VERSION}-linux-amd64.tar.gz | tar zxf - -C /usr/local/bin --strip-components=1 linux-amd64/helm && \
20+
curl -sL https://github.com/open-policy-agent/conftest/releases/download/v${CONFTEST_VERSION}/conftest_${CONFTEST_VERSION}_Linux_x86_64.tar.gz | tar zxf - -C /usr/local/bin conftest && \
21+
curl -sL https://github.com/stackrox/kube-linter/releases/download/${KUBE_LINTER_VERSION}/kube-linter-linux.tar.gz | tar zxf - -C /usr/local/bin kube-linter && \
2622
curl -sL https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -o /usr/local/bin/yq && \
27-
chmod -R 775 /usr/local/bin/yq
23+
chmod -R 755 /usr/local/bin/yq
2824

2925
## Install ct
3026
RUN curl -sL -o /tmp/chart-testing.tar.gz https://github.com/helm/chart-testing/releases/download/v${CT_VERSION}/chart-testing_${CT_VERSION}_linux_amd64.tar.gz && \
31-
mkdir /tmp/chart-testing && \
32-
tar -C /tmp/chart-testing -zxf /tmp/chart-testing.tar.gz && \
33-
mv /tmp/chart-testing/ct /usr/local/bin && \
34-
chmod 775 /usr/local/bin/ct && \
35-
rm /tmp/chart-testing.tar.gz && \
3627
mkdir ${HOME}/.ct && \
37-
mv /tmp/chart-testing/etc/chart_schema.yaml /tmp/chart-testing/etc/lintconf.yaml ${HOME}/.ct/ && \
38-
rm -rf /tmp/chart-testing
28+
tar zxf /tmp/chart-testing.tar.gz -C /usr/local/bin ct && \
29+
tar zxf /tmp/chart-testing.tar.gz -C ${HOME}/.ct --strip-components=1 etc && \
30+
rm /tmp/chart-testing.tar.gz
3931

4032
## Install git, python 3.8, yamale, and yamllint
4133
RUN INSTALL_PKGS="git python38 python38-pip" && \
@@ -48,7 +40,7 @@ RUN INSTALL_PKGS="git python38 python38-pip" && \
4840
python3 -m pip install yamllint==1.24.1
4941

5042
## Install oc and kubectl
51-
RUN curl -s https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OPENSHIFT_CLIENT_VERSION}/openshift-client-linux-${OPENSHIFT_CLIENT_VERSION}.tar.gz \
52-
| tar zxf - -C /usr/local/bin oc kubectl
43+
RUN curl -sL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-${OPENSHIFT_CLIENT_VERSION}/openshift-client-linux.tar.gz \
44+
| tar zxf - -C /usr/local/bin oc kubectl
5345

5446
USER 1001

‎jenkins-agents/jenkins-agent-helm/Jenkinsfile.test

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ pipeline {
77
stage ('Run Test') {
88
steps {
99
sh """
10-
helm help
10+
helm version
1111
ct version
1212
ls -l ${HOME}/.ct
1313
git version
1414
python --version
1515
oc version
1616
kubectl version
1717
conftest --version
18+
yq --version
1819
kube-linter version
1920
"""
2021
}

‎jenkins-agents/jenkins-agent-hugo/Dockerfile

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
FROM quay.io/openshift/origin-jenkins-agent-base:4.7
1+
FROM quay.io/openshift/origin-jenkins-agent-base:4.8
22

33
ENV HUGO_VERSION=0.83.1
44

5-
RUN curl -skL -o /tmp/hugo.tar.gz https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz && \
6-
tar -C /tmp -xzf /tmp/hugo.tar.gz && \
7-
mv -v /tmp/hugo /usr/local/bin && \
8-
chmod -R 775 /usr/local/bin/hugo && \
9-
rm -rf /tmp/*.tar.gz
5+
RUN curl -sL https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz \
6+
| tar zxf - -C /usr/local/bin hugo
107

11-
USER 1001
8+
USER 1001

‎jenkins-agents/jenkins-agent-image-mgmt/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN curl -L https://github.com/containers/skopeo/archive/v${SKOPEO_VERSION}.tar.
99
cd /tmp/skopeo && \
1010
make binary-local DISABLE_CGO=1
1111

12-
FROM quay.io/openshift/origin-jenkins-agent-base:4.7
12+
FROM quay.io/openshift/origin-jenkins-agent-base:4.8
1313

1414
MAINTAINER Andrew Block <[email protected]>
1515

‎jenkins-agents/jenkins-agent-mongodb/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/openshift/origin-jenkins-agent-base:4.7
1+
FROM quay.io/openshift/origin-jenkins-agent-base:4.8
22

33
USER root
44

‎jenkins-agents/jenkins-agent-mvn/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM quay.io/openshift/origin-jenkins-agent-maven:4.7
1+
FROM quay.io/openshift/origin-jenkins-agent-maven:4.8
22
ADD settings.xml $HOME/.m2/settings.xml

‎jenkins-agents/jenkins-agent-npm/Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#invoke npm in jenkinsfile: sh "scl enable rh-nodejs6 'npm run build'"
2-
FROM quay.io/openshift/origin-jenkins-agent-base:4.7
2+
FROM quay.io/openshift/origin-jenkins-agent-base:4.8
33

44
ARG JQ_VERSION=1.6
5-
ARG OC_VERSION=4.6
5+
ARG OC_VERSION=4.8
66
ARG YQ_VERSION=4.6.3
77

88
ENV NODEJS_VERSION=12 \
99
NPM_CONFIG_PREFIX=$HOME/.npm-global \
1010
PATH=$HOME/node_modules/.bin/:$HOME/.npm-global/bin/:$PATH
1111

12-
RUN curl --silent --location https://rpm.nodesource.com/setup_${NODEJS_VERSION}.x | bash -
12+
RUN curl -sL https://rpm.nodesource.com/setup_${NODEJS_VERSION}.x | bash -
1313

1414
RUN INSTALL_PKGS="nodejs" && \
1515
dnf $DISABLE_REPOS install -y --setopt=tsflags=nodocs --disablerepo='rhel-*' \
@@ -26,6 +26,7 @@ RUN INSTALL_PKGS="nodejs" && \
2626
curl -Lo /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64 && \
2727
chmod +x /usr/local/bin/yq && \
2828
rm -f /usr/bin/oc && \
29-
curl -L http://mirror.openshift.com/pub/openshift-v4/clients/oc/${OC_VERSION}/linux/oc.tar.gz | tar -C /usr/local/bin -xzf -
29+
curl -sL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-${OC_VERSION}/openshift-client-linux.tar.gz \
30+
| tar zxf - -C /usr/local/bin oc kubectl
3031

3132
USER 1001

‎jenkins-agents/jenkins-agent-python/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/openshift/origin-jenkins-agent-base:4.7
1+
FROM quay.io/openshift/origin-jenkins-agent-base:4.8
22

33
EXPOSE 8080
44

‎jenkins-agents/jenkins-agent-ruby/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM quay.io/openshift/origin-jenkins-agent-base:4.7
1+
FROM quay.io/openshift/origin-jenkins-agent-base:4.8
22

33
ARG RUBY_VERSION=2.6
4-
ARG OC_VERSION=4.4
4+
ARG OC_VERSION=4.8
55

66
ENV SUMMARY="Platform for building and running Ruby $RUBY_VERSION applications" \
77
DESCRIPTION="Ruby $RUBY_VERSION available as docker container is a base platform for \
@@ -41,8 +41,8 @@ RUN rm -f /etc/yum.repos.d/*.repo && \
4141
dnf clean all -y && \
4242
rm -rf /var/cache/dnf
4343

44-
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/clients/oc/${OC_VERSION}/linux/oc.tar.gz | tar -C /usr/local/bin -xzf - && \
45-
chmod +x /usr/local/bin/oc
44+
RUN curl -sL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-${OC_VERSION}/openshift-client-linux.tar.gz \
45+
| tar zxf - -C /usr/local/bin oc kubectl
4646

4747
# Copy extra files to the image.
4848
COPY ./root/ /

‎jenkins-agents/jenkins-agent-rust/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM quay.io/openshift/origin-jenkins-agent-base:4.7
1+
FROM quay.io/openshift/origin-jenkins-agent-base:4.8
22

33
LABEL com.redhat.component="jenkins-agent-rust-ubi7-docker" \
44
name="openshift/origin-jenkins-agent-rust-ubi7" \
5-
version="4.4" \
5+
version="4.8" \
66
architecture="x86_64" \
77
release="1" \
88
io.k8s.display_name="Jenkins Agent Rust" \

0 commit comments

Comments
 (0)