Skip to content

Commit 4f61500

Browse files
Merge pull request #19 from step-security/auto-cherry-pick
chore: Cherry-picked changes from upstream
2 parents 8c8aef2 + f3fa995 commit 4f61500

File tree

3 files changed

+15
-27
lines changed

3 files changed

+15
-27
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -130,27 +130,6 @@ jobs:
130130
context: .
131131
platforms: linux/amd64,linux/arm64,linux/ppc64le
132132

133-
install:
134-
runs-on: ubuntu-latest
135-
steps:
136-
- name: Harden the runner (Audit all outbound calls)
137-
uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
138-
with:
139-
egress-policy: audit
140-
141-
-
142-
name: Checkout
143-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
144-
-
145-
name: Set up Docker Buildx
146-
uses: ./
147-
with:
148-
install: true
149-
-
150-
name: Check cmd
151-
run: |
152-
docker build --help
153-
154133
use:
155134
runs-on: ubuntu-latest
156135
strategy:

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ The following inputs can be used as `step.with` keys:
9090
| `buildkitd-flags` | String | | [BuildKit daemon flags](https://docs.docker.com/engine/reference/commandline/buildx_create/#buildkitd-flags) |
9191
| `buildkitd-config` \* | String | | [BuildKit daemon config file](https://docs.docker.com/engine/reference/commandline/buildx_create/#config) |
9292
| `buildkitd-config-inline` \* | String | | Same as `buildkitd-config` but inline |
93-
| `install` | Bool | `false` | Sets up `docker build` command as an alias to `docker buildx` |
93+
| `install` \* | Bool | `false` | Sets up `docker build` command as an alias to `docker buildx` |
9494
| `use` | Bool | `true` | Switch to this builder instance |
9595
| `endpoint` | String | | [Optional address for docker socket](https://docs.docker.com/engine/reference/commandline/buildx_create/#description) or context from `docker context ls` |
9696
| `platforms` | List/CSV | | Fixed [platforms](https://docs.docker.com/engine/reference/commandline/buildx_create/#platform) for current node. If not empty, values take priority over the detected ones |
@@ -107,6 +107,14 @@ The following inputs can be used as `step.with` keys:
107107
> [!NOTE]
108108
> `buildkitd-config` and `buildkitd-config-inline` are mutually exclusive.
109109

110+
> [!NOTE]
111+
> `install` input is deprecated and will be removed in a future release. This
112+
> input is not necessary when building with our actions like
113+
> `docker/build-push-action` or `docker/bake-action`. If you are still building
114+
> with the `docker build` command then you can set the `BUILDX_BUILDER`
115+
> environment variable, or you can just directly invoke the
116+
> `docker buildx build` command: https://github.com/docker/setup-buildx-action/pull/455
117+
110118
### outputs
111119

112120
The following outputs are available:

action.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ inputs:
2626
buildkitd-config-inline:
2727
description: 'Inline BuildKit daemon config'
2828
required: false
29-
install:
30-
description: 'Sets up docker build command as an alias to docker buildx build'
31-
default: 'false'
32-
required: false
3329
use:
3430
description: 'Switch to this builder instance'
3531
default: 'true'
@@ -58,7 +54,7 @@ inputs:
5854
description: 'Cleanup temp files and remove builder at the end of a job'
5955
default: 'true'
6056
required: false
61-
# TODO: remove deprecated config and config-inline inputs
57+
# TODO: remove deprecated config, config-inline and install inputs
6258
config:
6359
description: 'BuildKit daemon config file'
6460
deprecationMessage: 'Use buildkitd-config instead'
@@ -67,6 +63,11 @@ inputs:
6763
description: 'Inline BuildKit daemon config'
6864
deprecationMessage: 'Use buildkitd-config-inline instead'
6965
required: false
66+
install:
67+
description: 'Sets up docker build command as an alias to docker buildx build'
68+
deprecationMessage: '"docker buildx install" command is deprecated and will be removed in a future release, use BUILDX_BUILDER environment variable instead'
69+
default: 'false'
70+
required: false
7071

7172
outputs:
7273
name:

0 commit comments

Comments
 (0)