Update Jenkins java version

2024-10-11 14:59:33 +03:00 · 2024-10-11 14:59:33 +03:00 · 3eac9b7965
parent a5f7715bce
commit 3eac9b7965
3 changed files with 3 additions and 4 deletions
--- a/jenkins-agent.Dockerfile
+++ b/jenkins-agent.Dockerfile
--- a/Dockerfile.jenkins
+++ b/Dockerfile.jenkins
@ -1,2 +1,2 @@
-FROM jenkins/jenkins:jdk17
+FROM jenkins/jenkins:jdk21
 RUN jenkins-plugin-cli --plugins 'configuration-as-code:latest ssh-slaves:latest credentials-binding:latest subversion:latest job-dsl:latest pipeline-model-definition:latest pipeline-build-step:latest ansible:latest git:latest workflow-aggregator:latest docker-workflow:latest ws-cleanup:latest pipeline-graph-view:latest ssh-agent:latest matrix-auth:latest'
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -2,10 +2,9 @@ services:
  jenkins-controller:
    build:
      context: .
-      dockerfile: jenkins.Dockerfile
+      dockerfile: Dockerfile.jenkins
    environment:
      - CASC_JENKINS_CONFIG=/jenkins.yml
-      - CASC_RELOAD_TOKEN=$CASC_RELOAD_TOKEN
    volumes:
      - ./jenkins.yml:/jenkins.yml
      - ./id_rsa:/secrets/id_rsa
@ -17,7 +16,7 @@ services:
    env_file: ./agent.env
    build:
      context: .
-      dockerfile: jenkins-agent.Dockerfile
+      dockerfile: Dockerfile.agent
      args:
        DOCKER_GROUP: '${DOCKER_GROUP}'
    volumes: