Merge branch 'master' into include-unix-domain-sockets

jenkins-infra · Dec 14, 2024 · 1f9ab63 · 1f9ab63
2 parents 8f91ef4 + eb27524
commit 1f9ab63
Show file tree

Hide file tree

Showing 10 changed files with 137 additions and 29 deletions.
diff --git a/Gemfile b/Gemfile
@@ -9,6 +9,7 @@ gem 'webrick', '~> 1.8.1'
 
 gem 'sassc'
 gem 'rouge'
+gem 'iconv'
 
 # Support for various template engines we use
 gem 'haml', '~> 5.2.0'
@@ -17,9 +18,13 @@ gem 'kramdown', '~> 2.5.0'
 
 # Gems necessary for running scripts/fetch-external-resources
 group :fetcher do
-  gem 'faraday', '~> 2.9.0'
+  gem 'faraday', '~> 2.12.0'
   gem 'faraday-follow_redirects', '~> 0.3.0'
   gem 'rubyzip', '~> 2.3.2'
+  # dependencies for faraday 2.12.1
+  gem 'faraday-net_http', '~> 3.4'
+  gem 'json', '~> 2.9'
+  gem 'logger', '~> 1.6', '>= 1.6.3'
 end
 
 gem "concurrent-ruby", "~> 1.1"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -33,12 +33,14 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    faraday (2.9.2)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.12.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.1.0)
-      net-http
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
     ffi (1.13.1)
     formatador (1.1.0)
     git (1.18.0)
@@ -66,13 +68,16 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http_parser.rb (0.8.0)
+    iconv (1.1.0)
+    json (2.9.0)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     liquid (5.5.1)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
+    logger (1.6.3)
     logging (2.3.1)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
@@ -84,7 +89,7 @@ GEM
     multi_json (1.15.0)
     naturally (2.2.1)
     nenv (0.3.0)
-    net-http (0.4.1)
+    net-http (0.6.0)
       uri
     netrc (0.11.0)
     notiffany (0.1.3)
@@ -125,7 +130,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    uri (0.13.0)
+    uri (0.13.1)
     webrick (1.8.2)
 
 PLATFORMS
@@ -137,11 +142,15 @@ DEPENDENCIES
   awestruct (~> 0.6.7)
   colorize
   concurrent-ruby (~> 1.1)
-  faraday (~> 2.9.0)
+  faraday (~> 2.12.0)
   faraday-follow_redirects (~> 0.3.0)
+  faraday-net_http (~> 3.4)
   haml (~> 5.2.0)
+  iconv
+  json (~> 2.9)
   kramdown (~> 2.5.0)
   liquid (~> 5.5.0)
+  logger (~> 1.6, >= 1.6.3)
   naturally (~> 2.2.1)
   rouge
   rss

diff --git a/STYLEGUIDE.adoc b/STYLEGUIDE.adoc
@@ -115,7 +115,7 @@ node {
 
 // Declarative //
 pipeline {
-    agent { docker { image 'node:22.12.0-alpine3.20' } }
+    agent { docker { image 'node:22.12.0-alpine3.21' } }
     stages {
 	stage('Build') {
 	    sh 'npm install'

diff --git a/content/_data/changelogs/weekly.yml b/content/_data/changelogs/weekly.yml
@@ -25420,6 +25420,87 @@
   # pull: 10018 (PR title: Update dependency stylelint to v16.11.0)
   # pull: 10020 (PR title: Update eslint monorepo to v9.16.0)
 
+  - version: '2.489'
+    date: 2024-12-09
+    changes:
+      - type: rfe
+        category: rfe
+        pull: 7569
+        authors:
+          - janfaracik
+          - timja
+          - NotMyFault
+        pr_title: Overhaul search with a Command Palette
+        message: |-
+          Add Command Palette as a replacement for the search bar.
+      - type: rfe
+        category: rfe
+        pull: 9995
+        issue: 74858
+        authors:
+          - tejasdrolia
+        pr_title: "[JENKINS-74858]  Added validation for Password length in FIPS mode"
+        message: |-
+          Added password validation to ensure that existing users cannot create a password of less than 14 characters in length when in FIPS mode.
+      - type: bug
+        category: regression
+        pull: 7078
+        issue: 69549
+        authors:
+          - frankie139506
+          - NotMyFault
+          - timja
+        pr_title: "[JENKINS-69549] Margins for headers and paragraphs make descriptions
+          …"
+        message: |-
+          Reduce spacing in help files.
+      - type: bug
+        category: regression
+        pull: 10022
+        authors:
+          - daniel-beck
+        pr_title: Revert "Fixed spotbugs `PATH_TRAVERSAL_IN` issue in `FileBoolean`"
+        message: |-
+          Restore the original behavior of <code>FileBoolean(Class, String)</code> (regression in 2.488).
+      - type: rfe
+        category: developer
+        pull: 9958
+        issue: 73355
+        authors:
+          - jonesbusy
+        pr_title: JENKINS-73355 Removal of commons-compress from core
+        message: |-
+          Developer: The <code>commons-compress</code> library is no longer provided by Jenkins core, use the <a href="https://plugins.jenkins.io/commons-compress-api/">Commons Compress API plugin</a> instead.
+      - type: rfe
+        category: developer
+        pull: 10019
+        authors:
+          - slide
+        pr_title: Allow subclasses of UpdateSite to call updateData
+        message: |-
+          Developer: Allow <code>UpdateSite</code> subclasses to call <code>updateData</code> method in <code>UpdateSite</code> to write out JSON.
+      - type: rfe
+        category: developer
+        pull: 9959
+        issue: 37241
+        authors:
+          - timja
+        pr_title: "[JENKINS-37241] Support for query parameters in autocomplete"
+        message: |-
+          Developer: Add support for <code>@QueryParameter</code> to the autocomplete component.
+          Change autocomplete component to use <code>POST</code> for sending requests.
+  # pull: 8435 (PR title: Update appearance of keyboard shortcut tooltips)
+  # pull: 10021 (PR title: Update dependency org.jenkins-ci.main:jenkins-test-harness to v2364)
+  # pull: 10027 (PR title: Update dependency globals to v15.13.0)
+  # pull: 10029 (PR title: Update dependency org.jenkins-ci.plugins:junit to v1311)
+  # pull: 10030 (PR title: Update dependency sass to v1.82.0)
+  # pull: 10031 (PR title: Update dependency webpack to v5.97.0)
+  # pull: 10033 (PR title: Update dependency prettier to v3.4.2)
+  # pull: 10034 (PR title: Update dependency sass-loader to v16.0.4)
+  # pull: 10035 (PR title: Fix attributes leaking in the toggle switch component)
+  # pull: 10037 (PR title: Update dependency webpack to v5.97.1)
+  # pull: 10038 (PR title: Update dependency @babel/cli to v7.26.4)
+
 # DO NOT EDIT THIS FILE DIRECTLY ON GITHUB IF YOU HAVE COMMIT ACCESS
 # ALL CHANGES MUST GO THROUGH PULL REQUESTS
 # MALFORMED FILE CONTENTS WILL BREAK THE SITE BUILD
diff --git a/content/_data/donors/donors.json b/content/_data/donors/donors.json
@@ -1,4 +1,17 @@
 [
+  {
+    "type": "donation",
+    "id": "97b35853-f453-45ce-92df-b7b4562d4144",
+    "name": "Linux Foundation",
+    "avatarUrl": "https://s.gravatar.com/avatar/ac55c2bf8e6b064ddb2e670d37b68c72?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Flf.png",
+    "category": "Donation",
+    "createdOn": "2024-12-11T04:50:07Z",
+    "organization": {
+      "organizationId": "1c7953a6-6bed-4eb2-9a54-e03f68ee87cc",
+      "name": "Google",
+      "avatarUrl": "https://lff-prod-uploads.s3.amazonaws.com/2dd1bf9b-8bc7-46a5-9fb5-fafa9b8aa35b"
+    }
+  },
   {
     "type": "donation",
     "id": "95cddf10-ba0c-4526-8991-786f05d424dd",
@@ -159,13 +172,5 @@
       "name": "Google",
       "avatarUrl": "https://lff-prod-uploads.s3.amazonaws.com/2dd1bf9b-8bc7-46a5-9fb5-fafa9b8aa35b"
     }
-  },
-  {
-    "type": "donation",
-    "id": "7a31f6df-ff35-4364-92df-ca2ffc7c1fe7",
-    "name": "Anup Jaltade",
-    "avatarUrl": "https://platform-logos-myprofile-api-prod.s3.us-east-2.amazonaws.com/fflier.1650291301660",
-    "category": "mentorship",
-    "createdOn": "2022-07-14T02:34:38Z"
   }
 ]
diff --git a/content/doc/book/managing/groovy-hook-scripts.adoc b/content/doc/book/managing/groovy-hook-scripts.adoc
@@ -51,6 +51,9 @@ Jenkins.instance.doQuietDown();
 Output is logged to the Jenkins log file. For Debian based users, this
 is /var/log/jenkins/jenkins.log
 
+NOTE: If you are using the Jenkins Docker image, `$JENKINS_HOME/init.groovy.d/` does not exist.
+Instead, you should place the Groovy script files in `/usr/share/jenkins/ref/init.groovy.d/`, as this directory is copied when the Docker container starts.
+For more details, refer to the link:https://github.com/jenkinsci/docker?tab=readme-ov-file#installing-more-tools[Installing more tools documentation].
 
 == Boot failure hook
 When Jenkins encounters a fatal problem during boot, it'll invoke

diff --git a/content/doc/book/pipeline/docker.adoc b/content/doc/book/pipeline/docker.adoc
@@ -32,7 +32,7 @@ Any tool that can be link:https://hub.docker.com[packaged in a Docker container]
 // Declarative //
 pipeline {
     agent {
-        docker { image 'node:22.12.0-alpine3.20' }
+        docker { image 'node:22.12.0-alpine3.21' }
     }
     stages {
         stage('Test') {
@@ -45,7 +45,7 @@ pipeline {
 // Script //
 node {
     /* Requires the Docker Pipeline plugin to be installed */
-    docker.image('node:22.12.0-alpine3.20').inside {
+    docker.image('node:22.12.0-alpine3.21').inside {
         stage('Test') {
             sh 'node --eval "console.log(process.platform,process.env.CI)"'
         }
@@ -68,6 +68,10 @@ linux true
 [Pipeline] }
 ----
 
+=== Additional arguments
+
+Additional arguments, such as the `registryUrl`, are described in the link:../syntax/#agent-parameters[agent parameters] syntax documentation.
+
 === Workspace synchronization
 
 If it is important to keep the workspace synchronized with other stages, use `reuseNode true`.
@@ -173,7 +177,7 @@ pipeline {
         }
         stage('Front-end') {
             agent {
-                docker { image 'node:22.12.0-alpine3.20' }
+                docker { image 'node:22.12.0-alpine3.21' }
             }
             steps {
                 sh 'node --version'
@@ -192,7 +196,7 @@ node {
     }
 
     stage('Front-end') {
-        docker.image('node:22.12.0-alpine3.20').inside {
+        docker.image('node:22.12.0-alpine3.21').inside {
             sh 'node --version'
         }
     }
@@ -210,7 +214,7 @@ Reusing an example from above, with a more custom `Dockerfile`:
 .Dockerfile
 [source]
 ----
-FROM node:22.12.0-alpine3.20
+FROM node:22.12.0-alpine3.21
 
 RUN apk add -U subversion
 ----

diff --git a/content/doc/pipeline/tour/agents.adoc b/content/doc/pipeline/tour/agents.adoc
@@ -48,7 +48,7 @@ link:/doc/book/pipeline/syntax#agent[syntax reference].
 // Declarative //
 pipeline {
     agent {
-        docker { image 'node:22.12.0-alpine3.20' }
+        docker { image 'node:22.12.0-alpine3.21' }
     }
     stages {
         stage('Test') {
@@ -61,7 +61,7 @@ pipeline {
 // Script //
 node {
     /* Requires the Docker Pipeline plugin to be installed */
-    docker.image('node:22.12.0-alpine3.20').inside {
+    docker.image('node:22.12.0-alpine3.21').inside {
         stage('Test') {
             sh 'node --eval "console.log(process.arch,process.platform)"'
         }

diff --git a/content/doc/pipeline/tour/hello-world.adoc b/content/doc/pipeline/tour/hello-world.adoc
@@ -83,7 +83,7 @@ node {
 // Declarative //
 /* Requires the Docker Pipeline plugin */
 pipeline {
-    agent { docker { image 'node:22.12.0-alpine3.20' } }
+    agent { docker { image 'node:22.12.0-alpine3.21' } }
     stages {
         stage('build') {
             steps {
@@ -96,7 +96,7 @@ pipeline {
 /* Requires the Docker Pipeline plugin */
 node {
     stage('Build') {
-        docker.image('node:22.12.0-alpine3.20').inside {
+        docker.image('node:22.12.0-alpine3.21').inside {
             sh 'node --version'
         }
     }
@@ -137,7 +137,7 @@ node {
 // Declarative //
 /* Requires the Docker Pipeline plugin */
 pipeline {
-    agent { docker { image 'python:3.13.0-alpine3.20' } }
+    agent { docker { image 'python:3.13.1-alpine3.21' } }
     stages {
         stage('build') {
             steps {
@@ -150,7 +150,7 @@ pipeline {
 /* Requires the Docker Pipeline plugin */
 node {
     stage('Build') {
-        docker.image('python:3.13.0-alpine3.20').inside {
+        docker.image('python:3.13.1-alpine3.21').inside {
             sh 'python --version'
         }
     }
@@ -164,7 +164,7 @@ node {
 // Declarative //
 /* Requires the Docker Pipeline plugin */
 pipeline {
-    agent { docker { image 'php:8.4.1-alpine3.20' } }
+    agent { docker { image 'php:8.4.1-alpine3.21' } }
     stages {
         stage('build') {
             steps {

diff --git a/...ts/gsoc/2025/project-ideas/complete-alternative-jenkins-io-build-retooling.adoc b/...ts/gsoc/2025/project-ideas/complete-alternative-jenkins-io-build-retooling.adoc
@@ -15,6 +15,7 @@ skills:
 mentors:
 - "krisstern"
 - "gounthar"
+- "kmartens27"
 links:
   meetings: /projects/gsoc/#office-hours
 ---