Skip to content

Commit b0cd429

Browse files
hernandanielghernandanielg
committed
Merge branch 'docker:master' into fix-swarm-init-help
Signed-off-by: Hernan Garcia <hernandanielg@gmail.com>
2 parents 2e01bda + 118d6ba commit b0cd429

2,087 files changed

Lines changed: 146035 additions & 31506 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@ Please provide the following information:
2222
**- Description for the changelog**
2323
<!--
2424
Write a short (one line) summary that describes the changes in this
25-
pull request for inclusion in the changelog:
25+
pull request for inclusion in the changelog.
26+
It must be placed inside the below triple backticks section:
2627
-->
28+
```markdown changelog
2729

2830

31+
```
32+
2933
**- A picture of a cute animal (not mandatory but encouraged)**
3034

‎.github/workflows/build.yml‎

Lines changed: 59 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ concurrency:
44
group: ${{ github.workflow }}-${{ github.ref }}
55
cancel-in-progress: true
66

7+
env:
8+
VERSION: ${{ github.ref }}
9+
710
on:
811
workflow_dispatch:
912
push:
@@ -16,13 +19,13 @@ on:
1619

1720
jobs:
1821
prepare:
19-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-22.04
2023
outputs:
2124
matrix: ${{ steps.platforms.outputs.matrix }}
2225
steps:
2326
-
2427
name: Checkout
25-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2629
-
2730
name: Create matrix
2831
id: platforms
@@ -34,7 +37,7 @@ jobs:
3437
echo ${{ steps.platforms.outputs.matrix }}
3538
3639
build:
37-
runs-on: ubuntu-20.04
40+
runs-on: ubuntu-22.04
3841
needs:
3942
- prepare
4043
strategy:
@@ -50,15 +53,15 @@ jobs:
5053
steps:
5154
-
5255
name: Checkout
53-
uses: actions/checkout@v3
56+
uses: actions/checkout@v4
5457
with:
5558
fetch-depth: 0
5659
-
5760
name: Set up Docker Buildx
58-
uses: docker/setup-buildx-action@v2
61+
uses: docker/setup-buildx-action@v3
5962
-
6063
name: Build
61-
uses: docker/bake-action@v3
64+
uses: docker/bake-action@v4
6265
with:
6366
targets: ${{ matrix.target }}
6467
set: |
@@ -86,14 +89,58 @@ jobs:
8689
path: /tmp/out/*
8790
if-no-files-found: error
8891

92+
bin-image:
93+
runs-on: ubuntu-22.04
94+
if: ${{ github.event_name != 'pull_request' && github.repository == 'docker/cli' }}
95+
steps:
96+
-
97+
name: Checkout
98+
uses: actions/checkout@v4
99+
-
100+
name: Set up QEMU
101+
uses: docker/setup-qemu-action@v3
102+
-
103+
name: Set up Docker Buildx
104+
uses: docker/setup-buildx-action@v3
105+
-
106+
name: Docker meta
107+
id: meta
108+
uses: docker/metadata-action@v5
109+
with:
110+
images: dockereng/cli-bin
111+
tags: |
112+
type=semver,pattern={{version}}
113+
type=ref,event=branch
114+
type=ref,event=pr
115+
type=sha
116+
-
117+
name: Login to DockerHub
118+
if: github.event_name != 'pull_request'
119+
uses: docker/login-action@v3
120+
with:
121+
username: ${{ secrets.DOCKERHUB_CLIBIN_USERNAME }}
122+
password: ${{ secrets.DOCKERHUB_CLIBIN_TOKEN }}
123+
-
124+
name: Build and push image
125+
uses: docker/bake-action@v4
126+
with:
127+
files: |
128+
./docker-bake.hcl
129+
${{ steps.meta.outputs.bake-file }}
130+
targets: bin-image-cross
131+
push: ${{ github.event_name != 'pull_request' }}
132+
set: |
133+
*.cache-from=type=gha,scope=bin-image
134+
*.cache-to=type=gha,scope=bin-image,mode=max
135+
89136
prepare-plugins:
90-
runs-on: ubuntu-20.04
137+
runs-on: ubuntu-22.04
91138
outputs:
92139
matrix: ${{ steps.platforms.outputs.matrix }}
93140
steps:
94141
-
95142
name: Checkout
96-
uses: actions/checkout@v3
143+
uses: actions/checkout@v4
97144
-
98145
name: Create matrix
99146
id: platforms
@@ -105,7 +152,7 @@ jobs:
105152
echo ${{ steps.platforms.outputs.matrix }}
106153
107154
plugins:
108-
runs-on: ubuntu-20.04
155+
runs-on: ubuntu-22.04
109156
needs:
110157
- prepare-plugins
111158
strategy:
@@ -115,13 +162,13 @@ jobs:
115162
steps:
116163
-
117164
name: Checkout
118-
uses: actions/checkout@v3
165+
uses: actions/checkout@v4
119166
-
120167
name: Set up Docker Buildx
121-
uses: docker/setup-buildx-action@v2
168+
uses: docker/setup-buildx-action@v3
122169
-
123170
name: Build
124-
uses: docker/bake-action@v3
171+
uses: docker/bake-action@v4
125172
with:
126173
targets: plugins-cross
127174
set: |

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎.github/workflows/codeql.yml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: codeql
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
- '[0-9]+.[0-9]+'
8+
tags:
9+
- 'v*'
10+
pull_request:
11+
# The branches below must be a subset of the branches above
12+
branches: [ "master" ]
13+
schedule:
14+
# ┌───────────── minute (0 - 59)
15+
# │ ┌───────────── hour (0 - 23)
16+
# │ │ ┌───────────── day of the month (1 - 31)
17+
# │ │ │ ┌───────────── month (1 - 12)
18+
# │ │ │ │ ┌───────────── day of the week (0 - 6) (Sunday to Saturday)
19+
# │ │ │ │ │
20+
# │ │ │ │ │
21+
# │ │ │ │ │
22+
# * * * * *
23+
- cron: '0 9 * * 4'
24+
25+
jobs:
26+
codeql:
27+
runs-on: 'ubuntu-latest'
28+
timeout-minutes: 360
29+
env:
30+
DISABLE_WARN_OUTSIDE_CONTAINER: '1'
31+
permissions:
32+
actions: read
33+
contents: read
34+
security-events: write
35+
36+
steps:
37+
-
38+
name: Checkout
39+
uses: actions/checkout@v4
40+
with:
41+
fetch-depth: 2
42+
-
43+
name: Checkout HEAD on PR
44+
if: ${{ github.event_name == 'pull_request' }}
45+
run: |
46+
git checkout HEAD^2
47+
-
48+
name: Update Go
49+
uses: actions/setup-go@v5
50+
with:
51+
go-version: '1.21'
52+
-
53+
name: Initialize CodeQL
54+
uses: github/codeql-action/init@v3
55+
with:
56+
languages: go
57+
# CodeQL 2.16.4's auto-build added support for multi-module repositories,
58+
# and is trying to be smart by searching for modules in every directory,
59+
# including vendor directories. If no module is found, it's creating one
60+
# which is ... not what we want, so let's give it a "go.mod".
61+
# see: https://github.com/docker/cli/pull/4944#issuecomment-2002034698
62+
-
63+
name: Create go.mod
64+
run: |
65+
ln -s vendor.mod go.mod
66+
ln -s vendor.sum go.sum
67+
-
68+
name: Autobuild
69+
uses: github/codeql-action/autobuild@v3
70+
-
71+
name: Perform CodeQL Analysis
72+
uses: github/codeql-action/analyze@v3
73+
with:
74+
category: "/language:go"

‎.github/workflows/e2e.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616

1717
jobs:
1818
e2e:
19-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-22.04
2020
strategy:
2121
fail-fast: false
2222
matrix:
@@ -26,17 +26,17 @@ jobs:
2626
- connhelper-ssh
2727
base:
2828
- alpine
29-
- bullseye
29+
- debian
3030
engine-version:
31-
# - 20.10-dind # FIXME: Fails on 20.10
32-
- stable-dind # TODO: Use 20.10-dind, stable-dind is deprecated
33-
include:
34-
- target: non-experimental
35-
engine-version: 19.03-dind
31+
- 25.0 # latest
32+
- 24.0 # latest - 1
33+
- 23.0 # mirantis lts
34+
# TODO(krissetto) 19.03 needs a look, doesn't work ubuntu 22.04 (cgroup errors).
35+
# we could have a separate job that tests it against ubuntu 20.04
3636
steps:
3737
-
3838
name: Checkout
39-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
4040
-
4141
name: Update daemon.json
4242
run: |
@@ -48,17 +48,18 @@ jobs:
4848
docker info
4949
-
5050
name: Set up Docker Buildx
51-
uses: docker/setup-buildx-action@v2
51+
uses: docker/setup-buildx-action@v3
5252
-
5353
name: Run ${{ matrix.target }}
5454
run: |
5555
make -f docker.Makefile test-e2e-${{ matrix.target }}
5656
env:
5757
BASE_VARIANT: ${{ matrix.base }}
58-
E2E_ENGINE_VERSION: ${{ matrix.engine-version }}
58+
ENGINE_VERSION: ${{ matrix.engine-version }}
5959
TESTFLAGS: -coverprofile=/tmp/coverage/coverage.txt
6060
-
6161
name: Send to Codecov
62-
uses: codecov/codecov-action@v3
62+
uses: codecov/codecov-action@v4
6363
with:
6464
file: ./build/coverage/coverage.txt
65+
token: ${{ secrets.CODECOV_TOKEN }}

0 commit comments

Comments
 (0)