Merge pull request #2648 from yurake/dependabot/docker/kubernetes/monitoring/jenkins/jenkins/jenkins-2.370-alpine

yurake · web-flow · commit 702c630c5869 · 2022-09-28T23:20:10.000+09:00
Bump jenkins/jenkins from 2.349-alpine to 2.370-alpine in /kubernetes/monitoring/jenkins
diff --git a/.github/workflows/minikube-openliberty-ci.yml b/.github/workflows/minikube-openliberty-ci.yml
@@ -32,8 +32,8 @@ jobs:
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
         with:
-          minikube-version: 1.25.2
-          k8s-version: 1.24.0
+          minikube-version: 1.27.0
+          k8s-version: 1.25.2
       - name: minikube settings
         run: |
           sudo apt install conntrack
diff --git a/.github/workflows/minikube-quarkus-ci.yml b/.github/workflows/minikube-quarkus-ci.yml
@@ -16,8 +16,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        minikube: [1.25.1, 1.25.2]
-        kubernetes: [1.23.5, 1.24.0]
+        minikube: [1.25.2, 1.27.0]
+        kubernetes: [1.25.1, 1.25.2]
       fail-fast: false
     steps:
       - name: checkout
diff --git a/.github/workflows/minikube-security-ci.yml b/.github/workflows/minikube-security-ci.yml
@@ -20,8 +20,8 @@ jobs:
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
         with:
-          minikube-version: 1.25.2
-          k8s-version: 1.24.0
+          minikube-version: 1.27.0
+          k8s-version: 1.25.2
       - name: minikube settings
         run: |
           sudo apt install conntrack
diff --git a/.github/workflows/minikube-spring-ci.yml b/.github/workflows/minikube-spring-ci.yml
@@ -32,8 +32,8 @@ jobs:
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
         with:
-          minikube-version: 1.25.2
-          k8s-version: 1.24.0
+          minikube-version: 1.27.0
+          k8s-version: 1.25.2
       - name: minikube settings
         run: |
           sudo apt install conntrack
diff --git a/.github/workflows/minikube-stress-ci.yml b/.github/workflows/minikube-stress-ci.yml
@@ -24,8 +24,8 @@ jobs:
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
         with:
-          minikube-version: 1.25.2
-          k8s-version: 1.24.0
+          minikube-version: 1.27.0
+          k8s-version: 1.25.2
       - name: minikube settings
         run: |
           sudo apt install conntrack
diff --git a/.github/workflows/minikube-yaml-ci.yml b/.github/workflows/minikube-yaml-ci.yml
@@ -23,8 +23,8 @@ jobs:
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
         with:
-          minikube-version: 1.25.2
-          k8s-version: 1.24.0
+          minikube-version: 1.27.0
+          k8s-version: 1.25.2
       - name: minikube settings
         run: |
           sudo apt install conntrack
diff --git a/kubernetes/monitoring/jenkins/Dockerfile b/kubernetes/monitoring/jenkins/Dockerfile
@@ -1,17 +1,17 @@
-FROM jenkins/jenkins:2.349-alpine
+FROM jenkins/jenkins:2.370-alpine
 ARG BUILD_DATE
 ARG VCS_REF
 
 # renovate: datasource=repology depName=alpine_3_12/tzdata versioning=loose
-ENV TZDATA_VERSION="2022a-r0"
+ENV TZDATA_VERSION="2022c-r0"
 # renovate: datasource=repology depName=alpine_3_12/gcc versioning=loose
-ENV GCC_VERSION="10.3.1_git20211027-r0"
+ENV GCC_VERSION="11.2.1_git20220219-r2"
 # renovate: datasource=repology depName=alpine_3_12/docker versioning=loose
-ENV DOCKER_VERSION="20.10.16-r0"
+ENV DOCKER_VERSION="20.10.18-r0"
 # renovate: datasource=repology depName=alpine_3_12/python3 versioning=loose
-ENV PYTHON3_VERSION="3.9.7-r4"
+ENV PYTHON3_VERSION="3.10.5-r0"
 # renovate: datasource=repology depName=alpine_3_12/gnuplot versioning=loose
-ENV GUNPLOT_VERSION="5.4.2-r0"
+ENV GUNPLOT_VERSION="5.4.3-r0"
 
 LABEL org.label-schema.build-date=$BUILD_DATE org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url="https://github.com/yurake/k8s-3tier-webapp"
@@ -40,7 +40,7 @@ ENV JAVA_OPTS -Duser.timezone=Asia/Tokyo
 
 # Install default plugins
 COPY init/plugins.txt /usr/share/jenkins/ref/plugins.txt
-RUN /usr/local/bin/install-plugins.sh < /usr/share/jenkins/ref/plugins.txt
+RUN jenkins-plugin-cli --plugin-file /usr/share/jenkins/ref/plugins.txt
 
 # Install default jobs
 COPY init/jobs /usr/share/jenkins/ref/jobs
diff --git a/kubernetes/monitoring/jenkins/init/plugins.txt b/kubernetes/monitoring/jenkins/init/plugins.txt
@@ -1,95 +1,107 @@
+ace-editor
+ant
+antisamy-markup-formatter
+apache-httpcomponents-client-4-api
 authentication-tokens
-git
-workflow-scm-step
-ssh-credentials
-docker-commons
-workflow-durable-task-step
-pipeline-github-lib
-docker-workflow
-ldap
-junit
-extended-read-permission
-popper2-api
-trilead-api
-mapdb-api
-credentials
-credentials-binding
-script-security
-google-oauth-plugin
-gradle
-ssh-slaves
-github-branch-source
-resource-disposer
+bootstrap4-api
 bootstrap5-api
-oauth-credentials
-font-awesome-api
+bouncycastle-api
+branch-api
 caffeine-api
-token-macro
 checks-api
-handlebars
-pipeline-stage-view
-kubernetes-credentials
-pipeline-model-definition
-workflow-support
-okhttp-api
-scm-api
-durable-task
-mailer
 cloudbees-disk-usage-simple
-kubernetes
-jquery3-api
-pipeline-graph-analysis
+cloudbees-folder
+command-launcher
+credentials-binding
+credentials
+display-url-api
+docker-commons
+docker-workflow
+durable-task
 echarts-api
-jackson2-api
-structs
-pipeline-input-step
-workflow-job
 email-ext
-antisamy-markup-formatter
-pipeline-model-extensions
+extended-read-permission
+font-awesome-api
 git-client
-workflow-cps-global-lib
-kubernetes-client-api
-pipeline-milestone-step
-matrix-auth
-branch-api
-prometheus
-apache-httpcomponents-client-4-api
-jquery-detached
-ant
-workflow-basic-steps
-pipeline-build-step
-snakeyaml-api
-bootstrap4-api
-command-launcher
-workflow-aggregator
-workflow-multibranch
-momentjs
 git-server
-timestamper
-sshd
+git
 github-api
-lockable-resources
+github-branch-source
+github
+google-oauth-plugin
+gradle
+jaxb
+handlebars
+jackson2-api
+javax-activation-api
+javax-mail-api
 jdk-tool
-workflow-step-api
+jjwt-api
+jquery-detached
+jquery3-api
+jsch
+junit
+kubernetes-client-api
+kubernetes-credentials
+kubernetes
+ldap
+lockable-resources
+mailer
+mapdb-api
+matrix-auth
 matrix-project
-display-url-api
-workflow-cps
-plugin-util-api
-plain-credentials
-pipeline-model-api
+metrics
+momentjs
+oauth-credentials
+okhttp-api
 pam-auth
+pipeline-build-step
+pipeline-github-lib
+pipeline-graph-analysis
+pipeline-groovy-lib
+pipeline-input-step
+pipeline-milestone-step
+pipeline-model-api
+pipeline-model-definition
+pipeline-model-extensions
 pipeline-rest-api
-metrics
-github
-ws-cleanup
+pipeline-stage-step
 pipeline-stage-tags-metadata
-jjwt-api
-cloudbees-folder
-ace-editor
-bouncycastle-api
-workflow-api
-jsch
+pipeline-stage-view
+plain-credentials
+plugin-util-api
 popper-api
-pipeline-stage-step
+popper2-api
+prometheus
+resource-disposer
+scm-api
+script-security
+snakeyaml-api
+ssh-credentials
+ssh-slaves
+sshd
+structs
+timestamper
+token-macro
+trilead-api
 variant
+workflow-aggregator
+workflow-api
+workflow-basic-steps
+workflow-cps-global-lib
+workflow-cps
+workflow-durable-task-step
+workflow-job
+workflow-multibranch
+workflow-support
+workflow-scm-step
+ws-cleanup
+ionicons-api
+jakarta-activation-api
+workflow-step-api
+docker-plugin
+docker-java-api
+jakarta-mail-api
+mina-sshd-api-common
+mina-sshd-api-core
+rebuild
diff --git a/kubernetes/monitoring/test/ab/Dockerfile b/kubernetes/monitoring/test/ab/Dockerfile
@@ -3,7 +3,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 
 # renovate: datasource=repology depName=alpine_3_12/apache2-utils versioning=loose
-ENV APACHE2_UTILS_VERSION="2.4.53-r0"
+ENV APACHE2_UTILS_VERSION="2.4.54-r0"
 
 LABEL org.label-schema.build-date=$BUILD_DATE org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url="https://github.com/yurake/k8s-3tier-webapp"
diff --git a/kubernetes/rabbitmq/Dockerfile b/kubernetes/rabbitmq/Dockerfile
@@ -3,7 +3,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 
 # renovate: datasource=repology depName=alpine_3_12/tzdata versioning=loose
-ENV TZDATA_VERSION="2022a-r0"
+ENV TZDATA_VERSION="2022c-r0"
 
 LABEL org.label-schema.build-date=$BUILD_DATE org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url="https://github.com/yurake/k8s-3tier-webapp"
