From 24d31736559ee53286b7cba05f40e2690d9afbc4 Mon Sep 17 00:00:00 2001 From: Rishabh Singh Date: Tue, 7 Jun 2022 17:16:38 +0530 Subject: [PATCH] use jenkins-2.332.3 jdk8 base image Signed-off-by: Rishabh Singh --- .github/workflows/docker.yml | 2 +- docker/Dockerfile | 4 ++-- resources/docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 81c54678..03aa7ab6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,4 +26,4 @@ jobs: platforms: linux/amd64,linux/arm64 context: "{{defaultContext}}:docker" push: true - tags: opensearchstaging/jenkins:2.332.3-lts,opensearchstaging/jenkins:latest + tags: opensearchstaging/jenkins:2.332.3-lts-jdk8,opensearchstaging/jenkins:latest diff --git a/docker/Dockerfile b/docker/Dockerfile index 16856913..5f9531c3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ -FROM jenkins/jenkins:2.332.3-lts +FROM jenkins/jenkins:2.332.3-lts-jdk8 LABEL maintainer="OpenSearch" ENV JAVA_OPTS -Djenkins.install.runSetupWizard=false COPY plugins.txt plugins.txt -RUN /usr/local/bin/install-plugins.sh < plugins.txt \ No newline at end of file +RUN /usr/local/bin/install-plugins.sh < plugins.txt diff --git a/resources/docker-compose.yml b/resources/docker-compose.yml index f56deb23..2aa473e6 100644 --- a/resources/docker-compose.yml +++ b/resources/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.8' services: jenkins: - image: opensearchstaging/jenkins:2.332.3-lts + image: opensearchstaging/jenkins:2.332.3-lts-jdk8 privileged: true tty: true user: root