diff --git a/Dockerfile b/Dockerfile index 97a6e61..0f6556d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG JENKINS_VERSION=2.239 +ARG JENKINS_VERSION=2.240 FROM jenkins/jenkins:$JENKINS_VERSION MAINTAINER Oleg Nenashev LABEL Description="This demo shows how to setup Jenkins Config-as-Code with Docker, Pipeline, and Groovy Hook Scripts" Vendor="Oleg Nenashev" Version="0.2" diff --git a/Makefile b/Makefile index 07a1a6d..336aed8 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -PLUGIN_MANAGER_TOOL_VERSION=1.0.2 -JENKINS_VERSION=2.238 +PLUGIN_MANAGER_TOOL_VERSION=1.1.0 +JENKINS_VERSION=2.240 build: docker build -t onenashev/demo-jenkins-config-as-code . @@ -17,10 +17,11 @@ tmp/jenkins.war: wget https://repo.jenkins-ci.org/releases/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war -O tmp/jenkins.war touch tmp/jenkins.war -tmp/jenkins-plugin-manager.jar: - wget https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/plugin-management-parent-pom-${PLUGIN_MANAGER_TOOL_VERSION}/jenkins-plugin-manager-${PLUGIN_MANAGER_TOOL_VERSION}.jar -O tmp/jenkins-plugin-manager.jar - touch tmp/jenkins-plugin-manager.jar +tmp/jenkins-plugin-manager-${PLUGIN_MANAGER_TOOL_VERSION}.jar: + mkdir -p tmp + wget https://repo.jenkins-ci.org/releases/io/jenkins/plugin-management/plugin-management-cli/${PLUGIN_MANAGER_TOOL_VERSION}/plugin-management-cli-${PLUGIN_MANAGER_TOOL_VERSION}.jar -O tmp/jenkins-plugin-manager-${PLUGIN_MANAGER_TOOL_VERSION}.jar + touch tmp/jenkins-plugin-manager-${PLUGIN_MANAGER_TOOL_VERSION}.jar -show-updates: tmp/jenkins-plugin-manager.jar tmp/jenkins.war +show-updates: tmp/jenkins-plugin-manager-${PLUGIN_MANAGER_TOOL_VERSION}.jar tmp/jenkins.war mkdir -p tmp/plugins - java -jar tmp/jenkins-plugin-manager.jar --list -f plugins.txt --no-download -d tmp/plugins -w tmp/jenkins.war --available-updates + java -jar tmp/jenkins-plugin-manager-${PLUGIN_MANAGER_TOOL_VERSION}.jar --list -f plugins.txt --no-download -d tmp/plugins -w tmp/jenkins.war --skip-failed-plugins --verbose --available-updates diff --git a/plugins.txt b/plugins.txt index a4a21c0..8af0f89 100644 --- a/plugins.txt +++ b/plugins.txt @@ -1,60 +1,86 @@ ace-editor:1.1 +analysis-model-api:8.1.3 +antisamy-markup-formatter:2.0 authorize-project:1.3.0 +blueocean-autofavorite:1.2.4 +blueocean-display-url:2.3.1 blueocean:1.23.2 +branch-api:2.5.6 cloud-stats:0.25 -cloudbees-folder:6.12 +cloudbees-bitbucket-branch-source:2.8.0 +cloudbees-folder:6.14 cobertura:1.16 code-coverage-api:1.1.6 +conditional-buildstep:1.3.6 configuration-as-code:1.41 +credentials-binding:1.23 +credentials:2.3.8 data-tables-api:1.10.21-1 +display-url-api:2.3.2 docker-commons:1.16 docker-workflow:1.23 +durable-task:1.34 echarts-api:4.7.0-4 email-ext:2.69 extended-read-permission:3.2 favorite:2.3.2 filesystem_scm:2.1 git-client:3.2.1 +git-server:1.9 git:4.2.2 -github-api:1.112.0 -github-branch-source:2.8.0 +github-api:1.114.1 +github-branch-source:2.8.2 github:1.30.0 +handy-uri-templates-2-api:2.1.8-1.0 +htmlpublisher:1.23 +icon-shim:2.0.3 jackson2-api:2.11.0 -jacoco:3.0.4 +jacoco:3.0.6 javadoc:1.5 jdk-tool:1.4 +jira:3.1.0 job-restrictions:0.8 jsch:0.1.55.2 -junit:1.27 -icon-shim:2.0.3 +junit:1.29 locale:1.4 lockable-resources:2.8 mailer:1.32 manage-permission:1.0.1 matrix-auth:2.6.1 +matrix-project:1.15 maven-plugin:3.6 +mercurial:2.10 momentjs:1.1.1 monitoring:1.83.0 ownership:0.12.1 -parallel-test-executor:1.12 +parallel-test-executor:1.13 parameterized-trigger:2.36 pipeline-build-step:2.12 +pipeline-input-step:2.11 pipeline-model-definition:1.7.0 pipeline-stage-tags-metadata:1.7.0 pipeline-stage-view:2.13 -role-strategy:2.16 +plain-credentials:1.7 +role-strategy:3.0 run-condition:1.3 scm-api:2.6.3 +script-security:1.73 security-inspector:0.5 snakeyaml-api:1.26.4 +sse-gateway:1.23 ssh-credentials:1.18.1 +ssh-slaves:1.31.2 timestamper:1.11.3 token-macro:2.12 +trilead-api:1.0.8 +variant:1.3 warnings-ng:8.1.0 workflow-basic-steps:2.20 +workflow-cps-global-lib:2.16 workflow-cps:2.80 workflow-durable-task-step:2.35 workflow-job:2.39 workflow-multibranch:2.21 workflow-scm-step:2.11 +workflow-support:3.5 yet-another-docker-plugin:0.2.0