diff --git a/Dockerfile b/Dockerfile index c131fc4..6bf4a5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG FROM_TAG=2.462.1 +ARG FROM_TAG=2.462.3 FROM jenkins/jenkins:${FROM_TAG} diff --git a/LTS_VERSION.txt b/LTS_VERSION.txt index 328df40..312f307 100644 --- a/LTS_VERSION.txt +++ b/LTS_VERSION.txt @@ -1 +1 @@ -2.462.1 +2.462.3 diff --git a/Makefile b/Makefile index 542ede4..71d2a8e 100644 --- a/Makefile +++ b/Makefile @@ -10,13 +10,13 @@ build-all: build-alpine build-debian build-jdk11 test-all: test-alpine test-debian test-jdk11 build-alpine: - docker build --rm --force-rm -t odavid/my-bloody-jenkins $(DEFAULT_BUILD_ARGS) --build-arg=FROM_TAG=$(LTS_VERSION)-alpine . + docker build --platform linux/amd64 --rm --force-rm -t odavid/my-bloody-jenkins $(DEFAULT_BUILD_ARGS) --build-arg=FROM_TAG=$(LTS_VERSION)-alpine . build-debian: - docker build --rm --force-rm -t odavid/my-bloody-jenkins $(DEFAULT_BUILD_ARGS) --build-arg=FROM_TAG=$(LTS_VERSION) . + docker build --platform linux/amd64 --rm --force-rm -t odavid/my-bloody-jenkins $(DEFAULT_BUILD_ARGS) --build-arg=FROM_TAG=$(LTS_VERSION) . build-jdk11: - docker build --rm --force-rm -t odavid/my-bloody-jenkins $(DEFAULT_BUILD_ARGS) --build-arg=FROM_TAG=$(LTS_VERSION)-jdk11 . + docker build --platform linux/amd64 --rm --force-rm -t odavid/my-bloody-jenkins $(DEFAULT_BUILD_ARGS) --build-arg=FROM_TAG=$(LTS_VERSION)-jdk11 . test-alpine: build-alpine bats tests diff --git a/plugins.txt b/plugins.txt index 106a984..034d3c8 100644 --- a/plugins.txt +++ b/plugins.txt @@ -1,91 +1,91 @@ ace-editor:1.1 -active-directory:2.36 +active-directory:2.37 amazon-ecr:1.136.v914ea_5948634 amazon-ecs:1.49 anchore-container-scanner:3.2.0 -ansicolor:1.0.4 +ansicolor:1.0.5 ant:511.v0a_a_1a_334f41b_ antisamy-markup-formatter:162.v0e6ec0fcfcf6 apache-httpcomponents-client-4-api:4.5.14-208.v438351942757 -apache-httpcomponents-client-5-api:5.3.1-110.v77252fb_d4da_5 +apache-httpcomponents-client-5-api:5.4-118.v199115451c4d artifactory:4.0.8 authentication-tokens:1.119.v50285141b_7e1 aws-credentials:231.v08a_59f17d742 -aws-java-sdk-cloudformation:1.12.753-463.v071a_97315959 -aws-java-sdk-codebuild:1.12.753-463.v071a_97315959 -aws-java-sdk-ec2:1.12.753-463.v071a_97315959 -aws-java-sdk-ecr:1.12.753-463.v071a_97315959 -aws-java-sdk-ecs:1.12.753-463.v071a_97315959 -aws-java-sdk-efs:1.12.753-463.v071a_97315959 -aws-java-sdk-elasticbeanstalk:1.12.753-463.v071a_97315959 -aws-java-sdk-iam:1.12.753-463.v071a_97315959 -aws-java-sdk-kinesis:1.12.753-463.v071a_97315959 -aws-java-sdk-logs:1.12.753-463.v071a_97315959 -aws-java-sdk-minimal:1.12.753-463.v071a_97315959 -aws-java-sdk-sns:1.12.753-463.v071a_97315959 -aws-java-sdk-sqs:1.12.753-463.v071a_97315959 -aws-java-sdk-ssm:1.12.753-463.v071a_97315959 -aws-java-sdk:1.12.753-463.v071a_97315959 -badge:1.13 +aws-java-sdk-cloudformation:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk-codebuild:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk-ec2:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk-ecr:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk-ecs:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk-efs:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk-elasticbeanstalk:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk-iam:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk-kinesis:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk-logs:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk-minimal:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk-sns:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk-sqs:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk-ssm:1.12.767-467.vb_e93f0c614b_6 +aws-java-sdk:1.12.767-467.vb_e93f0c614b_6 +badge:2.2 basic-branch-build-strategies:81.v05e333931c7d blueocean-autofavorite:1.2.5 -blueocean-bitbucket-pipeline:1.27.14 -blueocean-commons:1.27.14 -blueocean-config:1.27.14 -blueocean-core-js:1.27.14 -blueocean-dashboard:1.27.14 +blueocean-bitbucket-pipeline:1.27.16 +blueocean-commons:1.27.16 +blueocean-config:1.27.16 +blueocean-core-js:1.27.16 +blueocean-dashboard:1.27.16 blueocean-display-url:2.4.3 -blueocean-events:1.27.14 -blueocean-git-pipeline:1.27.14 -blueocean-github-pipeline:1.27.14 -blueocean-i18n:1.27.14 -blueocean-jira:1.27.14 -blueocean-jwt:1.27.14 -blueocean-personalization:1.27.14 -blueocean-pipeline-api-impl:1.27.14 -blueocean-pipeline-editor:1.27.14 -blueocean-pipeline-scm-api:1.27.14 -blueocean-rest-impl:1.27.14 -blueocean-rest:1.27.14 -blueocean-web:1.27.14 -blueocean:1.27.14 +blueocean-events:1.27.16 +blueocean-git-pipeline:1.27.16 +blueocean-github-pipeline:1.27.16 +blueocean-i18n:1.27.16 +blueocean-jira:1.27.16 +blueocean-jwt:1.27.16 +blueocean-personalization:1.27.16 +blueocean-pipeline-api-impl:1.27.16 +blueocean-pipeline-editor:1.27.16 +blueocean-pipeline-scm-api:1.27.16 +blueocean-rest-impl:1.27.16 +blueocean-rest:1.27.16 +blueocean-web:1.27.16 +blueocean:1.27.16 bootstrap4-api:4.6.0-6 bootstrap5-api:5.3.3-1 bouncycastle-api:2.30.1.78.1-248.ve27176eb_46cb_ branch-api:2.1178.v969d9eb_c728e build-timeout:1.33 -build-user-vars-plugin:166.v52976843b_435 +build-user-vars-plugin:176.vb_9c7907fd524 buildtriggerbadge:251.vdf6ef853f3f5 caffeine-api:3.1.8-133.v17b_1ff2e0599 checkmarx:2024.2.3 -checks-api:2.2.0 +checks-api:2.2.1 cloud-stats:336.v788e4055508b_ cloudbees-bitbucket-branch-source:888.v8e6d479a_1730 -cloudbees-folder:6.942.vb_43318a_156b_2 +cloudbees-folder:6.955.v81e2a_35c08d3 cobertura:1.17 code-coverage-api:4.99.0 command-launcher:115.vd8b_301cc15d0 -commons-lang3-api:3.14.0-76.vda_5591261cfe +commons-lang3-api:3.17.0-84.vb_b_938040b_078 commons-text-api:1.12.0-129.v99a_50df237f7 conditional-buildstep:1.4.3 -config-file-provider:973.vb_a_80ecb_9a_4d0 -configuration-as-code:1836.vccda_4a_122a_a_e +config-file-provider:978.v8e85886ffdc4 +configuration-as-code:1850.va_a_8c31d3158b_ copyartifact:749.vfb_dca_a_9b_6549 credentials-binding:681.vf91669a_32e45 -credentials:1371.vfee6b_095f0a_3 +credentials:1384.vf0a_2ed06f9c6 cucumber-reports:5.8.3 custom-tools-plugin:0.8 -dashboard-view:2.508.va_74654f026d1 -data-tables-api:2.0.8-1 +dashboard-view:2.517.v776a_b_811a_b_4e +data-tables-api:2.1.8-1 display-url-api:2.204.vf6fddd8a_8b_e9 docker-build-publish:1.4.0 docker-commons:443.v921729d5611d -docker-java-api:3.3.6-90.ve7c5c7535ddd +docker-java-api:3.4.0-94.v65ced49b_a_7d5 docker-plugin:1.6.2 docker-workflow:580.vc0c340686b_54 -durable-task:568.v8fb_5c57e8417 -echarts-api:5.5.0-1 -email-ext:1814.v404722f34263 +durable-task:577.v2a_8a_4b_7c0247 +echarts-api:5.5.1-1 +email-ext:1844.v3ea_a_b_842374a_ emailext-template:1.5 embeddable-build-status:487.va_0ef04c898a_2 envinject-api:1.199.v3ce31253ed13 @@ -95,32 +95,32 @@ extensible-choice-parameter:1.8.1 external-monitor-job:215.v2e88e894db_f8 favorite:2.221.v19ca_666b_62f5 filesystem_scm:2.1 -font-awesome-api:6.5.2-1 -forensics-api:2.4.0 +font-awesome-api:6.6.0-2 +forensics-api:2.6.0 gatling:1.3.0 -git-changelog:3.38 +git-changelog:3.39 git-client:5.0.0 git-parameter:0.9.19 git-server:126.v0d945d8d2b_39 -git:5.3.0 +git:5.5.2 github-api:1.321-468.v6a_9f5f2d5a_7e -github-branch-source:1793.v1831e9c68d77 +github-branch-source:1797.v86fdb_4d57d43 github-oauth:597.ve0c3480fcb_d0 -github:1.39.0 +github:1.40.0 gitlab-api:5.6.0-97.v6603a_83f8690 -gitlab-branch-source:704.vc7f1202d7e14 -gitlab-plugin:1.8.1 +gitlab-branch-source:710.v6f19df32544b_ +gitlab-plugin:1.8.2 golang:1.4 google-login:109.v022b_cf87b_e5b_ -gradle:2.12 -groovy-postbuild:228.vcdb_cf7265066 +gradle:2.13.1 +groovy-postbuild:264.vf6e02a_77d5b_c h2-api:11.1.4.199-30.v1c64e772f3a_c handlebars:3.0.8 handy-uri-templates-2-api:2.1.8-30.v7e777411b_148 htmlpublisher:1.36 -http_request:1.18 +http_request:1.19 image-tag-parameter:2.0 -instance-identity:185.v303dc7c645f9 +instance-identity:201.vd2a_b_5a_468a_a_6 ionicons-api:74.v93d5eb_813d5f ivy:2.6 jackson2-api:2.17.0-379.v02de8ec9f64c @@ -131,74 +131,74 @@ javax-activation-api:1.2.0-7 javax-mail-api:1.6.2-10 jaxb:2.3.9-1 jdk-tool:80.v8a_dee33ed6f0 -jenkins-design-language:1.27.14 +jenkins-design-language:1.27.16 jersey2-api:2.44-151.v6df377fff741 jira-steps:2.0.165.v8846cf59f3db jira:3.13 jjwt-api:0.11.5-112.ve82dfb_224b_a_d jnr-posix-api:3.1.19-2 -job-dsl:1.87 +job-dsl:1.89 jquery-detached:1.2.1 jquery3-api:3.7.1-2 jquery:1.12.4-1 jsch:0.2.16-86.v42e010d9484b_ -junit:1284.vf75d778f98c5 +junit:1304.vc85a_b_ca_96613 kubernetes-cli:1.12.1 kubernetes-client-api:6.10.0-240.v57880ce8b_0b_2 -kubernetes-credentials:174.va_36e093562d9 -kubernetes:4280.vd919fa_528c7e +kubernetes-credentials:190.v03c305394deb_ +kubernetes:4292.v11898cf8fa_66 ldap:725.v3cb_b_711b_1a_ef -lockable-resources:1255.vf48745da_35d0 -mailer:472.vf7c289a_4b_420 +lockable-resources:1315.v4ea_8e5159ec8 +mailer:488.v0c9639c1a_eb_3 mapdb-api:1.0.9-40.v58107308b_7a_7 mask-passwords:173.v6a_077a_291eb_5 matrix-auth:3.2.2 -matrix-project:832.va_66e270d2946 +matrix-project:839.vff91cd7e3a_b_2 maven-plugin:3.23 mercurial:1260.vdfb_723cdcc81 metrics:4.2.21-451.vd51df8df52ec -mina-sshd-api-common:2.13.1-117.v2f1a_b_66ff91d -mina-sshd-api-core:2.13.1-117.v2f1a_b_66ff91d +mina-sshd-api-common:2.14.0-133.vcc091215a_358 +mina-sshd-api-core:2.14.0-133.vcc091215a_358 momentjs:1.1.1 -nodejs:1.6.1 -oic-auth:4.303.v84089a_708ea_7 +nodejs:1.6.2 +oic-auth:4.388.v4f73328eb_d2c okhttp-api:4.11.0-172.vda_da_1feeb_c6e p4:1.16.0 pam-auth:1.11 -parallel-test-executor:473.v81c8f8d1675f +parallel-test-executor:512.v751a_b_24e0e67 parameterized-trigger:806.vf6fff3e28c3e pipeline-aws:1.45 pipeline-build-step:540.vb_e8849e1a_b_d8 pipeline-graph-analysis:216.vfd8b_ece330ca_ -pipeline-groovy-lib:727.ve832a_9244dfa_ +pipeline-groovy-lib:740.va_2701257fe8d pipeline-input-step:495.ve9c153f6067b_ -pipeline-maven:1421.v610fa_b_e2d60e +pipeline-maven:1457.vf7a_de13b_c0d4 pipeline-milestone-step:119.vdfdc43fc3b_9a_ -pipeline-model-api:2.2205.vc9522a_9d5711 -pipeline-model-definition:2.2205.vc9522a_9d5711 -pipeline-model-extensions:2.2205.vc9522a_9d5711 +pipeline-model-api:2.2214.vb_b_34b_2ea_9b_83 +pipeline-model-definition:2.2214.vb_b_34b_2ea_9b_83 +pipeline-model-extensions:2.2214.vb_b_34b_2ea_9b_83 pipeline-rest-api:2.34 pipeline-stage-step:312.v8cd10304c27a_ -pipeline-stage-tags-metadata:2.2205.vc9522a_9d5711 +pipeline-stage-tags-metadata:2.2214.vb_b_34b_2ea_9b_83 pipeline-stage-view:2.34 -pipeline-utility-steps:2.17.0 +pipeline-utility-steps:2.18.0 plain-credentials:183.va_de8f1dd5a_2b_ -plugin-util-api:4.1.0 +plugin-util-api:5.1.0 popper-api:1.16.1-3 popper2-api:2.11.6-5 -prism-api:1.29.0-15 -promoted-builds:957.vf5b_cee587563 +prism-api:1.29.0-17 +promoted-builds:965.vcda_c6a_e0998f pubsub-light:1.18 rebuild:332.va_1ee476d8f6d -resource-disposer:0.23 +resource-disposer:0.24 run-condition:1.7 saml:4.464.vea_cb_75d7f5e0 sbt:81.vb_82499046630 scm-api:696.v778d637b_a_762 -script-security:1341.va_2819b_414686 -simple-theme-plugin:191.vcd207ef9dd24 -slack:734.v7f9ec8b_66975 -snakeyaml-api:2.2-121.v5a_68b_9300b_d4 +script-security:1362.v67dc1f0e1b_b_3 +simple-theme-plugin:196.v96d9592f4efa_ +slack:751.v2e44153c8fe1 +snakeyaml-api:2.3-123.v13484c65210a_ sonar:2.17.2 sse-gateway:1.27 ssh-agent:376.v8933585c69d3 @@ -207,8 +207,8 @@ ssh-slaves:2.973.v0fa_8c0dea_f9f sshd:3.330.vc866a_8389b_58 stashNotifier:1.507.vb_7300a_1a_a_d10 structs:338.v848422169819 -subversion:1269.v53185011cd9f -swarm:3.46 +subversion:1275.va_7b_014f3fc2c +swarm:3.47 throttle-concurrents:2.14 timestamper:1.27 token-macro:400.v35420b_922dcb_ @@ -217,16 +217,16 @@ variant:60.v7290fc0eb_b_cd whitesource:21.1.2 windows-slaves:1.8.1 workflow-aggregator:600.vb_57cdd26fdd7 -workflow-api:1322.v857eeeea_9902 +workflow-api:1336.vee415d95c521 workflow-basic-steps:1058.vcb_fc1e3a_21a_9 workflow-cps-global-lib:612.v55f2f80781ef -workflow-cps:3922.va_f73b_7c4246b_ -workflow-durable-task-step:1364.v2fd76fb_6fd41 +workflow-cps:3969.vdc9d3a_efcc6a_ +workflow-durable-task-step:1371.vb_7cec8f3b_95e workflow-job:1436.vfa_244484591f workflow-multibranch:795.ve0cb_1f45ca_9a_ workflow-remote-loader:1.6 workflow-scm-step:427.v4ca_6512e7df1 workflow-step-api:678.v3ee58b_469476 -workflow-support:920.v59f71ce16f04 -ws-cleanup:0.46 +workflow-support:926.v9f4f9b_b_98c19 +ws-cleanup:0.47 xvfb:1.2 diff --git a/tests/docker-compose-consul.yml b/tests/docker-compose-consul.yml index 12d0809..d6666ac 100644 --- a/tests/docker-compose-consul.yml +++ b/tests/docker-compose-consul.yml @@ -1,6 +1,7 @@ services: consul: image: hashicorp/consul + platform: linux/amd64 ports: - "8400:8400" - "8500:8500" diff --git a/tests/docker-compose-simple.yml b/tests/docker-compose-simple.yml index 4ff3ffc..22e8aa5 100644 --- a/tests/docker-compose-simple.yml +++ b/tests/docker-compose-simple.yml @@ -1,6 +1,7 @@ services: jenkins: image: odavid/my-bloody-jenkins + platform: linux/amd64 ports: - "8080:8080" - "50000:50000"