Skip to content

Commit 81b4f9b

Browse files
Raj-StepSecuritygithub-actions[bot]
Raj-StepSecurity
and
github-actions[bot]
authored
chore: Cherry-picked changes from upstream (#135)
* changed signature for install method * Support downloading binaries from docker images Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> * Support downloading binaries from docker images Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> * Support downloading binaries from docker images Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> * Add rootless support Wire up `rootless` config to the new `rootless` Install option. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> * Add rootless support Wire up `rootless` config to the new `rootless` Install option. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> * Add rootless support Wire up `rootless` config to the new `rootless` Install option. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> * Add rootless support Wire up `rootless` config to the new `rootless` Install option. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> * Add rootless support Wire up `rootless` config to the new `rootless` Install option. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> * updated workflows and removed unnecessary files * actions-toolkit package upgraded * chore: dist updated (#137) * readme updated --------- Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Raj Kumar Panda <rajkumar@stepsecurity.io>
2 parents bda2a30 + b388b57 commit 81b4f9b

15 files changed

Lines changed: 351 additions & 345 deletions

File tree

‎.github/CONTRIBUTING.md‎

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

‎.github/ISSUE_TEMPLATE/bug_report.md‎

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

‎.github/SUPPORT.md‎

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

‎.github/workflows/ci.yml‎

Lines changed: 24 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
pull_request:
1818

1919
env:
20-
DOCKER_VERSION: v24.0.9
20+
DOCKER_VERSION: v27.3.1
2121

2222
jobs:
2323
main:
@@ -29,11 +29,11 @@ jobs:
2929
- ubuntu-latest
3030
- windows-latest
3131
version:
32-
- pinned
33-
- latest
32+
- v27.3.1
33+
- type=image,tag=27.3.1
3434
include:
3535
- os: macos-13
36-
version: pinned
36+
version: v27.3.1
3737
steps:
3838
- name: Harden Runner
3939
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
@@ -43,26 +43,11 @@ jobs:
4343
-
4444
name: Checkout
4545
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
46-
-
47-
name: Set up QEMU
48-
if: startsWith(matrix.os, 'macos')
49-
uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
50-
-
51-
name: Set version
52-
shell: bash
53-
run: |
54-
if [ "${{ matrix.version }}" != "pinned" ]; then
55-
echo "DOCKER_VERSION=${{ matrix.version }}" >> $GITHUB_ENV
56-
fi
5746
-
5847
name: Set up Docker
5948
uses: ./
6049
with:
61-
version: ${{ env.DOCKER_VERSION }}
62-
-
63-
name: Dump context
64-
if: always()
65-
uses: crazy-max/ghaction-dump-context@5355a8e5e6ac5a302e746a1c4b7747a0393863c8 # v2.3.0
50+
version: ${{ matrix.version }}
6651

6752
channel:
6853
runs-on: ${{ matrix.os }}
@@ -82,20 +67,12 @@ jobs:
8267
-
8368
name: Checkout
8469
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
85-
-
86-
name: Set up QEMU
87-
if: startsWith(matrix.os, 'macos')
88-
uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
8970
-
9071
name: Set up Docker
9172
uses: ./
9273
with:
93-
version: v24.0.0-rc.4
74+
version: ${{ env.DOCKER_VERSION }}
9475
channel: test
95-
-
96-
name: Dump context
97-
if: always()
98-
uses: crazy-max/ghaction-dump-context@5355a8e5e6ac5a302e746a1c4b7747a0393863c8 # v2.3.0
9976

10077
daemon-config:
10178
runs-on: ${{ matrix.os }}
@@ -115,10 +92,6 @@ jobs:
11592
-
11693
name: Checkout
11794
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
118-
-
119-
name: Set up QEMU
120-
if: startsWith(matrix.os, 'macos')
121-
uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
12295
-
12396
name: Set up Docker
12497
uses: ./
@@ -130,10 +103,6 @@ jobs:
130103
"containerd-snapshotter": true
131104
}
132105
}
133-
-
134-
name: Dump context
135-
if: always()
136-
uses: crazy-max/ghaction-dump-context@5355a8e5e6ac5a302e746a1c4b7747a0393863c8 # v2.3.0
137106
138107
context:
139108
runs-on: ${{ matrix.os }}
@@ -154,10 +123,6 @@ jobs:
154123
-
155124
name: Checkout
156125
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
157-
-
158-
name: Set up QEMU
159-
if: startsWith(matrix.os, 'macos')
160-
uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
161126
-
162127
name: Set up Docker
163128
uses: ./
@@ -168,10 +133,6 @@ jobs:
168133
name: Check context
169134
run: |
170135
docker context inspect foo
171-
-
172-
name: Dump context
173-
if: always()
174-
uses: crazy-max/ghaction-dump-context@5355a8e5e6ac5a302e746a1c4b7747a0393863c8 # v2.3.0
175136
176137
lima-start-args:
177138
#runs-on: macos-14 # no virt: https://github.com/docker/actions-toolkit/issues/317
@@ -185,12 +146,11 @@ jobs:
185146
-
186147
name: Checkout
187148
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
188-
-
189-
name: Set up QEMU
190-
uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
191149
-
192150
name: Set up Docker
193151
uses: ./
152+
with:
153+
version: ${{ env.DOCKER_VERSION }}
194154
env:
195155
LIMA_START_ARGS: --cpus 4 --memory 8
196156

@@ -243,10 +203,6 @@ jobs:
243203
name: Inspect
244204
run: |
245205
docker buildx imagetools inspect localhost:5000/name/app:latest --format '{{json .}}'
246-
-
247-
name: Dump context
248-
if: always()
249-
uses: crazy-max/ghaction-dump-context@5355a8e5e6ac5a302e746a1c4b7747a0393863c8 # v2.3.0
250206
251207
build-macos:
252208
runs-on: ${{ matrix.os }}
@@ -265,10 +221,6 @@ jobs:
265221
-
266222
name: Checkout
267223
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
268-
-
269-
name: Set up QEMU
270-
if: startsWith(matrix.os, 'macos')
271-
uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
272224
-
273225
name: Set up Docker
274226
uses: ./
@@ -296,10 +248,6 @@ jobs:
296248
name: Inspect
297249
run: |
298250
docker buildx imagetools inspect localhost:5000/name/app:latest --format '{{json .}}'
299-
-
300-
name: Dump context
301-
if: always()
302-
uses: crazy-max/ghaction-dump-context@5355a8e5e6ac5a302e746a1c4b7747a0393863c8 # v2.3.0
303251
304252
build-windows:
305253
runs-on: windows-latest
@@ -326,10 +274,6 @@ jobs:
326274
name: Inspect
327275
run: |
328276
docker image inspect test
329-
-
330-
name: Dump context
331-
if: always()
332-
uses: crazy-max/ghaction-dump-context@5355a8e5e6ac5a302e746a1c4b7747a0393863c8 # v2.3.0
333277
334278
set-host:
335279
runs-on: ubuntu-latest
@@ -346,12 +290,25 @@ jobs:
346290
name: Set up Docker
347291
uses: ./
348292
with:
293+
version: ${{ env.DOCKER_VERSION }}
349294
set-host: true
350295
-
351296
name: List contexts
352297
run: |
353298
docker context ls
299+
rootless:
300+
runs-on: ubuntu-latest
301+
steps:
302+
-
303+
name: Checkout
304+
uses: actions/checkout@v4
354305
-
355-
name: Dump context
356-
if: always()
357-
uses: crazy-max/ghaction-dump-context@5355a8e5e6ac5a302e746a1c4b7747a0393863c8 # v2.3.0
306+
name: Set up Docker
307+
uses: ./
308+
with:
309+
version: ${{ env.DOCKER_VERSION }}
310+
rootless: true
311+
-
312+
name: List contexts
313+
run: |
314+
docker context ls

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,4 @@ jobs:
2828
uses: docker/bake-action@f6acc70fe0da9b200315017ca49a08c0de03aa0b # v5.1.0
2929
with:
3030
targets: test
31-
-
32-
name: Upload coverage
33-
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
34-
with:
35-
file: ./coverage/clover.xml
36-
token: ${{ secrets.CODECOV_TOKEN }}
31+

‎README.md‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,6 @@ jobs:
4646
uses: step-security/ghaction-setup-docker@v3
4747
```
4848
49-
> [!IMPORTANT]
50-
> macOS runners hang with latest QEMU 9.1.0. You need to install QEMU 9.0.2 as
51-
> a workaround:
52-
> ```yaml
53-
> name: ci
54-
>
55-
> on:
56-
> push:
57-
>
58-
> jobs:
59-
> docker:
60-
> runs-on: macos-13
61-
> steps:
62-
> -
63-
> name: Install QEMU 9.0.2
64-
> uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
65-
> -
66-
> name: Set up Docker
67-
> uses: step-security/ghaction-setup-docker@v3
68-
> ```
69-
7049
### Daemon configuration
7150
7251
You can [configure the Docker daemon](https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file)
@@ -132,6 +111,7 @@ The following inputs can be used as `step.with` keys
132111
| `daemon-config` | String | | [Docker daemon JSON configuration](https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file) |
133112
| `context` | String | `setup-docker-action` | Docker context name. |
134113
| `set-host` | Bool | `false` | Set `DOCKER_HOST` environment variable to docker socket path. |
114+
| `rootless` | Bool | `false` | Start daemon in rootless mode |
135115

136116
### outputs
137117

0 commit comments

Comments
 (0)