Merge branch 'master' into ENGINE-903

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -8,12 +8,12 @@ body:
     attributes:
       value: |
         Thank you for taking the time to report a bug!
-        If this is a security issue please report it to the [Docker Security team](mailto:[email protected]).
+        If this is a security issue report it to the [Docker Security team](mailto:[email protected]).
   - type: textarea
     id: description
     attributes:
       label: Description
-      description: Please give a clear and concise description of the bug
+      description: Give a clear and concise description of the bug
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/config.yml

@@ -4,7 +4,7 @@ contact_links:
     about: "Read guidelines and tips about contributing to Docker."
     url: "https://github.com/docker/cli/blob/master/CONTRIBUTING.md"
   - name: "Security and Vulnerabilities"
-    about: "Please report any security issues or vulnerabilities responsibly to the Docker security team. Please do not use the public issue tracker."
+    about: "Report any security issues or vulnerabilities responsibly to the Docker security team. Do not use the public issue tracker."
     url: "https://github.com/moby/moby/security/policy"
   - name: "General Support"
     about: "Get the help you need to build, share, and run your Docker applications"

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,5 @@
 <!--
-Please make sure you've read and understood our contributing guidelines;
+Make sure you've read and understood our contributing guidelines;
 https://github.com/docker/cli/blob/master/CONTRIBUTING.md
 
 ** Make sure all your commits include a signature generated with `git commit -s` **
@@ -10,7 +10,7 @@ guide https://docs.docker.com/opensource/code/
 If this is a bug fix, make sure your description includes "fixes #xxxx", or
 "closes #xxxx"
 
-Please provide the following information:
+Provide the following information:
 -->
 
 **- What I did**

.github/workflows/build.yml

@@ -19,7 +19,7 @@ on:
 
 jobs:
   prepare:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       matrix: ${{ steps.platforms.outputs.matrix }}
     steps:
@@ -37,7 +37,7 @@ jobs:
           echo ${{ steps.platforms.outputs.matrix }}
 
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs:
       - prepare
     strategy:
@@ -61,7 +61,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
       -
         name: Build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           targets: ${{ matrix.target }}
           set: |
@@ -90,7 +90,7 @@ jobs:
           if-no-files-found: error
 
   bin-image:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: ${{ github.event_name != 'pull_request' && github.repository == 'docker/cli' }}
     steps:
       -
@@ -122,7 +122,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_CLIBIN_TOKEN }}
       -
         name: Build and push image
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           files: |
             ./docker-bake.hcl
@@ -134,7 +134,7 @@ jobs:
             *.cache-to=type=gha,scope=bin-image,mode=max
 
   prepare-plugins:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       matrix: ${{ steps.platforms.outputs.matrix }}
     steps:
@@ -152,7 +152,7 @@ jobs:
           echo ${{ steps.platforms.outputs.matrix }}
 
   plugins:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs:
       - prepare-plugins
     strategy:
@@ -168,7 +168,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
       -
         name: Build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           targets: plugins-cross
           set: |

.github/workflows/e2e.yml

@@ -16,7 +16,7 @@ on:
 
 jobs:
   e2e:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -28,6 +28,7 @@ jobs:
           - alpine
           - debian
         engine-version:
+          - 27-rc # testing
           - 26.1  # latest
           - 25.0  # latest - 1
           - 23.0  # mirantis lts
@@ -40,8 +41,15 @@ jobs:
       -
         name: Update daemon.json
         run: |
-          sudo jq '.experimental = true' < /etc/docker/daemon.json > /tmp/docker.json
-          sudo mv /tmp/docker.json /etc/docker/daemon.json
+          if [ ! -f /etc/docker/daemon.json ]; then
+            # ubuntu 24.04 runners no longer have a default daemon.json present
+            sudo mkdir -p /etc/docker/
+            echo '{"experimental": true}' | sudo tee /etc/docker/daemon.json
+          else
+            # but if there is one; let's patch it to keep other options that may be set.
+            sudo jq '.experimental = true' < /etc/docker/daemon.json > /tmp/docker.json
+            sudo mv /tmp/docker.json /etc/docker/daemon.json
+          fi
           sudo cat /etc/docker/daemon.json
           sudo service docker restart
           docker version

.github/workflows/test.yml

@@ -16,7 +16,7 @@ on:
 
 jobs:
   ctn:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       -
         name: Checkout
@@ -26,7 +26,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
       -
         name: Test
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           targets: test-coverage
       -

.github/workflows/validate-pr.yml

@@ -32,7 +32,7 @@ jobs:
           desc=$(echo "$block" |  awk NF)
 
           if [ -z "$desc" ]; then
-            echo "::error::Changelog section is empty. Please provide a description for the changelog."
+            echo "::error::Changelog section is empty. Provide a description for the changelog."
             exit 1
           fi
 

.github/workflows/validate.yml

@@ -16,7 +16,7 @@ on:
 
 jobs:
   validate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -31,13 +31,13 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Run
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           targets: ${{ matrix.target }}
 
   # check that the generated Markdown and the checked-in files match
   validate-md:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       -
         name: Checkout
@@ -57,7 +57,7 @@ jobs:
           fi
 
   validate-make:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:

.gitignore

@@ -1,5 +1,5 @@
 # if you want to ignore files created by your editor/tools,
-# please consider a global .gitignore https://help.github.com/articles/ignoring-files
+# consider a global .gitignore https://help.github.com/articles/ignoring-files
 *.exe
 *.exe~
 *.orig

.golangci.yml

@@ -44,9 +44,6 @@ linters:
 
 run:
   timeout: 5m
-  skip-files:
-    - cli/compose/schema/bindata.go
-    - .*generated.*
 
 linters-settings:
   depguard:
@@ -58,7 +55,8 @@ linters-settings:
   gocyclo:
     min-complexity: 16
   govet:
-    check-shadowing: true
+    enable:
+      - shadow
     settings:
       shadow:
         strict: true
@@ -94,6 +92,10 @@ issues:
   exclude:
     - parameter .* always receives
 
+  exclude-files:
+    - cli/compose/schema/bindata.go
+    - .*generated.*
+
   exclude-rules:
     # We prefer to use an "exclude-list" so that new "default" exclusions are not
     # automatically inherited. We can decide whether or not to follow upstream

.mailmap

@@ -22,7 +22,10 @@ Akihiro Matsushima <[email protected]> <[email protected]>
 Akihiro Suda <[email protected]>
 Akihiro Suda <[email protected]> <[email protected]>
 Akihiro Suda <[email protected]> <[email protected]>
+Alano Terblanche <[email protected]>
+Alano Terblanche <[email protected]> <[email protected]>
 Albin Kerouanton <[email protected]>
+Albin Kerouanton <[email protected]> <[email protected]>
 Albin Kerouanton <[email protected]> <[email protected]>
 Aleksa Sarai <[email protected]>
 Aleksa Sarai <[email protected]> <[email protected]>
@@ -88,6 +91,7 @@ Brian Goff <[email protected]>
 Brian Goff <[email protected]> <[email protected]>
 Brian Goff <[email protected]> <[email protected]>
 Brian Tracy <[email protected]>
+Calvin Liu <[email protected]>
 Carlos de Paula <[email protected]>
 Chad Faragher <[email protected]>
 Chander Govindarajan <[email protected]>
@@ -254,6 +258,7 @@ Jessica Frazelle <[email protected]> <[email protected]>
 Jessica Frazelle <[email protected]> <[email protected]>
 Jessica Frazelle <[email protected]> <[email protected]>
 Jessica Frazelle <[email protected]> <[email protected]>
+Jim Chen <[email protected]>
 Jim Galasyn <[email protected]>
 Jiuyue Ma <[email protected]>
 Joey Geiger <[email protected]>
@@ -269,6 +274,8 @@ John Howard <[email protected]> <[email protected]>
 John Howard <[email protected]> <[email protected]>
 John Howard <[email protected]> <[email protected]>
 John Stephens <[email protected]> <[email protected]>
+Jonathan A. Sternberg <[email protected]>
+Jonathan A. Sternberg <[email protected]> <[email protected]>
 Jordan Arentsen <[email protected]>
 Jordan Jennings <[email protected]> <[email protected]>
 Jorit Kleine-Möllhoff <[email protected]> <[email protected]>
@@ -444,6 +451,7 @@ Roch Feuillade <[email protected]>
 Roch Feuillade <[email protected]> <[email protected]>
 Roman Dudin <[email protected]> <[email protected]>
 Ross Boucher <[email protected]>
+Rui JingAn <[email protected]>
 Runshen Zhu <[email protected]>
 Ryan Stelly <[email protected]>
 Sakeven Jiang <[email protected]>
@@ -524,6 +532,8 @@ Tim Bart <[email protected]>
 Tim Bosse <[email protected]> <[email protected]>
 Tim Ruffles <[email protected]> <[email protected]>
 Tim Terhorst <[email protected]>
+Tim Welsh <[email protected]>
+Tim Welsh <[email protected]> <[email protected]>
 Tim Zju <[email protected]>
 Timothy Hobbs <[email protected]>
 Toli Kuznets <[email protected]>