Skip to content

Commit ed2e486

Browse files
committed
Update Jenkins to rhel 9 and 4.16
1 parent b68a6ac commit ed2e486

12 files changed

Lines changed: 382 additions & 45 deletions

File tree

.github/workflows/continuous-integration-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
--imagename ods-jenkins-agent-base-ubi8 \
3535
--dockerdir jenkins/agent-base \
3636
--dockerfile Dockerfile.ubi8 \
37-
--build-arg SNYK_DISTRIBUTION_URL="https://github.com/snyk/snyk/releases/download/v1.1097.0/snyk-linux"
37+
--build-arg SNYK_DISTRIBUTION_URL="https://github.com/snyk/snyk/releases/download/v1.1295.4/snyk-linux"
3838
- name: Push UBI8 docker image
3939
if: success() && github.repository == 'opendevstack/ods-core' && github.event_name == 'push'
4040
shell: bash

configuration-sample/ods-core.env.sample

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -216,41 +216,56 @@ CONFLUENCE_URL=http://192.168.56.31:8090
216216
# Base image for Jenkins master.
217217
# For UBI8-based images (OpenShift 4):
218218
# - RHEL variant: https://catalog.redhat.com/software/containers/ocp-tools-4/jenkins-rhel8/5fe1f38288e9c2f788526306
219-
# - Example: registry.redhat.io/ocp-tools-4/jenkins-rhel8:v4.14.0
220-
# - Last tested: registry.redhat.io/ocp-tools-4/jenkins-rhel8:v4.14.0-1723454631
219+
# - Example: registry.redhat.io/ocp-tools-4/jenkins-rhel8:v4.15.0
221220
# - Community variant: https://quay.io/repository/openshift/origin-jenkins?tab=tags
222221
# - Example: quay.io/openshift/origin-jenkins:4.6
223-
JENKINS_MASTER_BASE_FROM_IMAGE=registry.redhat.io/ocp-tools-4/jenkins-rhel8:v4.14.0-1723454631
224-
225-
# Dockerfile to use for Jenkins master.
226-
# Use "Dockerfile.ubi8" for both OpenShift 3.11 and 4 (UBI8 base image)
227-
JENKINS_MASTER_DOCKERFILE_PATH=Dockerfile.ubi8
222+
# For UBI9-based images (OpenShift 4):
223+
# - RHEL variant: https://catalog.redhat.com/software/containers/ocp-tools-4/jenkins-rhel9/65dc9063b7db2e8b83a5b299
224+
# - Example: registry.redhat.io/ocp-tools-4/jenkins-rhel8:v4.16.0
225+
# - Last tested: registry.redhat.io/ocp-tools-4/jenkins-rhel9:v4.16.0-1739898511
226+
JENKINS_MASTER_BASE_FROM_IMAGE=registry.redhat.io/ocp-tools-4/jenkins-rhel9:v4.16.0-1739898511
227+
228+
# Use "Dockerfile.ubi9" for OpenShift 4 (UBI9 base image)
229+
# Quay image is not being maintained anymore and do not have a UBI9/RHEL9 variant
230+
# In case this image is being used it is recomended to use the Redhat registry rhel9 image instead
231+
# For more informtion see:
232+
# https://github.com/openshift/jenkins/issues/1829
233+
# https://github.com/openshift/jenkins/issues/1766
234+
JENKINS_MASTER_DOCKERFILE_PATH=Dockerfile.ubi9
228235

229236
# Base image for Jenkins agent base.
230237
# For UBI8-based images (OpenShift 4):
231238
# - RHEL variant: https://catalog.redhat.com/software/containers/ocp-tools-4/jenkins-agent-base-rhel8/6241e3457847116cf8577aea
232-
# - Example: registry.redhat.io/ocp-tools-4/jenkins-agent-base-rhel8:v4.14.0
233-
# - Last tested: registry.redhat.io/ocp-tools-4/jenkins-agent-base-rhel8:v4.14.0-1723453106
239+
# - Example: registry.redhat.io/ocp-tools-4/jenkins-agent-base-rhel8:v4.15.0
234240
# - Community variant: https://quay.io/repository/openshift/origin-jenkins-agent-base?tab=tags
235241
# - Example: quay.io/openshift/origin-jenkins-agent-base:4.6
236-
JENKINS_AGENT_BASE_FROM_IMAGE=registry.redhat.io/ocp-tools-4/jenkins-agent-base-rhel8:v4.14.0-1723453106
242+
# For UBI9-based images (OpenShift 4):
243+
# - RHEL variant: https://catalog.redhat.com/software/containers/ocp-tools-4/jenkins-agent-base-rhel9/65dc9063b7db2e8b83a5b29e
244+
# - Example: registry.redhat.io/ocp-tools-4/jenkins-agent-base-rhel9:v4.16.0
245+
# - Last tested: registry.redhat.io/ocp-tools-4/jenkins-agent-base-rhel9:v4.16.0-1739896346
246+
JENKINS_AGENT_BASE_FROM_IMAGE=registry.redhat.io/ocp-tools-4/jenkins-agent-base-rhel9:v4.16.0-1739896346
237247

238248
# Dockerfile to use for Jenkins agents.
239-
# Use "Dockerfile.ubi8" for both OpenShift 3.11 and 4 (UBI8 base image)
240-
JENKINS_AGENT_DOCKERFILE_PATH=Dockerfile.ubi8
249+
# Use "Dockerfile.ubi9" for OpenShift 4 (UBI9 base image)
250+
# Quay image is not being maintained anymore and do not have a UBI9/RHEL9 variant
251+
# In case this image is being used it is recomended to use the Redhat registry rhel9 image instead
252+
# For more informtion see:
253+
# https://github.com/openshift/jenkins/issues/1829
254+
# https://github.com/openshift/jenkins/issues/1766
255+
JENKINS_AGENT_DOCKERFILE_PATH=Dockerfile.ubi9
241256

242257
# Snyk CLI binary distribution url
243258
# Leave empty to avoid installing Snyk.
244259
# Releases are published at https://github.com/snyk/snyk/releases.
245-
# Latest tested version is v1.1292.4.
246-
JENKINS_AGENT_BASE_SNYK_DISTRIBUTION_URL=https://github.com/snyk/snyk/releases/download/v1.1292.4/snyk-linux
260+
# Latest tested version is v1.1295.4.
261+
JENKINS_AGENT_BASE_SNYK_DISTRIBUTION_URL=https://github.com/snyk/snyk/releases/download/v1.1295.4/snyk-linux
247262

248263
# AquaSec CLI binary distribution url
249264
# Leave empty to avoid installing AquaSec.
250265
# Releases are published at https://download.aquasec.com/scanner
251266
# Check Aqua versions backward compatibility at https://docs.aquasec.com/docs/version-compatibility-of-components#section-backward-compatibility-across-two-major-versions
252267
# To Download the aquaSec scanner cli and check their documentaion requires a valid account on aquasec.com
253-
# Latest tested version is 2022.4.720
268+
# Latest tested version is 2022.4.759
254269
# Example: https://<USER>:<PASSWORD>@download.aquasec.com/scanner/2022.4.759/scannercli
255270
JENKINS_AGENT_BASE_AQUASEC_SCANNERCLI_URL=
256271

jenkins/agent-base/Dockerfile.ubi8

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ FROM quay.io/openshift/origin-jenkins-agent-base
22

33
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
44

5-
ENV SONAR_SCANNER_VERSION=6.2.1.4610 \
6-
CNES_REPORT_VERSION=5.0.0 \
5+
ENV SONAR_SCANNER_VERSION=7.0.2.4839 \
6+
CNES_REPORT_VERSION=5.0.1 \
77
COSIGN_VERSION=2.4.3 \
88
TAILOR_VERSION=1.3.4 \
9-
SOPS_VERSION=3.9.0 \
10-
HELM_VERSION=3.15.4 \
11-
HELM_PLUGIN_DIFF_VERSION=3.9.9 \
12-
HELM_PLUGIN_SECRETS_VERSION=4.6.1 \
13-
GIT_LFS_VERSION=3.5.1 \
9+
SOPS_VERSION=3.9.4 \
10+
HELM_VERSION=3.17.1 \
11+
HELM_PLUGIN_DIFF_VERSION=3.10.0 \
12+
HELM_PLUGIN_SECRETS_VERSION=4.6.3 \
13+
GIT_LFS_VERSION=3.6.1 \
1414
IMGPKG_VERSION=0.44.0 \
15-
TRIVY_VERSION=0.54.1 \
15+
TRIVY_VERSION=0.60.0 \
1616
YQ_VERSION=4.45.1 \
1717
JAVA_GC_OPTS="-XX:+UseParallelGC -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90"
1818

@@ -21,7 +21,7 @@ ARG SNYK_DISTRIBUTION_URL
2121
ARG AQUASEC_SCANNERCLI_URL
2222

2323
# Add UBI repositories.
24-
COPY yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
24+
COPY yum.repos.d/ubi8.repo /etc/yum.repos.d/ubi.repo
2525

2626
COPY ensure_java_jre_is_adequate.sh /usr/local/bin/
2727
COPY ./set-default-java.sh /etc/profile.d/set-default-java.sh

jenkins/agent-base/Dockerfile.ubi9

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
FROM quay.io/openshift/origin-jenkins-agent-base
2+
3+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
4+
5+
ENV SONAR_SCANNER_VERSION=7.0.2.4839 \
6+
CNES_REPORT_VERSION=5.0.1 \
7+
COSIGN_VERSION=2.4.3 \
8+
TAILOR_VERSION=1.3.4 \
9+
SOPS_VERSION=3.9.4 \
10+
HELM_VERSION=3.17.1 \
11+
HELM_PLUGIN_DIFF_VERSION=3.10.0 \
12+
HELM_PLUGIN_SECRETS_VERSION=4.6.3 \
13+
GIT_LFS_VERSION=3.6.1 \
14+
IMGPKG_VERSION=0.44.0 \
15+
TRIVY_VERSION=0.60.0 \
16+
YQ_VERSION=4.45.1 \
17+
JAVA_GC_OPTS="-XX:+UseParallelGC -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90"
18+
19+
ARG APP_DNS
20+
ARG SNYK_DISTRIBUTION_URL
21+
ARG AQUASEC_SCANNERCLI_URL
22+
23+
# Add UBI repositories.
24+
COPY yum.repos.d/ubi8.repo /etc/yum.repos.d/ubi.repo
25+
26+
COPY ensure_java_jre_is_adequate.sh /usr/local/bin/
27+
COPY ./set-default-java.sh /etc/profile.d/set-default-java.sh
28+
29+
RUN cd /etc/yum.repos.d && rm -f localdev-* ci-rpm-mirrors.repo \
30+
&& ensure_java_jre_is_adequate.sh \
31+
&& yum -y install make glibc-langpack-en openssl skopeo \
32+
&& yum -y update \
33+
&& yum clean all \
34+
&& rm -rf /var/cache/yum/* \
35+
&& skopeo --version
36+
37+
# Copy use java scripts.
38+
COPY use-j*.sh /usr/local/bin/
39+
RUN chmod +x /usr/local/bin/use-j*.sh && \
40+
chmod ugo+s /usr/local/bin/use-j*.sh && \
41+
sh -c 'chmod ugo+s $(which alternatives)' && \
42+
ls -la /usr/local/bin/use-j*.sh && \
43+
echo "--- STARTS JDK 17 TESTS ---" && \
44+
use-j17.sh && \
45+
echo "--- ENDS JDK 17 TESTS ---"
46+
47+
COPY ./import_certs.sh /usr/local/bin/import_certs.sh
48+
COPY ./fix_java_certs_permissions.sh /usr/local/bin/fix_java_certs_permissions.sh
49+
RUN import_certs.sh && fix_java_certs_permissions.sh
50+
51+
# Install Sonar Scanner.
52+
RUN cd /tmp \
53+
&& curl -sSLO https://repo1.maven.org/maven2/org/sonarsource/scanner/cli/sonar-scanner-cli/${SONAR_SCANNER_VERSION}/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip \
54+
&& unzip sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip \
55+
&& mv sonar-scanner-${SONAR_SCANNER_VERSION} /usr/local/sonar-scanner-cli \
56+
&& rm -rf sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip \
57+
&& /usr/local/sonar-scanner-cli/bin/sonar-scanner --version
58+
ENV PATH=/usr/local/sonar-scanner-cli/bin:$PATH
59+
60+
# Add sq cnes report jar.
61+
RUN cd /tmp \
62+
&& curl -sSL https://github.com/cnescatlab/sonar-cnes-report/releases/download/${CNES_REPORT_VERSION}/sonar-cnes-report-${CNES_REPORT_VERSION}.jar -o cnesreport.jar \
63+
&& mkdir /usr/local/cnes \
64+
&& mv cnesreport.jar /usr/local/cnes/cnesreport.jar \
65+
&& chmod 777 /usr/local/cnes/cnesreport.jar
66+
67+
# Install sigstore/cosign
68+
RUN cd /tmp \
69+
&& curl -sSLO https://github.com/sigstore/cosign/releases/download/v${COSIGN_VERSION}/cosign-linux-amd64 \
70+
&& mv /tmp/cosign-linux-amd64 /usr/local/bin/cosign \
71+
&& chmod 755 /usr/local/bin/cosign \
72+
&& cosign version
73+
74+
# Install Tailor.
75+
RUN cd /tmp \
76+
&& curl -sSLO https://github.com/opendevstack/tailor/releases/download/v${TAILOR_VERSION}/tailor-linux-amd64 \
77+
&& mv tailor-linux-amd64 /usr/local/bin/tailor \
78+
&& chmod a+x /usr/local/bin/tailor \
79+
&& tailor version
80+
81+
# Install Helm.
82+
RUN cd /tmp \
83+
&& dnf install -y https://github.com/mozilla/sops/releases/download/v${SOPS_VERSION}/sops-${SOPS_VERSION}-1.x86_64.rpm \
84+
&& mkdir -p /tmp/helm \
85+
&& curl -sSLO https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz \
86+
&& tar -zxvf helm-v${HELM_VERSION}-linux-amd64.tar.gz -C /tmp/helm \
87+
&& mv /tmp/helm/linux-amd64/helm /usr/local/bin/helm \
88+
&& chmod a+x /usr/local/bin/helm \
89+
&& helm version \
90+
&& helm env \
91+
&& helm plugin install https://github.com/databus23/helm-diff --version v${HELM_PLUGIN_DIFF_VERSION} \
92+
&& helm plugin install https://github.com/jkroepke/helm-secrets --version v${HELM_PLUGIN_SECRETS_VERSION} \
93+
&& sops --version \
94+
&& rm -rf /tmp/helm /tmp/helm-v${HELM_VERSION}-linux-amd64.tar.gz
95+
96+
# Install imgpkg.
97+
RUN cd /tmp \
98+
&& curl -sSLO https://github.com/carvel-dev/imgpkg/releases/download/v${IMGPKG_VERSION}/imgpkg-linux-amd64 \
99+
&& mv imgpkg-linux-amd64 /usr/local/bin/imgpkg \
100+
&& chmod a+x /usr/local/bin/imgpkg \
101+
&& imgpkg --version
102+
103+
# Install yq.
104+
RUN cd /tmp \
105+
&& curl -sSLO https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64 \
106+
&& mv yq_linux_amd64 /usr/local/bin/yq \
107+
&& chmod a+x /usr/local/bin/yq \
108+
&& yq --version
109+
110+
# Install GIT-LFS extension https://git-lfs.github.com/.
111+
RUN cd /tmp \
112+
&& mkdir -p /tmp/git-lfs \
113+
&& curl -sSLO https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/git-lfs-linux-amd64-v${GIT_LFS_VERSION}.tar.gz \
114+
&& tar -zxvf git-lfs-linux-amd64-v${GIT_LFS_VERSION}.tar.gz -C /tmp/git-lfs \
115+
&& bash /tmp/git-lfs/git-lfs-${GIT_LFS_VERSION}/install.sh \
116+
&& git lfs version \
117+
&& rm -rf /tmp/git-lfs*
118+
119+
# Optionally install snyk.
120+
RUN if [ -z $SNYK_DISTRIBUTION_URL ] ; then echo 'Skipping snyk installation!' ; else echo 'Installing snyk... getting binary from' $SNYK_DISTRIBUTION_URL \
121+
&& curl -sSL $SNYK_DISTRIBUTION_URL --output snyk \
122+
&& mv snyk /usr/local/bin \
123+
&& chmod +rwx /usr/local/bin/snyk \
124+
&& mkdir -p $HOME/.config/configstore/ \
125+
&& chmod -R g+rw $HOME/.config/configstore/ \
126+
&& echo 'Snyk CLI version:' \
127+
&& snyk --version \
128+
&& echo 'Snyk installation completed!'; \
129+
fi
130+
131+
# Optionally install Aquasec.
132+
RUN if [ -z $AQUASEC_SCANNERCLI_URL ] ; then echo 'Skipping AquaSec installation!' ; else echo 'Installing AquaSec... getting binary from' $AQUASEC_SCANNERCLI_URL \
133+
&& curl -sSL $AQUASEC_SCANNERCLI_URL --output aquasec \
134+
&& mv aquasec /usr/local/bin \
135+
&& chmod +rwx /usr/local/bin/aquasec \
136+
&& echo 'AquaSec CLI version:' \
137+
&& aquasec version \
138+
&& echo 'AquaSec installation completed!'; \
139+
fi
140+
141+
# Install Trivy.
142+
RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v$TRIVY_VERSION \
143+
&& echo 'Trivy CLI version:' \
144+
&& trivy version
145+
146+
# Set java proxy var.
147+
COPY set_java_proxy.sh /tmp/set_java_proxy.sh
148+
RUN . /tmp/set_java_proxy.sh && echo $JAVA_OPTS
149+
150+
# Customize entrypoint.
151+
COPY fix_openshift_run_jnlp_client.sh /usr/local/bin/fix_openshift_run_jnlp_client.sh
152+
RUN mv /usr/local/bin/run-jnlp-client /usr/local/bin/openshift-run-jnlp-client \
153+
&& fix_openshift_run_jnlp_client.sh /usr/local/bin/openshift-run-jnlp-client
154+
155+
COPY ods-run-jnlp-client.sh /usr/local/bin/run-jnlp-client
156+
157+
# Fix permissions.
158+
RUN mkdir -p /home/jenkins/.config && chmod -R g+w /home/jenkins/.config \
159+
&& mkdir -p /home/jenkins/.cache && chmod -R g+w /home/jenkins/.cache \
160+
&& mkdir -p /home/jenkins/.sonar && chmod -R g+w /home/jenkins/.sonar \
161+
&& mkdir -p /tmp/aqua && chmod -R g+w /tmp/aqua
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
[ubi-9-baseos]
2+
name = Red Hat Universal Base Image 9 (RPMs) - BaseOS
3+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/baseos/os
4+
enabled = 1
5+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
6+
gpgcheck = 1
7+
8+
[ubi-9-baseos-debug]
9+
name = Red Hat Universal Base Image 9 (Debug RPMs) - BaseOS
10+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/baseos/debug
11+
enabled = 0
12+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
13+
gpgcheck = 1
14+
15+
[ubi-9-baseos-source]
16+
name = Red Hat Universal Base Image 9 (Source RPMs) - BaseOS
17+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/baseos/source/SRPMS
18+
enabled = 0
19+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
20+
gpgcheck = 1
21+
22+
[ubi-9-appstream]
23+
name = Red Hat Universal Base Image 9 (RPMs) - AppStream
24+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/appstream/os
25+
enabled = 1
26+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
27+
gpgcheck = 1
28+
29+
[ubi-9-appstream-debug]
30+
name = Red Hat Universal Base Image 9 (Debug RPMs) - AppStream
31+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/appstream/debug
32+
enabled = 0
33+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
34+
gpgcheck = 1
35+
36+
[ubi-9-appstream-source]
37+
name = Red Hat Universal Base Image 9 (Source RPMs) - AppStream
38+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/appstream/source/SRPMS
39+
enabled = 0
40+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
41+
gpgcheck = 1
42+
43+
[ubi-9-codeready-builder]
44+
name = Red Hat Universal Base Image 9 (RPMs) - CodeReady Builder
45+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/codeready-builder/os
46+
enabled = 1
47+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
48+
gpgcheck = 1
49+
50+
[ubi-9-codeready-builder-debug]
51+
name = Red Hat Universal Base Image 9 (Debug RPMs) - CodeReady Builder
52+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/codeready-builder/debug
53+
enabled = 0
54+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
55+
gpgcheck = 1
56+
57+
[ubi-9-codeready-builder-source]
58+
name = Red Hat Universal Base Image 9 (Source RPMs) - CodeReady Builder
59+
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/codeready-builder/source/SRPMS
60+
enabled = 0
61+
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
62+
gpgcheck = 1

jenkins/master/Dockerfile.ubi8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ENV JENKINS_JAVA_OVERRIDES="-Dhudson.tasks.MailSender.SEND_TO_UNKNOWN_USERS=true
1515
USER root
1616

1717
# Add UBI repositories.
18-
COPY yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
18+
COPY yum.repos.d/ubi8.repo /etc/yum.repos.d/ubi.repo
1919

2020
COPY ./scripts_for_usr-local-bin/* /usr/local/bin/
2121
RUN rpm --import https://pkg.jenkins.io/redhat-stable/jenkins.io.key \
@@ -28,7 +28,7 @@ RUN rpm --import https://pkg.jenkins.io/redhat-stable/jenkins.io.key \
2828
&& clean_yum_cache.sh
2929

3030
# Copy configuration and plugins.
31-
COPY plugins.ubi8.txt /opt/openshift/configuration/plugins.txt
31+
COPY plugins.txt /opt/openshift/configuration/plugins.txt
3232
RUN /usr/local/bin/install-plugins.sh /opt/openshift/configuration/plugins.txt \
3333
&& rm -r /opt/openshift/configuration/jobs/OpenShift* || true \
3434
&& touch /var/lib/jenkins/configured \

0 commit comments

Comments
 (0)