Merge branch 'main' into dependabot/npm_and_yarn/references/cicd-pipe…

…line/babel/traverse-7.23.2
apigee · Oct 18, 2023 · 10714bc · 10714bc
2 parents e158d0f + 0016d9d
commit 10714bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/references/cicd-pipeline/jenkins-build/Dockerfile b/references/cicd-pipeline/jenkins-build/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-FROM jenkins/jenkins:2.346.3-alpine
+FROM jenkins/jenkins:2.346.3-lts-alpine
 
 USER root
 RUN apk update && apk add --no-cache git maven nodejs npm
@@ -26,7 +26,7 @@ RUN mv /usr/bin/mvn /usr/bin/_mvn &&\
 USER jenkins
 
 COPY --chown=jenkins plugins.txt /usr/share/jenkins/ref/plugins.txt
-RUN jenkins-plugin-cli --plugin-file /usr/share/jenkins/ref/plugins.txt
+RUN jenkins-plugin-cli --plugin-file /usr/share/jenkins/ref/plugins.txt --jenkins-version 2.346.3 --latest false
 
 COPY --chown=jenkins jenkins.yml /var/jenkins_home/casc_configs/jenkins.yaml
 ENV CASC_JENKINS_CONFIG=/var/jenkins_home/casc_configs/jenkins.yaml

diff --git a/references/cicd-pipeline/jenkins-build/plugins.txt b/references/cicd-pipeline/jenkins-build/plugins.txt
@@ -2,6 +2,7 @@ configuration-as-code:1569.vb_72405b_80249
 cucumber-reports:5.7.3
 git:4.11.5
 htmlpublisher:1.30
+javax-mail-api:1.6.2-8
 junit:1119.1121.vc43d0fc45561
 mask-passwords:3.3
 token-macro:293.v283932a_0a_b_49