mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-09-03 09:29:07 +08:00
Compare commits
11 Commits
v0.13.0-rc
...
v0.8.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
6224def4dd | ||
|
|
5abee699a6 | ||
|
|
54e497dfba | ||
|
|
dfbd226285 | ||
|
|
a78c2957a2 | ||
|
|
e80890ec89 | ||
|
|
10fe8f380c | ||
|
|
5fac64c2c4 | ||
|
|
24ad37a5d2 | ||
|
|
106651877d | ||
|
|
35bcd88f08 |
@@ -1 +1,3 @@
|
|||||||
bin/
|
bin/
|
||||||
|
cross-out/
|
||||||
|
release-out/
|
||||||
|
|||||||
54
.github/CONTRIBUTING.md
vendored
54
.github/CONTRIBUTING.md
vendored
@@ -116,60 +116,6 @@ commit automatically with `git commit -s`.
|
|||||||
|
|
||||||
### Run the unit- and integration-tests
|
### Run the unit- and integration-tests
|
||||||
|
|
||||||
Running tests:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
make test
|
|
||||||
```
|
|
||||||
|
|
||||||
This runs all unit and integration tests, in a containerized environment.
|
|
||||||
Locally, every package can be tested separately with standard Go tools, but
|
|
||||||
integration tests are skipped if local user doesn't have enough permissions or
|
|
||||||
worker binaries are not installed.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# run unit tests only
|
|
||||||
make test-unit
|
|
||||||
|
|
||||||
# run integration tests only
|
|
||||||
make test-integration
|
|
||||||
|
|
||||||
# test a specific package
|
|
||||||
TESTPKGS=./bake make test
|
|
||||||
|
|
||||||
# run all integration tests with a specific worker
|
|
||||||
TESTFLAGS="--run=//worker=remote -v" make test-integration
|
|
||||||
|
|
||||||
# run a specific integration test
|
|
||||||
TESTFLAGS="--run /TestBuild/worker=remote/ -v" make test-integration
|
|
||||||
|
|
||||||
# run a selection of integration tests using a regexp
|
|
||||||
TESTFLAGS="--run /TestBuild.*/worker=remote/ -v" make test-integration
|
|
||||||
```
|
|
||||||
|
|
||||||
> **Note**
|
|
||||||
>
|
|
||||||
> Set `TEST_KEEP_CACHE=1` for the test framework to keep external dependant
|
|
||||||
> images in a docker volume if you are repeatedly calling `make test`. This
|
|
||||||
> helps to avoid rate limiting on the remote registry side.
|
|
||||||
|
|
||||||
> **Note**
|
|
||||||
>
|
|
||||||
> Set `TEST_DOCKERD=1` for the test framework to enable the docker workers,
|
|
||||||
> specifically the `docker` and `docker-container` drivers.
|
|
||||||
>
|
|
||||||
> The docker tests cannot be run in parallel, so require passing `--parallel=1`
|
|
||||||
> in `TESTFLAGS`.
|
|
||||||
|
|
||||||
> **Note**
|
|
||||||
>
|
|
||||||
> If you are working behind a proxy, you can set some of or all
|
|
||||||
> `HTTP_PROXY=http://ip:port`, `HTTPS_PROXY=http://ip:port`, `NO_PROXY=http://ip:port`
|
|
||||||
> for the test framework to specify the proxy build args.
|
|
||||||
|
|
||||||
|
|
||||||
### Run the helper commands
|
|
||||||
|
|
||||||
To enter a demo container environment and experiment, you may run:
|
To enter a demo container environment and experiment, you may run:
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|||||||
124
.github/ISSUE_TEMPLATE/bug.yml
vendored
124
.github/ISSUE_TEMPLATE/bug.yml
vendored
@@ -1,124 +0,0 @@
|
|||||||
# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
|
|
||||||
name: Bug Report
|
|
||||||
description: Report a bug
|
|
||||||
labels:
|
|
||||||
- status/triage
|
|
||||||
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
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:security@docker.com).
|
|
||||||
|
|
||||||
- type: checkboxes
|
|
||||||
attributes:
|
|
||||||
label: Contributing guidelines
|
|
||||||
description: |
|
|
||||||
Please read the contributing guidelines before proceeding.
|
|
||||||
options:
|
|
||||||
- label: I've read the [contributing guidelines](https://github.com/docker/buildx/blob/master/.github/CONTRIBUTING.md) and wholeheartedly agree
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: checkboxes
|
|
||||||
attributes:
|
|
||||||
label: I've found a bug and checked that ...
|
|
||||||
description: |
|
|
||||||
Make sure that your request fulfills all of the following requirements.
|
|
||||||
If one requirement cannot be satisfied, explain in detail why.
|
|
||||||
options:
|
|
||||||
- label: ... the documentation does not mention anything about my problem
|
|
||||||
- label: ... there are no open or closed issues that are related to my problem
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Description
|
|
||||||
description: |
|
|
||||||
Please provide a brief description of the bug in 1-2 sentences.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Expected behaviour
|
|
||||||
description: |
|
|
||||||
Please describe precisely what you'd expect to happen.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Actual behaviour
|
|
||||||
description: |
|
|
||||||
Please describe precisely what is actually happening.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: input
|
|
||||||
attributes:
|
|
||||||
label: Buildx version
|
|
||||||
description: |
|
|
||||||
Output of `docker buildx version` command.
|
|
||||||
Example: `github.com/docker/buildx v0.8.1 5fac64c2c49dae1320f2b51f1a899ca451935554`
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Docker info
|
|
||||||
description: |
|
|
||||||
Output of `docker info` command.
|
|
||||||
render: text
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Builders list
|
|
||||||
description: |
|
|
||||||
Output of `docker buildx ls` command.
|
|
||||||
render: text
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Configuration
|
|
||||||
description: >
|
|
||||||
Please provide a minimal Dockerfile, bake definition (if applicable) and
|
|
||||||
invoked commands to help reproducing your issue.
|
|
||||||
placeholder: |
|
|
||||||
```dockerfile
|
|
||||||
FROM alpine
|
|
||||||
echo hello
|
|
||||||
```
|
|
||||||
|
|
||||||
```hcl
|
|
||||||
group "default" {
|
|
||||||
targets = ["app"]
|
|
||||||
}
|
|
||||||
target "app" {
|
|
||||||
dockerfile = "Dockerfile"
|
|
||||||
target = "build"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
```console
|
|
||||||
$ docker buildx build .
|
|
||||||
$ docker buildx bake
|
|
||||||
```
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Build logs
|
|
||||||
description: |
|
|
||||||
Please provide logs output (and/or BuildKit logs if applicable).
|
|
||||||
render: text
|
|
||||||
validations:
|
|
||||||
required: false
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
attributes:
|
|
||||||
label: Additional info
|
|
||||||
description: |
|
|
||||||
Please provide any additional information that could be useful.
|
|
||||||
12
.github/ISSUE_TEMPLATE/config.yml
vendored
12
.github/ISSUE_TEMPLATE/config.yml
vendored
@@ -1,12 +0,0 @@
|
|||||||
# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
|
|
||||||
blank_issues_enabled: true
|
|
||||||
contact_links:
|
|
||||||
- name: Questions and Discussions
|
|
||||||
url: https://github.com/docker/buildx/discussions/new
|
|
||||||
about: Use Github Discussions to ask questions and/or open discussion topics.
|
|
||||||
- name: Command line reference
|
|
||||||
url: https://docs.docker.com/engine/reference/commandline/buildx/
|
|
||||||
about: Read the command line reference.
|
|
||||||
- name: Documentation
|
|
||||||
url: https://docs.docker.com/build/
|
|
||||||
about: Read the documentation.
|
|
||||||
15
.github/ISSUE_TEMPLATE/feature.yml
vendored
15
.github/ISSUE_TEMPLATE/feature.yml
vendored
@@ -1,15 +0,0 @@
|
|||||||
# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
|
|
||||||
name: Feature request
|
|
||||||
description: Missing functionality? Come tell us about it!
|
|
||||||
labels:
|
|
||||||
- kind/enhancement
|
|
||||||
- status/triage
|
|
||||||
|
|
||||||
body:
|
|
||||||
- type: textarea
|
|
||||||
id: description
|
|
||||||
attributes:
|
|
||||||
label: Description
|
|
||||||
description: What is the feature you want to see?
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
12
.github/SECURITY.md
vendored
12
.github/SECURITY.md
vendored
@@ -1,12 +0,0 @@
|
|||||||
# Reporting security issues
|
|
||||||
|
|
||||||
The project maintainers take security seriously. If you discover a security
|
|
||||||
issue, please bring it to their attention right away!
|
|
||||||
|
|
||||||
**Please _DO NOT_ file a public issue**, instead send your report privately to
|
|
||||||
[security@docker.com](mailto:security@docker.com).
|
|
||||||
|
|
||||||
Security reports are greatly appreciated, and we will publicly thank you for it.
|
|
||||||
We also like to send gifts—if you're into schwag, make sure to let
|
|
||||||
us know. We currently do not offer a paid security bounty program, but are not
|
|
||||||
ruling it out in the future.
|
|
||||||
15
.github/dependabot.yml
vendored
15
.github/dependabot.yml
vendored
@@ -1,15 +0,0 @@
|
|||||||
version: 2
|
|
||||||
updates:
|
|
||||||
- package-ecosystem: "github-actions"
|
|
||||||
open-pull-requests-limit: 10
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: "daily"
|
|
||||||
ignore:
|
|
||||||
# ignore this dependency
|
|
||||||
# it seems a bug with dependabot as pining to commit sha should not
|
|
||||||
# trigger a new version: https://github.com/docker/buildx/pull/2222#issuecomment-1919092153
|
|
||||||
- dependency-name: "docker/docs"
|
|
||||||
labels:
|
|
||||||
- "dependencies"
|
|
||||||
- "bot"
|
|
||||||
735
.github/releases.json
vendored
735
.github/releases.json
vendored
@@ -1,735 +0,0 @@
|
|||||||
{
|
|
||||||
"latest": {
|
|
||||||
"id": 90741208,
|
|
||||||
"tag_name": "v0.10.2",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.10.2",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.10.2": {
|
|
||||||
"id": 90741208,
|
|
||||||
"tag_name": "v0.10.2",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.10.2",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.darwin-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.2/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.10.1": {
|
|
||||||
"id": 90346950,
|
|
||||||
"tag_name": "v0.10.1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.10.1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.darwin-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.darwin-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.darwin-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.darwin-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.1/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.10.0": {
|
|
||||||
"id": 88388110,
|
|
||||||
"tag_name": "v0.10.0",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.10.0",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.darwin-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.darwin-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.darwin-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.darwin-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.10.0-rc3": {
|
|
||||||
"id": 88191592,
|
|
||||||
"tag_name": "v0.10.0-rc3",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.10.0-rc3",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.darwin-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.darwin-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.darwin-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.darwin-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm-v6.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm-v6.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm-v7.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm-v7.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-ppc64le.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-ppc64le.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-riscv64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-riscv64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-s390x.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.linux-s390x.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.windows-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.windows-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.windows-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/buildx-v0.10.0-rc3.windows-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc3/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.10.0-rc2": {
|
|
||||||
"id": 86248476,
|
|
||||||
"tag_name": "v0.10.0-rc2",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.10.0-rc2",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.darwin-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.darwin-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.darwin-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.darwin-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm-v6.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm-v6.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm-v7.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm-v7.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-ppc64le.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-ppc64le.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-riscv64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-riscv64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-s390x.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.linux-s390x.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.windows-amd64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.windows-amd64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.windows-arm64.provenance.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/buildx-v0.10.0-rc2.windows-arm64.sbom.json",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc2/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.10.0-rc1": {
|
|
||||||
"id": 85963900,
|
|
||||||
"tag_name": "v0.10.0-rc1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.10.0-rc1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc1/buildx-v0.10.0-rc1.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.10.0-rc1/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.9.1": {
|
|
||||||
"id": 74760068,
|
|
||||||
"tag_name": "v0.9.1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.9.1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.1/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.9.0": {
|
|
||||||
"id": 74546589,
|
|
||||||
"tag_name": "v0.9.0",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.9.0",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.9.0-rc2": {
|
|
||||||
"id": 74052235,
|
|
||||||
"tag_name": "v0.9.0-rc2",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.9.0-rc2",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc2/buildx-v0.9.0-rc2.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc2/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.9.0-rc1": {
|
|
||||||
"id": 73389692,
|
|
||||||
"tag_name": "v0.9.0-rc1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.9.0-rc1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc1/buildx-v0.9.0-rc1.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.9.0-rc1/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.8.2": {
|
|
||||||
"id": 63479740,
|
|
||||||
"tag_name": "v0.8.2",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.8.2",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.2/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.8.1": {
|
|
||||||
"id": 62289050,
|
|
||||||
"tag_name": "v0.8.1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.8.1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.1/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.8.0": {
|
|
||||||
"id": 61423774,
|
|
||||||
"tag_name": "v0.8.0",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.8.0",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0/buildx-v0.8.0.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.8.0-rc1": {
|
|
||||||
"id": 60513568,
|
|
||||||
"tag_name": "v0.8.0-rc1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.8.0-rc1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0-rc1/buildx-v0.8.0-rc1.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.8.0-rc1/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.7.1": {
|
|
||||||
"id": 54098347,
|
|
||||||
"tag_name": "v0.7.1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.7.1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.1/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.7.0": {
|
|
||||||
"id": 53109422,
|
|
||||||
"tag_name": "v0.7.0",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.7.0",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0/buildx-v0.7.0.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.7.0-rc1": {
|
|
||||||
"id": 52726324,
|
|
||||||
"tag_name": "v0.7.0-rc1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.7.0-rc1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0-rc1/buildx-v0.7.0-rc1.windows-arm64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.7.0-rc1/checksums.txt"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.6.3": {
|
|
||||||
"id": 48691641,
|
|
||||||
"tag_name": "v0.6.3",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.6.3",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.windows-arm64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.6.2": {
|
|
||||||
"id": 48207405,
|
|
||||||
"tag_name": "v0.6.2",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.6.2",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.2/buildx-v0.6.2.windows-arm64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.6.1": {
|
|
||||||
"id": 47064772,
|
|
||||||
"tag_name": "v0.6.1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.6.1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.1/buildx-v0.6.1.windows-arm64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.6.0": {
|
|
||||||
"id": 46343260,
|
|
||||||
"tag_name": "v0.6.0",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.6.0",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0/buildx-v0.6.0.windows-arm64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.6.0-rc1": {
|
|
||||||
"id": 46230351,
|
|
||||||
"tag_name": "v0.6.0-rc1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.6.0-rc1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-riscv64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.windows-amd64.exe",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.6.0-rc1/buildx-v0.6.0-rc1.windows-arm64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.5.1": {
|
|
||||||
"id": 35276550,
|
|
||||||
"tag_name": "v0.5.1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.5.1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.darwin-universal",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.windows-amd64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.5.0": {
|
|
||||||
"id": 35268960,
|
|
||||||
"tag_name": "v0.5.0",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.5.0",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.darwin-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.darwin-universal",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0/buildx-v0.5.0.windows-amd64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.5.0-rc1": {
|
|
||||||
"id": 35015334,
|
|
||||||
"tag_name": "v0.5.0-rc1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.5.0-rc1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.5.0-rc1/buildx-v0.5.0-rc1.windows-amd64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.4.2": {
|
|
||||||
"id": 30007794,
|
|
||||||
"tag_name": "v0.4.2",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.4.2",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.windows-amd64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.4.1": {
|
|
||||||
"id": 26067509,
|
|
||||||
"tag_name": "v0.4.1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.4.1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.windows-amd64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.4.0": {
|
|
||||||
"id": 26028174,
|
|
||||||
"tag_name": "v0.4.0",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.4.0",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.4.0/buildx-v0.4.0.windows-amd64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.3.1": {
|
|
||||||
"id": 20316235,
|
|
||||||
"tag_name": "v0.3.1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.3.1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.windows-amd64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.3.0": {
|
|
||||||
"id": 19029664,
|
|
||||||
"tag_name": "v0.3.0",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.3.0",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.windows-amd64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.2.2": {
|
|
||||||
"id": 17671545,
|
|
||||||
"tag_name": "v0.2.2",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.2.2",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.2/buildx-v0.2.2.windows-amd64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.2.1": {
|
|
||||||
"id": 17582885,
|
|
||||||
"tag_name": "v0.2.1",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.2.1",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.1/buildx-v0.2.1.windows-amd64.exe"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"v0.2.0": {
|
|
||||||
"id": 16965310,
|
|
||||||
"tag_name": "v0.2.0",
|
|
||||||
"html_url": "https://github.com/docker/buildx/releases/tag/v0.2.0",
|
|
||||||
"assets": [
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.darwin-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.linux-amd64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.linux-arm-v6",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.linux-arm-v7",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.linux-arm64",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.linux-ppc64le",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.linux-s390x",
|
|
||||||
"https://github.com/docker/buildx/releases/download/v0.2.0/buildx-v0.2.0.windows-amd64.exe"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
327
.github/workflows/build.yml
vendored
327
.github/workflows/build.yml
vendored
@@ -1,9 +1,5 @@
|
|||||||
name: build
|
name: build
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-${{ github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
push:
|
push:
|
||||||
@@ -13,282 +9,51 @@ on:
|
|||||||
tags:
|
tags:
|
||||||
- 'v*'
|
- 'v*'
|
||||||
pull_request:
|
pull_request:
|
||||||
paths-ignore:
|
branches:
|
||||||
- '.github/releases.json'
|
- 'master'
|
||||||
- 'README.md'
|
- 'v[0-9]*'
|
||||||
- 'docs/**'
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
BUILDX_VERSION: "latest"
|
|
||||||
BUILDKIT_IMAGE: "moby/buildkit:latest"
|
|
||||||
REPO_SLUG: "docker/buildx-bin"
|
REPO_SLUG: "docker/buildx-bin"
|
||||||
DESTDIR: "./bin"
|
RELEASE_OUT: "./release-out"
|
||||||
TEST_CACHE_SCOPE: "test"
|
|
||||||
TESTFLAGS: "-v --parallel=6 --timeout=30m"
|
|
||||||
GOTESTSUM_FORMAT: "standard-verbose"
|
|
||||||
GO_VERSION: "1.21"
|
|
||||||
GOTESTSUM_VERSION: "v1.9.0" # same as one in Dockerfile
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
prepare-test-integration:
|
build:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Checkout
|
name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v2
|
||||||
-
|
-
|
||||||
name: Set up QEMU
|
name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v1
|
||||||
-
|
-
|
||||||
name: Set up Docker Buildx
|
name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v1
|
||||||
with:
|
|
||||||
version: ${{ env.BUILDX_VERSION }}
|
|
||||||
driver-opts: image=${{ env.BUILDKIT_IMAGE }}
|
|
||||||
buildkitd-flags: --debug
|
|
||||||
-
|
|
||||||
name: Build
|
|
||||||
uses: docker/bake-action@v4
|
|
||||||
with:
|
|
||||||
targets: integration-test-base
|
|
||||||
set: |
|
|
||||||
*.cache-from=type=gha,scope=${{ env.TEST_CACHE_SCOPE }}
|
|
||||||
*.cache-to=type=gha,scope=${{ env.TEST_CACHE_SCOPE }}
|
|
||||||
|
|
||||||
test-integration:
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
needs:
|
|
||||||
- prepare-test-integration
|
|
||||||
env:
|
|
||||||
TESTFLAGS_DOCKER: "-v --parallel=1 --timeout=30m"
|
|
||||||
TEST_IMAGE_BUILD: "0"
|
|
||||||
TEST_IMAGE_ID: "buildx-tests"
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
worker:
|
|
||||||
- docker
|
|
||||||
- docker\+containerd # same as docker, but with containerd snapshotter
|
|
||||||
- docker-container
|
|
||||||
- remote
|
|
||||||
pkg:
|
|
||||||
- ./tests
|
|
||||||
steps:
|
|
||||||
-
|
|
||||||
name: Prepare
|
|
||||||
run: |
|
|
||||||
echo "TESTREPORTS_NAME=${{ github.job }}-$(echo "${{ matrix.pkg }}-${{ matrix.worker }}" | tr -dc '[:alnum:]-\n\r' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
|
|
||||||
-
|
|
||||||
name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
-
|
|
||||||
name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v3
|
|
||||||
-
|
|
||||||
name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
with:
|
|
||||||
version: ${{ env.BUILDX_VERSION }}
|
|
||||||
driver-opts: image=${{ env.BUILDKIT_IMAGE }}
|
|
||||||
buildkitd-flags: --debug
|
|
||||||
-
|
|
||||||
name: Build test image
|
|
||||||
uses: docker/bake-action@v4
|
|
||||||
with:
|
|
||||||
targets: integration-test
|
|
||||||
set: |
|
|
||||||
*.cache-from=type=gha,scope=${{ env.TEST_CACHE_SCOPE }}
|
|
||||||
*.output=type=docker,name=${{ env.TEST_IMAGE_ID }}
|
|
||||||
-
|
-
|
||||||
name: Test
|
name: Test
|
||||||
run: |
|
run: |
|
||||||
./hack/test
|
make test
|
||||||
env:
|
|
||||||
TEST_REPORT_SUFFIX: "-${{ env.TESTREPORTS_NAME }}"
|
|
||||||
TEST_DOCKERD: "${{ startsWith(matrix.worker, 'docker') && '1' || '0' }}"
|
|
||||||
TESTFLAGS: "${{ (matrix.worker == 'docker' || matrix.worker == 'docker\\+containerd') && env.TESTFLAGS_DOCKER || env.TESTFLAGS }} --run=//worker=${{ matrix.worker }}$"
|
|
||||||
TESTPKGS: "${{ matrix.pkg }}"
|
|
||||||
-
|
-
|
||||||
name: Send to Codecov
|
name: Send to Codecov
|
||||||
if: always()
|
uses: codecov/codecov-action@v2
|
||||||
uses: codecov/codecov-action@v4
|
|
||||||
with:
|
with:
|
||||||
directory: ./bin/testreports
|
file: ./coverage/coverage.txt
|
||||||
flags: integration
|
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
|
||||||
-
|
-
|
||||||
name: Generate annotations
|
name: Build binaries
|
||||||
if: always()
|
|
||||||
uses: crazy-max/.github/.github/actions/gotest-annotations@fa6141aedf23596fb8bdcceab9cce8dadaa31bd9
|
|
||||||
with:
|
|
||||||
directory: ./bin/testreports
|
|
||||||
-
|
|
||||||
name: Upload test reports
|
|
||||||
if: always()
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: test-reports-${{ env.TESTREPORTS_NAME }}
|
|
||||||
path: ./bin/testreports
|
|
||||||
|
|
||||||
test-unit:
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
os:
|
|
||||||
- ubuntu-22.04
|
|
||||||
- macos-12
|
|
||||||
- windows-2022
|
|
||||||
env:
|
|
||||||
SKIP_INTEGRATION_TESTS: 1
|
|
||||||
steps:
|
|
||||||
-
|
|
||||||
name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
-
|
|
||||||
name: Set up Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: "${{ env.GO_VERSION }}"
|
|
||||||
-
|
|
||||||
name: Prepare
|
|
||||||
run: |
|
|
||||||
testreportsName=${{ github.job }}--${{ matrix.os }}
|
|
||||||
testreportsBaseDir=./bin/testreports
|
|
||||||
testreportsDir=$testreportsBaseDir/$testreportsName
|
|
||||||
echo "TESTREPORTS_NAME=$testreportsName" >> $GITHUB_ENV
|
|
||||||
echo "TESTREPORTS_BASEDIR=$testreportsBaseDir" >> $GITHUB_ENV
|
|
||||||
echo "TESTREPORTS_DIR=$testreportsDir" >> $GITHUB_ENV
|
|
||||||
mkdir -p $testreportsDir
|
|
||||||
shell: bash
|
|
||||||
-
|
|
||||||
name: Install gotestsum
|
|
||||||
run: |
|
|
||||||
go install gotest.tools/gotestsum@${{ env.GOTESTSUM_VERSION }}
|
|
||||||
-
|
|
||||||
name: Test
|
|
||||||
env:
|
|
||||||
TMPDIR: ${{ runner.temp }}
|
|
||||||
run: |
|
|
||||||
gotestsum \
|
|
||||||
--jsonfile="${{ env.TESTREPORTS_DIR }}/go-test-report.json" \
|
|
||||||
--junitfile="${{ env.TESTREPORTS_DIR }}/junit-report.xml" \
|
|
||||||
--packages="./..." \
|
|
||||||
-- \
|
|
||||||
"-mod=vendor" \
|
|
||||||
"-coverprofile" "${{ env.TESTREPORTS_DIR }}/coverage.txt" \
|
|
||||||
"-covermode" "atomic" ${{ env.TESTFLAGS }}
|
|
||||||
shell: bash
|
|
||||||
-
|
|
||||||
name: Send to Codecov
|
|
||||||
if: always()
|
|
||||||
uses: codecov/codecov-action@v4
|
|
||||||
with:
|
|
||||||
directory: ${{ env.TESTREPORTS_DIR }}
|
|
||||||
env_vars: RUNNER_OS
|
|
||||||
flags: unit
|
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
|
||||||
-
|
|
||||||
name: Generate annotations
|
|
||||||
if: always()
|
|
||||||
uses: crazy-max/.github/.github/actions/gotest-annotations@fa6141aedf23596fb8bdcceab9cce8dadaa31bd9
|
|
||||||
with:
|
|
||||||
directory: ${{ env.TESTREPORTS_DIR }}
|
|
||||||
-
|
|
||||||
name: Upload test reports
|
|
||||||
if: always()
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: test-reports-${{ env.TESTREPORTS_NAME }}
|
|
||||||
path: ${{ env.TESTREPORTS_BASEDIR }}
|
|
||||||
|
|
||||||
prepare-binaries:
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
outputs:
|
|
||||||
matrix: ${{ steps.platforms.outputs.matrix }}
|
|
||||||
steps:
|
|
||||||
-
|
|
||||||
name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
-
|
|
||||||
name: Create matrix
|
|
||||||
id: platforms
|
|
||||||
run: |
|
|
||||||
echo "matrix=$(docker buildx bake binaries-cross --print | jq -cr '.target."binaries-cross".platforms')" >>${GITHUB_OUTPUT}
|
|
||||||
-
|
|
||||||
name: Show matrix
|
|
||||||
run: |
|
|
||||||
echo ${{ steps.platforms.outputs.matrix }}
|
|
||||||
|
|
||||||
binaries:
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
needs:
|
|
||||||
- prepare-binaries
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
platform: ${{ fromJson(needs.prepare-binaries.outputs.matrix) }}
|
|
||||||
steps:
|
|
||||||
-
|
|
||||||
name: Prepare
|
|
||||||
run: |
|
|
||||||
platform=${{ matrix.platform }}
|
|
||||||
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
|
|
||||||
-
|
|
||||||
name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
-
|
|
||||||
name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v3
|
|
||||||
-
|
|
||||||
name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
with:
|
|
||||||
version: ${{ env.BUILDX_VERSION }}
|
|
||||||
driver-opts: image=${{ env.BUILDKIT_IMAGE }}
|
|
||||||
buildkitd-flags: --debug
|
|
||||||
-
|
|
||||||
name: Build
|
|
||||||
run: |
|
run: |
|
||||||
make release
|
make release
|
||||||
env:
|
|
||||||
PLATFORMS: ${{ matrix.platform }}
|
|
||||||
CACHE_FROM: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }}
|
|
||||||
CACHE_TO: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }},mode=max
|
|
||||||
-
|
-
|
||||||
name: Upload artifacts
|
name: Upload artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
name: buildx-${{ env.PLATFORM_PAIR }}
|
name: buildx
|
||||||
path: ${{ env.DESTDIR }}/*
|
path: ${{ env.RELEASE_OUT }}/*
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
bin-image:
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
needs:
|
|
||||||
- test-integration
|
|
||||||
- test-unit
|
|
||||||
if: ${{ github.event_name != 'pull_request' && github.repository == 'docker/buildx' }}
|
|
||||||
steps:
|
|
||||||
-
|
|
||||||
name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
-
|
|
||||||
name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v3
|
|
||||||
-
|
|
||||||
name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
with:
|
|
||||||
version: ${{ env.BUILDX_VERSION }}
|
|
||||||
driver-opts: image=${{ env.BUILDKIT_IMAGE }}
|
|
||||||
buildkitd-flags: --debug
|
|
||||||
-
|
-
|
||||||
name: Docker meta
|
name: Docker meta
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v3
|
||||||
with:
|
with:
|
||||||
images: |
|
images: |
|
||||||
${{ env.REPO_SLUG }}
|
${{ env.REPO_SLUG }}
|
||||||
@@ -300,82 +65,48 @@ jobs:
|
|||||||
-
|
-
|
||||||
name: Login to DockerHub
|
name: Login to DockerHub
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request'
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v1
|
||||||
with:
|
with:
|
||||||
username: ${{ vars.DOCKERPUBLICBOT_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
-
|
-
|
||||||
name: Build and push image
|
name: Build and push image
|
||||||
uses: docker/bake-action@v4
|
uses: docker/bake-action@v1
|
||||||
with:
|
with:
|
||||||
files: |
|
files: |
|
||||||
./docker-bake.hcl
|
./docker-bake.hcl
|
||||||
${{ steps.meta.outputs.bake-file }}
|
${{ steps.meta.outputs.bake-file }}
|
||||||
targets: image-cross
|
targets: image-cross
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' }}
|
||||||
sbom: true
|
|
||||||
set: |
|
|
||||||
*.cache-from=type=gha,scope=bin-image
|
|
||||||
*.cache-to=type=gha,scope=bin-image,mode=max
|
|
||||||
|
|
||||||
release:
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
needs:
|
|
||||||
- test-integration
|
|
||||||
- test-unit
|
|
||||||
- binaries
|
|
||||||
steps:
|
|
||||||
-
|
|
||||||
name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
-
|
|
||||||
name: Download binaries
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
path: ${{ env.DESTDIR }}
|
|
||||||
pattern: buildx-*
|
|
||||||
merge-multiple: true
|
|
||||||
-
|
|
||||||
name: Create checksums
|
|
||||||
run: ./hack/hash-files
|
|
||||||
-
|
|
||||||
name: List artifacts
|
|
||||||
run: |
|
|
||||||
tree -nh ${{ env.DESTDIR }}
|
|
||||||
-
|
|
||||||
name: Check artifacts
|
|
||||||
run: |
|
|
||||||
find ${{ env.DESTDIR }} -type f -exec file -e ascii -- {} +
|
|
||||||
-
|
-
|
||||||
name: GitHub Release
|
name: GitHub Release
|
||||||
if: startsWith(github.ref, 'refs/tags/v')
|
if: startsWith(github.ref, 'refs/tags/v')
|
||||||
uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v0.1.15
|
uses: softprops/action-gh-release@v1
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
draft: true
|
draft: true
|
||||||
files: ${{ env.DESTDIR }}/*
|
files: ${{ env.RELEASE_OUT }}/*
|
||||||
|
|
||||||
buildkit-edge:
|
buildkit-edge:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-latest
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Checkout
|
name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v2
|
||||||
-
|
-
|
||||||
name: Set up QEMU
|
name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v1
|
||||||
-
|
-
|
||||||
name: Set up Docker Buildx
|
name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v1
|
||||||
with:
|
with:
|
||||||
version: ${{ env.BUILDX_VERSION }}
|
|
||||||
driver-opts: image=moby/buildkit:master
|
driver-opts: image=moby/buildkit:master
|
||||||
buildkitd-flags: --debug
|
buildkitd-flags: --debug
|
||||||
-
|
-
|
||||||
# Just run a bake target to check eveything runs fine
|
# Just run a bake target to check eveything runs fine
|
||||||
name: Build
|
name: Build
|
||||||
uses: docker/bake-action@v4
|
uses: docker/bake-action@v1
|
||||||
with:
|
with:
|
||||||
targets: binaries
|
targets: binaries-cross
|
||||||
|
|||||||
42
.github/workflows/codeql.yml
vendored
42
.github/workflows/codeql.yml
vendored
@@ -1,42 +0,0 @@
|
|||||||
name: codeql
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- 'master'
|
|
||||||
- 'v[0-9]*'
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
actions: read
|
|
||||||
contents: read
|
|
||||||
security-events: write
|
|
||||||
|
|
||||||
env:
|
|
||||||
GO_VERSION: "1.21"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
codeql:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
-
|
|
||||||
name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
-
|
|
||||||
name: Set up Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: ${{ env.GO_VERSION }}
|
|
||||||
-
|
|
||||||
name: Initialize CodeQL
|
|
||||||
uses: github/codeql-action/init@v3
|
|
||||||
with:
|
|
||||||
languages: go
|
|
||||||
-
|
|
||||||
name: Autobuild
|
|
||||||
uses: github/codeql-action/autobuild@v3
|
|
||||||
-
|
|
||||||
name: Perform CodeQL Analysis
|
|
||||||
uses: github/codeql-action/analyze@v3
|
|
||||||
with:
|
|
||||||
category: "/language:go"
|
|
||||||
58
.github/workflows/docs-release.yml
vendored
58
.github/workflows/docs-release.yml
vendored
@@ -1,58 +0,0 @@
|
|||||||
name: docs-release
|
|
||||||
|
|
||||||
on:
|
|
||||||
release:
|
|
||||||
types:
|
|
||||||
- released
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
open-pr:
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
if: ${{ github.event.release.prerelease != true && github.repository == 'docker/buildx' }}
|
|
||||||
steps:
|
|
||||||
-
|
|
||||||
name: Checkout docs repo
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GHPAT_DOCS_DISPATCH }}
|
|
||||||
repository: docker/docs
|
|
||||||
ref: main
|
|
||||||
-
|
|
||||||
name: Prepare
|
|
||||||
run: |
|
|
||||||
rm -rf ./_data/buildx/*
|
|
||||||
-
|
|
||||||
name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
-
|
|
||||||
name: Build docs
|
|
||||||
uses: docker/bake-action@v4
|
|
||||||
with:
|
|
||||||
source: ${{ github.server_url }}/${{ github.repository }}.git#${{ github.event.release.name }}
|
|
||||||
targets: update-docs
|
|
||||||
set: |
|
|
||||||
*.output=/tmp/buildx-docs
|
|
||||||
env:
|
|
||||||
DOCS_FORMATS: yaml
|
|
||||||
-
|
|
||||||
name: Copy files
|
|
||||||
run: |
|
|
||||||
cp /tmp/buildx-docs/out/reference/*.yaml ./_data/buildx/
|
|
||||||
-
|
|
||||||
name: Commit changes
|
|
||||||
run: |
|
|
||||||
git add -A .
|
|
||||||
-
|
|
||||||
name: Create PR on docs repo
|
|
||||||
uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GHPAT_DOCS_DISPATCH }}
|
|
||||||
push-to-fork: docker-tools-robot/docker.github.io
|
|
||||||
commit-message: "build: update buildx reference to ${{ github.event.release.name }}"
|
|
||||||
signoff: true
|
|
||||||
branch: dispatch/buildx-ref-${{ github.event.release.name }}
|
|
||||||
delete-branch: true
|
|
||||||
title: Update buildx reference to ${{ github.event.release.name }}
|
|
||||||
body: |
|
|
||||||
Update the buildx reference documentation to keep in sync with the latest release `${{ github.event.release.name }}`
|
|
||||||
draft: false
|
|
||||||
62
.github/workflows/docs-upstream.yml
vendored
62
.github/workflows/docs-upstream.yml
vendored
@@ -1,62 +0,0 @@
|
|||||||
# this workflow runs the remote validate bake target from docker/docker.github.io
|
|
||||||
# to check if yaml reference docs and markdown files used in this repo are still valid
|
|
||||||
# https://github.com/docker/docker.github.io/blob/98c7c9535063ae4cd2cd0a31478a21d16d2f07a3/docker-bake.hcl#L34-L36
|
|
||||||
name: docs-upstream
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-${{ github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- 'master'
|
|
||||||
- 'v[0-9]*'
|
|
||||||
paths:
|
|
||||||
- '.github/workflows/docs-upstream.yml'
|
|
||||||
- 'docs/**'
|
|
||||||
pull_request:
|
|
||||||
paths:
|
|
||||||
- '.github/workflows/docs-upstream.yml'
|
|
||||||
- 'docs/**'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
docs-yaml:
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
steps:
|
|
||||||
-
|
|
||||||
name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
-
|
|
||||||
name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
with:
|
|
||||||
version: latest
|
|
||||||
-
|
|
||||||
name: Build reference YAML docs
|
|
||||||
uses: docker/bake-action@v4
|
|
||||||
with:
|
|
||||||
targets: update-docs
|
|
||||||
set: |
|
|
||||||
*.output=/tmp/buildx-docs
|
|
||||||
*.cache-from=type=gha,scope=docs-yaml
|
|
||||||
*.cache-to=type=gha,scope=docs-yaml,mode=max
|
|
||||||
env:
|
|
||||||
DOCS_FORMATS: yaml
|
|
||||||
-
|
|
||||||
name: Upload reference YAML docs
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: docs-yaml
|
|
||||||
path: /tmp/buildx-docs/out/reference
|
|
||||||
retention-days: 1
|
|
||||||
|
|
||||||
validate:
|
|
||||||
uses: docker/docs/.github/workflows/validate-upstream.yml@6b73b05acb21edf7995cc5b3c6672d8e314cee7a # pin for artifact v4 support: https://github.com/docker/docs/pull/19220
|
|
||||||
needs:
|
|
||||||
- docs-yaml
|
|
||||||
with:
|
|
||||||
module-name: docker/buildx
|
|
||||||
data-files-id: docs-yaml
|
|
||||||
data-files-folder: buildx
|
|
||||||
create-placeholder-stubs: true
|
|
||||||
143
.github/workflows/e2e.yml
vendored
143
.github/workflows/e2e.yml
vendored
@@ -1,9 +1,5 @@
|
|||||||
name: e2e
|
name: e2e
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-${{ github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
push:
|
push:
|
||||||
@@ -11,52 +7,13 @@ on:
|
|||||||
- 'master'
|
- 'master'
|
||||||
- 'v[0-9]*'
|
- 'v[0-9]*'
|
||||||
pull_request:
|
pull_request:
|
||||||
paths-ignore:
|
branches:
|
||||||
- '.github/releases.json'
|
- 'master'
|
||||||
- 'README.md'
|
- 'v[0-9]*'
|
||||||
- 'docs/**'
|
|
||||||
|
|
||||||
env:
|
|
||||||
DESTDIR: "./bin"
|
|
||||||
K3S_VERSION: "v1.21.2-k3s1"
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
-
|
|
||||||
name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
with:
|
|
||||||
version: latest
|
|
||||||
-
|
|
||||||
name: Build
|
|
||||||
uses: docker/bake-action@v4
|
|
||||||
with:
|
|
||||||
targets: binaries
|
|
||||||
set: |
|
|
||||||
*.cache-from=type=gha,scope=release
|
|
||||||
*.cache-from=type=gha,scope=binaries
|
|
||||||
*.cache-to=type=gha,scope=binaries
|
|
||||||
-
|
|
||||||
name: Rename binary
|
|
||||||
run: |
|
|
||||||
mv ${{ env.DESTDIR }}/build/buildx ${{ env.DESTDIR }}/build/docker-buildx
|
|
||||||
-
|
|
||||||
name: Upload artifacts
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: binary
|
|
||||||
path: ${{ env.DESTDIR }}/build
|
|
||||||
if-no-files-found: error
|
|
||||||
retention-days: 7
|
|
||||||
|
|
||||||
driver:
|
driver:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
needs:
|
|
||||||
- build
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@@ -64,7 +21,6 @@ jobs:
|
|||||||
- docker
|
- docker
|
||||||
- docker-container
|
- docker-container
|
||||||
- kubernetes
|
- kubernetes
|
||||||
- remote
|
|
||||||
buildkit:
|
buildkit:
|
||||||
- moby/buildkit:buildx-stable-1
|
- moby/buildkit:buildx-stable-1
|
||||||
- moby/buildkit:master
|
- moby/buildkit:master
|
||||||
@@ -80,8 +36,6 @@ jobs:
|
|||||||
include:
|
include:
|
||||||
- driver: kubernetes
|
- driver: kubernetes
|
||||||
driver-opt: qemu.install=true
|
driver-opt: qemu.install=true
|
||||||
- driver: remote
|
|
||||||
endpoint: tcp://localhost:1234
|
|
||||||
exclude:
|
exclude:
|
||||||
- driver: docker
|
- driver: docker
|
||||||
multi-node: mnode-true
|
multi-node: mnode-true
|
||||||
@@ -89,28 +43,18 @@ jobs:
|
|||||||
buildkit-cfg: bkcfg-true
|
buildkit-cfg: bkcfg-true
|
||||||
- driver: docker-container
|
- driver: docker-container
|
||||||
multi-node: mnode-true
|
multi-node: mnode-true
|
||||||
- driver: remote
|
|
||||||
multi-node: mnode-true
|
|
||||||
- driver: remote
|
|
||||||
buildkit-cfg: bkcfg-true
|
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Checkout
|
name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v2
|
||||||
-
|
-
|
||||||
name: Set up QEMU
|
name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v1
|
||||||
if: matrix.driver == 'docker' || matrix.driver == 'docker-container'
|
if: matrix.driver == 'docker' || matrix.driver == 'docker-container'
|
||||||
-
|
-
|
||||||
name: Install buildx
|
name: Install buildx
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: binary
|
|
||||||
path: /home/runner/.docker/cli-plugins
|
|
||||||
-
|
|
||||||
name: Fix perms and check
|
|
||||||
run: |
|
run: |
|
||||||
chmod +x /home/runner/.docker/cli-plugins/docker-buildx
|
make install
|
||||||
docker buildx version
|
docker buildx version
|
||||||
-
|
-
|
||||||
name: Init env vars
|
name: Init env vars
|
||||||
@@ -132,78 +76,20 @@ jobs:
|
|||||||
-
|
-
|
||||||
name: Install k3s
|
name: Install k3s
|
||||||
if: matrix.driver == 'kubernetes'
|
if: matrix.driver == 'kubernetes'
|
||||||
uses: actions/github-script@v7
|
uses: debianmaster/actions-k3s@v1.0.3
|
||||||
|
id: k3s
|
||||||
with:
|
with:
|
||||||
script: |
|
version: v1.21.2-k3s1
|
||||||
const fs = require('fs');
|
|
||||||
|
|
||||||
let wait = function(milliseconds) {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
if (typeof(milliseconds) !== 'number') {
|
|
||||||
throw new Error('milleseconds not a number');
|
|
||||||
}
|
|
||||||
setTimeout(() => resolve("done!"), milliseconds)
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const kubeconfig="/tmp/buildkit-k3s/kubeconfig.yaml";
|
|
||||||
core.info(`storing kubeconfig in ${kubeconfig}`);
|
|
||||||
|
|
||||||
await exec.exec('docker', ["run", "-d",
|
|
||||||
"--privileged",
|
|
||||||
"--name=buildkit-k3s",
|
|
||||||
"-e", "K3S_KUBECONFIG_OUTPUT="+kubeconfig,
|
|
||||||
"-e", "K3S_KUBECONFIG_MODE=666",
|
|
||||||
"-v", "/tmp/buildkit-k3s:/tmp/buildkit-k3s",
|
|
||||||
"-p", "6443:6443",
|
|
||||||
"-p", "80:80",
|
|
||||||
"-p", "443:443",
|
|
||||||
"-p", "8080:8080",
|
|
||||||
"rancher/k3s:${{ env.K3S_VERSION }}", "server"
|
|
||||||
]);
|
|
||||||
await wait(10000);
|
|
||||||
|
|
||||||
core.exportVariable('KUBECONFIG', kubeconfig);
|
|
||||||
|
|
||||||
let nodeName;
|
|
||||||
for (let count = 1; count <= 5; count++) {
|
|
||||||
try {
|
|
||||||
const nodeNameOutput = await exec.getExecOutput("kubectl get nodes --no-headers -oname");
|
|
||||||
nodeName = nodeNameOutput.stdout
|
|
||||||
} catch (error) {
|
|
||||||
core.info(`Unable to resolve node name (${error.message}). Attempt ${count} of 5.`)
|
|
||||||
} finally {
|
|
||||||
if (nodeName) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
await wait(5000);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!nodeName) {
|
|
||||||
throw new Error(`Unable to resolve node name after 5 attempts.`);
|
|
||||||
}
|
|
||||||
|
|
||||||
await exec.exec(`kubectl wait --for=condition=Ready ${nodeName}`);
|
|
||||||
} catch (error) {
|
|
||||||
core.setFailed(error.message);
|
|
||||||
}
|
|
||||||
-
|
-
|
||||||
name: Print KUBECONFIG
|
name: Config k3s
|
||||||
if: matrix.driver == 'kubernetes'
|
if: matrix.driver == 'kubernetes'
|
||||||
run: |
|
run: |
|
||||||
yq ${{ env.KUBECONFIG }}
|
(set -x ; cat ${{ steps.k3s.outputs.kubeconfig }})
|
||||||
-
|
-
|
||||||
name: Launch remote buildkitd
|
name: Check k3s nodes
|
||||||
if: matrix.driver == 'remote'
|
if: matrix.driver == 'kubernetes'
|
||||||
run: |
|
run: |
|
||||||
docker run -d \
|
kubectl get nodes
|
||||||
--privileged \
|
|
||||||
--name=remote-buildkit \
|
|
||||||
-p 1234:1234 \
|
|
||||||
${{ matrix.buildkit }} \
|
|
||||||
--addr unix:///run/buildkit/buildkitd.sock \
|
|
||||||
--addr tcp://0.0.0.0:1234
|
|
||||||
-
|
-
|
||||||
name: Test
|
name: Test
|
||||||
run: |
|
run: |
|
||||||
@@ -212,5 +98,4 @@ jobs:
|
|||||||
BUILDKIT_IMAGE: ${{ matrix.buildkit }}
|
BUILDKIT_IMAGE: ${{ matrix.buildkit }}
|
||||||
DRIVER: ${{ matrix.driver }}
|
DRIVER: ${{ matrix.driver }}
|
||||||
DRIVER_OPT: ${{ matrix.driver-opt }}
|
DRIVER_OPT: ${{ matrix.driver-opt }}
|
||||||
ENDPOINT: ${{ matrix.endpoint }}
|
|
||||||
PLATFORMS: ${{ matrix.platforms }}
|
PLATFORMS: ${{ matrix.platforms }}
|
||||||
|
|||||||
25
.github/workflows/godev.yml
vendored
Normal file
25
.github/workflows/godev.yml
vendored
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
# Workflow used to make a request to proxy.golang.org to refresh cache on https://pkg.go.dev/github.com/docker/buildx
|
||||||
|
# when a released of buildx is produced
|
||||||
|
name: godev
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- 'v*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
update:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
-
|
||||||
|
name: Set up Go
|
||||||
|
uses: actions/setup-go@v2
|
||||||
|
with:
|
||||||
|
go-version: 1.13
|
||||||
|
-
|
||||||
|
name: Call pkg.go.dev
|
||||||
|
run: |
|
||||||
|
go get github.com/${GITHUB_REPOSITORY}@${GITHUB_REF#refs/tags/}
|
||||||
|
env:
|
||||||
|
GO111MODULE: on
|
||||||
|
GOPROXY: https://proxy.golang.org
|
||||||
36
.github/workflows/validate.yml
vendored
36
.github/workflows/validate.yml
vendored
@@ -1,9 +1,5 @@
|
|||||||
name: validate
|
name: validate
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-${{ github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
push:
|
push:
|
||||||
@@ -13,14 +9,13 @@ on:
|
|||||||
tags:
|
tags:
|
||||||
- 'v*'
|
- 'v*'
|
||||||
pull_request:
|
pull_request:
|
||||||
paths-ignore:
|
branches:
|
||||||
- '.github/releases.json'
|
- 'master'
|
||||||
|
- 'v[0-9]*'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
validate:
|
validate:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-latest
|
||||||
env:
|
|
||||||
GOLANGCI_LINT_MULTIPLATFORM: 1
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@@ -28,17 +23,26 @@ jobs:
|
|||||||
- lint
|
- lint
|
||||||
- validate-vendor
|
- validate-vendor
|
||||||
- validate-docs
|
- validate-docs
|
||||||
- validate-generated-files
|
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Checkout
|
name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v2
|
||||||
-
|
|
||||||
name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
with:
|
|
||||||
version: latest
|
|
||||||
-
|
-
|
||||||
name: Run
|
name: Run
|
||||||
run: |
|
run: |
|
||||||
make ${{ matrix.target }}
|
make ${{ matrix.target }}
|
||||||
|
|
||||||
|
validate-docs-yaml:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs:
|
||||||
|
- validate
|
||||||
|
steps:
|
||||||
|
-
|
||||||
|
name: Checkout
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
-
|
||||||
|
name: Run
|
||||||
|
run: |
|
||||||
|
make docs
|
||||||
|
env:
|
||||||
|
FORMATS: yaml
|
||||||
|
|||||||
5
.gitignore
vendored
5
.gitignore
vendored
@@ -1 +1,4 @@
|
|||||||
/bin
|
bin
|
||||||
|
coverage
|
||||||
|
cross-out
|
||||||
|
release-out
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
run:
|
run:
|
||||||
timeout: 30m
|
timeout: 10m
|
||||||
skip-files:
|
skip-files:
|
||||||
- ".*\\.pb\\.go$"
|
- ".*\\.pb\\.go$"
|
||||||
|
|
||||||
@@ -11,59 +11,20 @@ linters:
|
|||||||
enable:
|
enable:
|
||||||
- gofmt
|
- gofmt
|
||||||
- govet
|
- govet
|
||||||
- depguard
|
- deadcode
|
||||||
- goimports
|
- goimports
|
||||||
- ineffassign
|
- ineffassign
|
||||||
- misspell
|
- misspell
|
||||||
- unused
|
- unused
|
||||||
- revive
|
- varcheck
|
||||||
|
- golint
|
||||||
- staticcheck
|
- staticcheck
|
||||||
- typecheck
|
- typecheck
|
||||||
- nolintlint
|
- structcheck
|
||||||
- gosec
|
|
||||||
- forbidigo
|
|
||||||
disable-all: true
|
disable-all: true
|
||||||
|
|
||||||
linters-settings:
|
|
||||||
depguard:
|
|
||||||
rules:
|
|
||||||
main:
|
|
||||||
deny:
|
|
||||||
# The io/ioutil package has been deprecated.
|
|
||||||
# https://go.dev/doc/go1.16#ioutil
|
|
||||||
- pkg: "io/ioutil"
|
|
||||||
desc: The io/ioutil package has been deprecated.
|
|
||||||
forbidigo:
|
|
||||||
forbid:
|
|
||||||
- '^fmt\.Errorf(# use errors\.Errorf instead)?$'
|
|
||||||
gosec:
|
|
||||||
excludes:
|
|
||||||
- G204 # Audit use of command execution
|
|
||||||
- G402 # TLS MinVersion too low
|
|
||||||
config:
|
|
||||||
G306: "0644"
|
|
||||||
|
|
||||||
issues:
|
issues:
|
||||||
exclude-rules:
|
exclude-rules:
|
||||||
- linters:
|
- linters:
|
||||||
- revive
|
- golint
|
||||||
text: "stutters"
|
text: "stutters"
|
||||||
- linters:
|
|
||||||
- revive
|
|
||||||
text: "empty-block"
|
|
||||||
- linters:
|
|
||||||
- revive
|
|
||||||
text: "superfluous-else"
|
|
||||||
- linters:
|
|
||||||
- revive
|
|
||||||
text: "unused-parameter"
|
|
||||||
- linters:
|
|
||||||
- revive
|
|
||||||
text: "redefines-builtin-id"
|
|
||||||
- linters:
|
|
||||||
- revive
|
|
||||||
text: "if-return"
|
|
||||||
|
|
||||||
# show all
|
|
||||||
max-issues-per-linter: 0
|
|
||||||
max-same-issues: 0
|
|
||||||
|
|||||||
13
.yamllint.yml
Normal file
13
.yamllint.yml
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
ignore: |
|
||||||
|
/vendor
|
||||||
|
|
||||||
|
extends: default
|
||||||
|
|
||||||
|
yaml-files:
|
||||||
|
- '*.yaml'
|
||||||
|
- '*.yml'
|
||||||
|
|
||||||
|
rules:
|
||||||
|
truthy: disable
|
||||||
|
line-length: disable
|
||||||
|
document-start: disable
|
||||||
102
Dockerfile
102
Dockerfile
@@ -1,15 +1,12 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1.3
|
||||||
|
|
||||||
ARG GO_VERSION=1.21
|
ARG GO_VERSION=1.17
|
||||||
ARG XX_VERSION=1.4.0
|
ARG DOCKERD_VERSION=20.10.8
|
||||||
|
|
||||||
ARG DOCKER_VERSION=25.0.2
|
FROM docker:$DOCKERD_VERSION AS dockerd-release
|
||||||
ARG GOTESTSUM_VERSION=v1.9.0
|
|
||||||
ARG REGISTRY_VERSION=2.8.0
|
|
||||||
ARG BUILDKIT_VERSION=v0.12.5
|
|
||||||
|
|
||||||
# xx is a helper for cross-compilation
|
# xx is a helper for cross-compilation
|
||||||
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
|
FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.0.0 AS xx
|
||||||
|
|
||||||
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS golatest
|
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS golatest
|
||||||
|
|
||||||
@@ -17,58 +14,26 @@ FROM golatest AS gobase
|
|||||||
COPY --from=xx / /
|
COPY --from=xx / /
|
||||||
RUN apk add --no-cache file git
|
RUN apk add --no-cache file git
|
||||||
ENV GOFLAGS=-mod=vendor
|
ENV GOFLAGS=-mod=vendor
|
||||||
ENV CGO_ENABLED=0
|
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
||||||
FROM registry:$REGISTRY_VERSION AS registry
|
|
||||||
|
|
||||||
FROM moby/buildkit:$BUILDKIT_VERSION AS buildkit
|
|
||||||
|
|
||||||
FROM gobase AS docker
|
|
||||||
ARG TARGETPLATFORM
|
|
||||||
ARG DOCKER_VERSION
|
|
||||||
WORKDIR /opt/docker
|
|
||||||
RUN DOCKER_ARCH=$(case ${TARGETPLATFORM:-linux/amd64} in \
|
|
||||||
"linux/amd64") echo "x86_64" ;; \
|
|
||||||
"linux/arm/v6") echo "armel" ;; \
|
|
||||||
"linux/arm/v7") echo "armhf" ;; \
|
|
||||||
"linux/arm64") echo "aarch64" ;; \
|
|
||||||
"linux/ppc64le") echo "ppc64le" ;; \
|
|
||||||
"linux/s390x") echo "s390x" ;; \
|
|
||||||
*) echo "" ;; esac) \
|
|
||||||
&& echo "DOCKER_ARCH=$DOCKER_ARCH" \
|
|
||||||
&& wget -qO- "https://download.docker.com/linux/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz" | tar xvz --strip 1
|
|
||||||
RUN ./dockerd --version && ./containerd --version && ./ctr --version && ./runc --version
|
|
||||||
|
|
||||||
FROM gobase AS gotestsum
|
|
||||||
ARG GOTESTSUM_VERSION
|
|
||||||
ENV GOFLAGS=
|
|
||||||
RUN --mount=target=/root/.cache,type=cache \
|
|
||||||
GOBIN=/out/ go install "gotest.tools/gotestsum@${GOTESTSUM_VERSION}" && \
|
|
||||||
/out/gotestsum --version
|
|
||||||
|
|
||||||
FROM gobase AS buildx-version
|
FROM gobase AS buildx-version
|
||||||
RUN --mount=type=bind,target=. <<EOT
|
RUN --mount=target=. \
|
||||||
set -e
|
PKG=github.com/docker/buildx VERSION=$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags) REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi); \
|
||||||
mkdir /buildx-version
|
echo "-X ${PKG}/version.Version=${VERSION} -X ${PKG}/version.Revision=${REVISION} -X ${PKG}/version.Package=${PKG}" | tee /tmp/.ldflags; \
|
||||||
echo -n "$(./hack/git-meta version)" | tee /buildx-version/version
|
echo -n "${VERSION}" | tee /tmp/.version;
|
||||||
echo -n "$(./hack/git-meta revision)" | tee /buildx-version/revision
|
|
||||||
EOT
|
|
||||||
|
|
||||||
FROM gobase AS buildx-build
|
FROM gobase AS buildx-build
|
||||||
|
ENV CGO_ENABLED=0
|
||||||
|
ARG LDFLAGS="-w -s"
|
||||||
ARG TARGETPLATFORM
|
ARG TARGETPLATFORM
|
||||||
RUN --mount=type=bind,target=. \
|
RUN --mount=type=bind,target=. \
|
||||||
--mount=type=cache,target=/root/.cache \
|
--mount=type=cache,target=/root/.cache \
|
||||||
--mount=type=cache,target=/go/pkg/mod \
|
--mount=type=cache,target=/go/pkg/mod \
|
||||||
--mount=type=bind,from=buildx-version,source=/buildx-version,target=/buildx-version <<EOT
|
--mount=type=bind,source=/tmp/.ldflags,target=/tmp/.ldflags,from=buildx-version \
|
||||||
set -e
|
set -x; xx-go build -ldflags "$(cat /tmp/.ldflags) ${LDFLAGS}" -o /usr/bin/buildx ./cmd/buildx && \
|
||||||
xx-go --wrap
|
xx-verify --static /usr/bin/buildx
|
||||||
DESTDIR=/usr/bin VERSION=$(cat /buildx-version/version) REVISION=$(cat /buildx-version/revision) GO_EXTRA_LDFLAGS="-s -w" ./hack/build
|
|
||||||
xx-verify --static /usr/bin/docker-buildx
|
|
||||||
EOT
|
|
||||||
|
|
||||||
FROM gobase AS test
|
FROM buildx-build AS test
|
||||||
ENV SKIP_INTEGRATION_TESTS=1
|
|
||||||
RUN --mount=type=bind,target=. \
|
RUN --mount=type=bind,target=. \
|
||||||
--mount=type=cache,target=/root/.cache \
|
--mount=type=cache,target=/root/.cache \
|
||||||
--mount=type=cache,target=/go/pkg/mod \
|
--mount=type=cache,target=/go/pkg/mod \
|
||||||
@@ -79,56 +44,29 @@ FROM scratch AS test-coverage
|
|||||||
COPY --from=test /tmp/coverage.txt /coverage.txt
|
COPY --from=test /tmp/coverage.txt /coverage.txt
|
||||||
|
|
||||||
FROM scratch AS binaries-unix
|
FROM scratch AS binaries-unix
|
||||||
COPY --link --from=buildx-build /usr/bin/docker-buildx /buildx
|
COPY --from=buildx-build /usr/bin/buildx /
|
||||||
|
|
||||||
FROM binaries-unix AS binaries-darwin
|
FROM binaries-unix AS binaries-darwin
|
||||||
FROM binaries-unix AS binaries-linux
|
FROM binaries-unix AS binaries-linux
|
||||||
|
|
||||||
FROM scratch AS binaries-windows
|
FROM scratch AS binaries-windows
|
||||||
COPY --link --from=buildx-build /usr/bin/docker-buildx /buildx.exe
|
COPY --from=buildx-build /usr/bin/buildx /buildx.exe
|
||||||
|
|
||||||
FROM binaries-$TARGETOS AS binaries
|
FROM binaries-$TARGETOS AS binaries
|
||||||
# enable scanning for this stage
|
|
||||||
ARG BUILDKIT_SBOM_SCAN_STAGE=true
|
|
||||||
|
|
||||||
FROM gobase AS integration-test-base
|
|
||||||
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
|
|
||||||
RUN apk add --no-cache \
|
|
||||||
btrfs-progs \
|
|
||||||
e2fsprogs \
|
|
||||||
e2fsprogs-extra \
|
|
||||||
ip6tables \
|
|
||||||
iptables \
|
|
||||||
openssl \
|
|
||||||
shadow-uidmap \
|
|
||||||
xfsprogs \
|
|
||||||
xz
|
|
||||||
COPY --link --from=gotestsum /out/gotestsum /usr/bin/
|
|
||||||
COPY --link --from=registry /bin/registry /usr/bin/
|
|
||||||
COPY --link --from=docker /opt/docker/* /usr/bin/
|
|
||||||
COPY --link --from=buildkit /usr/bin/buildkitd /usr/bin/
|
|
||||||
COPY --link --from=buildkit /usr/bin/buildctl /usr/bin/
|
|
||||||
COPY --link --from=binaries /buildx /usr/bin/
|
|
||||||
|
|
||||||
FROM integration-test-base AS integration-test
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
# Release
|
# Release
|
||||||
FROM --platform=$BUILDPLATFORM alpine AS releaser
|
FROM --platform=$BUILDPLATFORM alpine AS releaser
|
||||||
WORKDIR /work
|
WORKDIR /work
|
||||||
ARG TARGETPLATFORM
|
ARG TARGETPLATFORM
|
||||||
RUN --mount=from=binaries \
|
RUN --mount=from=binaries \
|
||||||
--mount=type=bind,from=buildx-version,source=/buildx-version,target=/buildx-version <<EOT
|
--mount=type=bind,source=/tmp/.version,target=/tmp/.version,from=buildx-version \
|
||||||
set -e
|
mkdir -p /out && cp buildx* "/out/buildx-$(cat /tmp/.version).$(echo $TARGETPLATFORM | sed 's/\//-/g')$(ls buildx* | sed -e 's/^buildx//')"
|
||||||
mkdir -p /out
|
|
||||||
cp buildx* "/out/buildx-$(cat /buildx-version/version).$(echo $TARGETPLATFORM | sed 's/\//-/g')$(ls buildx* | sed -e 's/^buildx//')"
|
|
||||||
EOT
|
|
||||||
|
|
||||||
FROM scratch AS release
|
FROM scratch AS release
|
||||||
COPY --from=releaser /out/ /
|
COPY --from=releaser /out/ /
|
||||||
|
|
||||||
# Shell
|
# Shell
|
||||||
FROM docker:$DOCKER_VERSION AS dockerd-release
|
FROM docker:$DOCKERD_VERSION AS dockerd-release
|
||||||
FROM alpine AS shell
|
FROM alpine AS shell
|
||||||
RUN apk add --no-cache iptables tmux git vim less openssh
|
RUN apk add --no-cache iptables tmux git vim less openssh
|
||||||
RUN mkdir -p /usr/local/lib/docker/cli-plugins && ln -s /usr/local/bin/buildx /usr/local/lib/docker/cli-plugins/docker-buildx
|
RUN mkdir -p /usr/local/lib/docker/cli-plugins && ln -s /usr/local/bin/buildx /usr/local/lib/docker/cli-plugins/docker-buildx
|
||||||
|
|||||||
@@ -152,7 +152,6 @@ made through a pull request.
|
|||||||
people = [
|
people = [
|
||||||
"akihirosuda",
|
"akihirosuda",
|
||||||
"crazy-max",
|
"crazy-max",
|
||||||
"jedevc",
|
|
||||||
"tiborvass",
|
"tiborvass",
|
||||||
"tonistiigi",
|
"tonistiigi",
|
||||||
]
|
]
|
||||||
@@ -189,11 +188,6 @@ made through a pull request.
|
|||||||
Email = "contact@crazymax.dev"
|
Email = "contact@crazymax.dev"
|
||||||
GitHub = "crazy-max"
|
GitHub = "crazy-max"
|
||||||
|
|
||||||
[people.jedevc]
|
|
||||||
Name = "Justin Chadwell"
|
|
||||||
Email = "me@jedevc.com"
|
|
||||||
GitHub = "jedevc"
|
|
||||||
|
|
||||||
[people.thajeztah]
|
[people.thajeztah]
|
||||||
Name = "Sebastiaan van Stijn"
|
Name = "Sebastiaan van Stijn"
|
||||||
Email = "github@gone.nl"
|
Email = "github@gone.nl"
|
||||||
|
|||||||
50
Makefile
50
Makefile
@@ -4,93 +4,59 @@ else ifneq (, $(shell docker buildx version))
|
|||||||
export BUILDX_CMD = docker buildx
|
export BUILDX_CMD = docker buildx
|
||||||
else ifneq (, $(shell which buildx))
|
else ifneq (, $(shell which buildx))
|
||||||
export BUILDX_CMD = $(which buildx)
|
export BUILDX_CMD = $(which buildx)
|
||||||
|
else
|
||||||
|
$(error "Buildx is required: https://github.com/docker/buildx#installing")
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export BUILDX_CMD ?= docker buildx
|
export BIN_OUT = ./bin
|
||||||
|
export RELEASE_OUT = ./release-out
|
||||||
|
|
||||||
.PHONY: all
|
|
||||||
all: binaries
|
|
||||||
|
|
||||||
.PHONY: build
|
|
||||||
build:
|
|
||||||
./hack/build
|
|
||||||
|
|
||||||
.PHONY: shell
|
|
||||||
shell:
|
shell:
|
||||||
./hack/shell
|
./hack/shell
|
||||||
|
|
||||||
.PHONY: binaries
|
|
||||||
binaries:
|
binaries:
|
||||||
$(BUILDX_CMD) bake binaries
|
$(BUILDX_CMD) bake binaries
|
||||||
|
|
||||||
.PHONY: binaries-cross
|
|
||||||
binaries-cross:
|
binaries-cross:
|
||||||
$(BUILDX_CMD) bake binaries-cross
|
$(BUILDX_CMD) bake binaries-cross
|
||||||
|
|
||||||
.PHONY: install
|
|
||||||
install: binaries
|
install: binaries
|
||||||
mkdir -p ~/.docker/cli-plugins
|
mkdir -p ~/.docker/cli-plugins
|
||||||
install bin/build/buildx ~/.docker/cli-plugins/docker-buildx
|
install bin/buildx ~/.docker/cli-plugins/docker-buildx
|
||||||
|
|
||||||
.PHONY: release
|
|
||||||
release:
|
release:
|
||||||
./hack/release
|
./hack/release
|
||||||
|
|
||||||
.PHONY: validate-all
|
validate-all: lint test validate-vendor validate-docs
|
||||||
validate-all: lint test validate-vendor validate-docs validate-generated-files
|
|
||||||
|
|
||||||
.PHONY: lint
|
|
||||||
lint:
|
lint:
|
||||||
$(BUILDX_CMD) bake lint
|
$(BUILDX_CMD) bake lint
|
||||||
|
|
||||||
.PHONY: test
|
|
||||||
test:
|
test:
|
||||||
./hack/test
|
$(BUILDX_CMD) bake test
|
||||||
|
|
||||||
.PHONY: test-unit
|
|
||||||
test-unit:
|
|
||||||
TESTPKGS=./... SKIP_INTEGRATION_TESTS=1 ./hack/test
|
|
||||||
|
|
||||||
.PHONY: test
|
|
||||||
test-integration:
|
|
||||||
TESTPKGS=./tests ./hack/test
|
|
||||||
|
|
||||||
.PHONY: validate-vendor
|
|
||||||
validate-vendor:
|
validate-vendor:
|
||||||
$(BUILDX_CMD) bake validate-vendor
|
$(BUILDX_CMD) bake validate-vendor
|
||||||
|
|
||||||
.PHONY: validate-docs
|
|
||||||
validate-docs:
|
validate-docs:
|
||||||
$(BUILDX_CMD) bake validate-docs
|
$(BUILDX_CMD) bake validate-docs
|
||||||
|
|
||||||
.PHONY: validate-authors
|
|
||||||
validate-authors:
|
validate-authors:
|
||||||
$(BUILDX_CMD) bake validate-authors
|
$(BUILDX_CMD) bake validate-authors
|
||||||
|
|
||||||
.PHONY: validate-generated-files
|
|
||||||
validate-generated-files:
|
|
||||||
$(BUILDX_CMD) bake validate-generated-files
|
|
||||||
|
|
||||||
.PHONY: test-driver
|
|
||||||
test-driver:
|
test-driver:
|
||||||
./hack/test-driver
|
./hack/test-driver
|
||||||
|
|
||||||
.PHONY: vendor
|
|
||||||
vendor:
|
vendor:
|
||||||
./hack/update-vendor
|
./hack/update-vendor
|
||||||
|
|
||||||
.PHONY: docs
|
|
||||||
docs:
|
docs:
|
||||||
./hack/update-docs
|
./hack/update-docs
|
||||||
|
|
||||||
.PHONY: authors
|
|
||||||
authors:
|
authors:
|
||||||
$(BUILDX_CMD) bake update-authors
|
$(BUILDX_CMD) bake update-authors
|
||||||
|
|
||||||
.PHONY: mod-outdated
|
|
||||||
mod-outdated:
|
mod-outdated:
|
||||||
$(BUILDX_CMD) bake mod-outdated
|
$(BUILDX_CMD) bake mod-outdated
|
||||||
|
|
||||||
.PHONY: generated-files
|
.PHONY: shell binaries binaries-cross install release validate-all lint validate-vendor validate-docs validate-authors vendor docs authors
|
||||||
generated-files:
|
|
||||||
$(BUILDX_CMD) bake update-generated-files
|
|
||||||
|
|||||||
83
README.md
83
README.md
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
[](https://github.com/docker/buildx/releases/latest)
|
[](https://github.com/docker/buildx/releases/latest)
|
||||||
[](https://pkg.go.dev/github.com/docker/buildx)
|
[](https://pkg.go.dev/github.com/docker/buildx)
|
||||||
[](https://github.com/docker/buildx/actions?query=workflow%3Abuild)
|
[](https://github.com/docker/buildx/actions?query=workflow%3Abuild)
|
||||||
[](https://goreportcard.com/report/github.com/docker/buildx)
|
[](https://goreportcard.com/report/github.com/docker/buildx)
|
||||||
[](https://codecov.io/gh/docker/buildx)
|
[](https://codecov.io/gh/docker/buildx)
|
||||||
|
|
||||||
@@ -32,6 +32,14 @@ Key features:
|
|||||||
- [Building with buildx](#building-with-buildx)
|
- [Building with buildx](#building-with-buildx)
|
||||||
- [Working with builder instances](#working-with-builder-instances)
|
- [Working with builder instances](#working-with-builder-instances)
|
||||||
- [Building multi-platform images](#building-multi-platform-images)
|
- [Building multi-platform images](#building-multi-platform-images)
|
||||||
|
- [High-level build options](#high-level-build-options)
|
||||||
|
- [Guides](docs/guides)
|
||||||
|
- [CI/CD](docs/guides/cicd.md)
|
||||||
|
- [CNI networking](docs/guides/cni-networking.md)
|
||||||
|
- [Registry mirror](docs/guides/registry-mirror.md)
|
||||||
|
- [Resource limiting](docs/guides/resource-limiting.md)
|
||||||
|
- [Using a custom network](docs/guides/custom-network.md)
|
||||||
|
- [Using a custom registry configuration](docs/guides/custom-registry-config.md)
|
||||||
- [Reference](docs/reference/buildx.md)
|
- [Reference](docs/reference/buildx.md)
|
||||||
- [`buildx bake`](docs/reference/buildx_bake.md)
|
- [`buildx bake`](docs/reference/buildx_bake.md)
|
||||||
- [`buildx build`](docs/reference/buildx_build.md)
|
- [`buildx build`](docs/reference/buildx_build.md)
|
||||||
@@ -41,26 +49,21 @@ Key features:
|
|||||||
- [`buildx imagetools create`](docs/reference/buildx_imagetools_create.md)
|
- [`buildx imagetools create`](docs/reference/buildx_imagetools_create.md)
|
||||||
- [`buildx imagetools inspect`](docs/reference/buildx_imagetools_inspect.md)
|
- [`buildx imagetools inspect`](docs/reference/buildx_imagetools_inspect.md)
|
||||||
- [`buildx inspect`](docs/reference/buildx_inspect.md)
|
- [`buildx inspect`](docs/reference/buildx_inspect.md)
|
||||||
|
- [`buildx install`](docs/reference/buildx_install.md)
|
||||||
- [`buildx ls`](docs/reference/buildx_ls.md)
|
- [`buildx ls`](docs/reference/buildx_ls.md)
|
||||||
- [`buildx prune`](docs/reference/buildx_prune.md)
|
- [`buildx prune`](docs/reference/buildx_prune.md)
|
||||||
- [`buildx rm`](docs/reference/buildx_rm.md)
|
- [`buildx rm`](docs/reference/buildx_rm.md)
|
||||||
- [`buildx stop`](docs/reference/buildx_stop.md)
|
- [`buildx stop`](docs/reference/buildx_stop.md)
|
||||||
|
- [`buildx uninstall`](docs/reference/buildx_uninstall.md)
|
||||||
- [`buildx use`](docs/reference/buildx_use.md)
|
- [`buildx use`](docs/reference/buildx_use.md)
|
||||||
- [`buildx version`](docs/reference/buildx_version.md)
|
- [`buildx version`](docs/reference/buildx_version.md)
|
||||||
- [Contributing](#contributing)
|
- [Contributing](#contributing)
|
||||||
|
|
||||||
For more information on how to use Buildx, see
|
|
||||||
[Docker Build docs](https://docs.docker.com/build/).
|
|
||||||
|
|
||||||
# Installing
|
# Installing
|
||||||
|
|
||||||
Using `buildx` with Docker requires Docker engine 19.03 or newer.
|
Using `buildx` as a docker CLI plugin requires using Docker 19.03 or newer.
|
||||||
|
A limited set of functionality works with older versions of Docker when
|
||||||
> **Warning**
|
invoking the binary directly.
|
||||||
>
|
|
||||||
> Using an incompatible version of Docker may result in unexpected behavior,
|
|
||||||
> and will likely cause issues, especially when using Buildx builders with more
|
|
||||||
> recent versions of BuildKit.
|
|
||||||
|
|
||||||
## Windows and macOS
|
## Windows and macOS
|
||||||
|
|
||||||
@@ -69,9 +72,8 @@ for Windows and macOS.
|
|||||||
|
|
||||||
## Linux packages
|
## Linux packages
|
||||||
|
|
||||||
Docker Engine package repositories contain Docker Buildx packages when installed according to the
|
Docker Linux packages also include Docker Buildx when installed using the
|
||||||
[Docker Engine install documentation](https://docs.docker.com/engine/install/). Install the
|
[DEB or RPM packages](https://docs.docker.com/engine/install/).
|
||||||
`docker-buildx-plugin` package to install the Buildx plugin.
|
|
||||||
|
|
||||||
## Manual download
|
## Manual download
|
||||||
|
|
||||||
@@ -119,8 +121,7 @@ On Windows:
|
|||||||
Here is how to install and use Buildx inside a Dockerfile through the
|
Here is how to install and use Buildx inside a Dockerfile through the
|
||||||
[`docker/buildx-bin`](https://hub.docker.com/r/docker/buildx-bin) image:
|
[`docker/buildx-bin`](https://hub.docker.com/r/docker/buildx-bin) image:
|
||||||
|
|
||||||
```dockerfile
|
```Dockerfile
|
||||||
# syntax=docker/dockerfile:1
|
|
||||||
FROM docker
|
FROM docker
|
||||||
COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
|
COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
|
||||||
RUN docker buildx version
|
RUN docker buildx version
|
||||||
@@ -140,7 +141,7 @@ To remove this alias, run [`docker buildx uninstall`](docs/reference/buildx_unin
|
|||||||
# Buildx 0.6+
|
# Buildx 0.6+
|
||||||
$ docker buildx bake "https://github.com/docker/buildx.git"
|
$ docker buildx bake "https://github.com/docker/buildx.git"
|
||||||
$ mkdir -p ~/.docker/cli-plugins
|
$ mkdir -p ~/.docker/cli-plugins
|
||||||
$ mv ./bin/build/buildx ~/.docker/cli-plugins/docker-buildx
|
$ mv ./bin/buildx ~/.docker/cli-plugins/docker-buildx
|
||||||
|
|
||||||
# Docker 19.03+
|
# Docker 19.03+
|
||||||
$ DOCKER_BUILDKIT=1 docker build --platform=local -o . "https://github.com/docker/buildx.git"
|
$ DOCKER_BUILDKIT=1 docker build --platform=local -o . "https://github.com/docker/buildx.git"
|
||||||
@@ -182,17 +183,23 @@ specifying target platform. In addition, Buildx also supports new features that
|
|||||||
are not yet available for regular `docker build` like building manifest lists,
|
are not yet available for regular `docker build` like building manifest lists,
|
||||||
distributed caching, and exporting build results to OCI image tarballs.
|
distributed caching, and exporting build results to OCI image tarballs.
|
||||||
|
|
||||||
Buildx is flexible and can be run in different configurations that are exposed
|
Buildx is supposed to be flexible and can be run in different configurations
|
||||||
through various "drivers". Each driver defines how and where a build should
|
that are exposed through a driver concept. Currently, we support a
|
||||||
run, and have different feature sets.
|
[`docker` driver](docs/reference/buildx_create.md#docker-driver) that uses
|
||||||
|
the BuildKit library bundled into the Docker daemon binary, a
|
||||||
|
[`docker-container` driver](docs/reference/buildx_create.md#docker-container-driver)
|
||||||
|
that automatically launches BuildKit inside a Docker container and a
|
||||||
|
[`kubernetes` driver](docs/reference/buildx_create.md#kubernetes-driver) to
|
||||||
|
spin up pods with defined BuildKit container image to build your images. We
|
||||||
|
plan to add more drivers in the future.
|
||||||
|
|
||||||
We currently support the following drivers:
|
The user experience of using buildx is very similar across drivers, but there
|
||||||
- The `docker` driver ([guide](docs/manuals/drivers/docker.md), [reference](https://docs.docker.com/engine/reference/commandline/buildx_create/#driver))
|
are some features that are not currently supported by the `docker` driver,
|
||||||
- The `docker-container` driver ([guide](docs/manuals/drivers/docker-container.md), [reference](https://docs.docker.com/engine/reference/commandline/buildx_create/#driver))
|
because the BuildKit library bundled into docker daemon currently uses a
|
||||||
- The `kubernetes` driver ([guide](docs/manuals/drivers/kubernetes.md), [reference](https://docs.docker.com/engine/reference/commandline/buildx_create/#driver))
|
different storage component. In contrast, all images built with `docker` driver
|
||||||
- The `remote` driver ([guide](docs/manuals/drivers/remote.md))
|
are automatically added to the `docker images` view by default, whereas when
|
||||||
|
using other drivers the method for outputting an image needs to be selected
|
||||||
For more information on drivers, see the [drivers guide](docs/manuals/drivers/index.md).
|
with `--output`.
|
||||||
|
|
||||||
## Working with builder instances
|
## Working with builder instances
|
||||||
|
|
||||||
@@ -295,7 +302,6 @@ inside your Dockerfile and can be leveraged by the processes running as part
|
|||||||
of your build.
|
of your build.
|
||||||
|
|
||||||
```dockerfile
|
```dockerfile
|
||||||
# syntax=docker/dockerfile:1
|
|
||||||
FROM --platform=$BUILDPLATFORM golang:alpine AS build
|
FROM --platform=$BUILDPLATFORM golang:alpine AS build
|
||||||
ARG TARGETPLATFORM
|
ARG TARGETPLATFORM
|
||||||
ARG BUILDPLATFORM
|
ARG BUILDPLATFORM
|
||||||
@@ -309,7 +315,26 @@ cross-compilation helpers for more advanced use-cases.
|
|||||||
|
|
||||||
## High-level build options
|
## High-level build options
|
||||||
|
|
||||||
See [High-level builds with Bake](https://docs.docker.com/build/bake/) for more details.
|
Buildx also aims to provide support for high-level build concepts that go beyond
|
||||||
|
invoking a single build command. We want to support building all the images in
|
||||||
|
your application together and let the users define project specific reusable
|
||||||
|
build flows that can then be easily invoked by anyone.
|
||||||
|
|
||||||
|
BuildKit efficiently handles multiple concurrent build requests and
|
||||||
|
de-duplicating work. The build commands can be combined with general-purpose
|
||||||
|
command runners (for example, `make`). However, these tools generally invoke
|
||||||
|
builds in sequence and therefore cannot leverage the full potential of BuildKit
|
||||||
|
parallelization, or combine BuildKit’s output for the user. For this use case,
|
||||||
|
we have added a command called [`docker buildx bake`](docs/reference/buildx_bake.md).
|
||||||
|
|
||||||
|
The `bake` command supports building images from compose files, similar to
|
||||||
|
[`docker-compose build`](https://docs.docker.com/compose/reference/build/),
|
||||||
|
but allowing all the services to be built concurrently as part of a single
|
||||||
|
request.
|
||||||
|
|
||||||
|
There is also support for custom build rules from HCL/JSON files allowing
|
||||||
|
better code reuse and different target groups. The design of bake is in very
|
||||||
|
early stages and we are looking for feedback from users.
|
||||||
|
|
||||||
# Contributing
|
# Contributing
|
||||||
|
|
||||||
|
|||||||
777
bake/bake.go
777
bake/bake.go
File diff suppressed because it is too large
Load Diff
@@ -3,16 +3,15 @@ package bake
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestReadTargets(t *testing.T) {
|
func TestReadTargets(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
fp := File{
|
fp := File{
|
||||||
Name: "config.hcl",
|
Name: "config.hcl",
|
||||||
Data: []byte(`
|
Data: []byte(`
|
||||||
@@ -22,8 +21,6 @@ target "webDEP" {
|
|||||||
VAR_BOTH = "webDEP"
|
VAR_BOTH = "webDEP"
|
||||||
}
|
}
|
||||||
no-cache = true
|
no-cache = true
|
||||||
shm-size = "128m"
|
|
||||||
ulimits = ["nofile=1024:1024"]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
target "webapp" {
|
target "webapp" {
|
||||||
@@ -38,25 +35,21 @@ target "webapp" {
|
|||||||
ctx := context.TODO()
|
ctx := context.TODO()
|
||||||
|
|
||||||
t.Run("NoOverrides", func(t *testing.T) {
|
t.Run("NoOverrides", func(t *testing.T) {
|
||||||
t.Parallel()
|
|
||||||
m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, nil, nil)
|
m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(m))
|
require.Equal(t, 1, len(m))
|
||||||
|
|
||||||
require.Equal(t, "Dockerfile.webapp", *m["webapp"].Dockerfile)
|
require.Equal(t, "Dockerfile.webapp", *m["webapp"].Dockerfile)
|
||||||
require.Equal(t, ".", *m["webapp"].Context)
|
require.Equal(t, ".", *m["webapp"].Context)
|
||||||
require.Equal(t, ptrstr("webDEP"), m["webapp"].Args["VAR_INHERITED"])
|
require.Equal(t, "webDEP", m["webapp"].Args["VAR_INHERITED"])
|
||||||
require.Equal(t, true, *m["webapp"].NoCache)
|
require.Equal(t, true, *m["webapp"].NoCache)
|
||||||
require.Equal(t, "128m", *m["webapp"].ShmSize)
|
|
||||||
require.Equal(t, []string{"nofile=1024:1024"}, m["webapp"].Ulimits)
|
|
||||||
require.Nil(t, m["webapp"].Pull)
|
require.Nil(t, m["webapp"].Pull)
|
||||||
|
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"webapp"}, g["default"].Targets)
|
require.Equal(t, []string{"webapp"}, g[0].Targets)
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("InvalidTargetOverrides", func(t *testing.T) {
|
t.Run("InvalidTargetOverrides", func(t *testing.T) {
|
||||||
t.Parallel()
|
|
||||||
_, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"nosuchtarget.context=foo"}, nil)
|
_, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"nosuchtarget.context=foo"}, nil)
|
||||||
require.NotNil(t, err)
|
require.NotNil(t, err)
|
||||||
require.Equal(t, err.Error(), "could not find any target matching 'nosuchtarget'")
|
require.Equal(t, err.Error(), "could not find any target matching 'nosuchtarget'")
|
||||||
@@ -64,7 +57,8 @@ target "webapp" {
|
|||||||
|
|
||||||
t.Run("ArgsOverrides", func(t *testing.T) {
|
t.Run("ArgsOverrides", func(t *testing.T) {
|
||||||
t.Run("leaf", func(t *testing.T) {
|
t.Run("leaf", func(t *testing.T) {
|
||||||
t.Setenv("VAR_FROMENV"+t.Name(), "fromEnv")
|
os.Setenv("VAR_FROMENV"+t.Name(), "fromEnv")
|
||||||
|
defer os.Unsetenv("VAR_FROM_ENV" + t.Name())
|
||||||
|
|
||||||
m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{
|
m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{
|
||||||
"webapp.args.VAR_UNSET",
|
"webapp.args.VAR_UNSET",
|
||||||
@@ -85,35 +79,33 @@ target "webapp" {
|
|||||||
_, isSet = m["webapp"].Args["VAR_EMPTY"]
|
_, isSet = m["webapp"].Args["VAR_EMPTY"]
|
||||||
require.True(t, isSet, m["webapp"].Args["VAR_EMPTY"])
|
require.True(t, isSet, m["webapp"].Args["VAR_EMPTY"])
|
||||||
|
|
||||||
require.Equal(t, ptrstr("bananas"), m["webapp"].Args["VAR_SET"])
|
require.Equal(t, m["webapp"].Args["VAR_SET"], "bananas")
|
||||||
|
|
||||||
require.Equal(t, ptrstr("fromEnv"), m["webapp"].Args["VAR_FROMENV"+t.Name()])
|
require.Equal(t, m["webapp"].Args["VAR_FROMENV"+t.Name()], "fromEnv")
|
||||||
|
|
||||||
require.Equal(t, ptrstr("webapp"), m["webapp"].Args["VAR_BOTH"])
|
require.Equal(t, m["webapp"].Args["VAR_BOTH"], "webapp")
|
||||||
require.Equal(t, ptrstr("override"), m["webapp"].Args["VAR_INHERITED"])
|
require.Equal(t, m["webapp"].Args["VAR_INHERITED"], "override")
|
||||||
|
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"webapp"}, g["default"].Targets)
|
require.Equal(t, []string{"webapp"}, g[0].Targets)
|
||||||
})
|
})
|
||||||
|
|
||||||
// building leaf but overriding parent fields
|
// building leaf but overriding parent fields
|
||||||
t.Run("parent", func(t *testing.T) {
|
t.Run("parent", func(t *testing.T) {
|
||||||
t.Parallel()
|
|
||||||
m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{
|
m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{
|
||||||
"webDEP.args.VAR_INHERITED=override",
|
"webDEP.args.VAR_INHERITED=override",
|
||||||
"webDEP.args.VAR_BOTH=override",
|
"webDEP.args.VAR_BOTH=override",
|
||||||
}, nil)
|
}, nil)
|
||||||
|
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, ptrstr("override"), m["webapp"].Args["VAR_INHERITED"])
|
require.Equal(t, m["webapp"].Args["VAR_INHERITED"], "override")
|
||||||
require.Equal(t, ptrstr("webapp"), m["webapp"].Args["VAR_BOTH"])
|
require.Equal(t, m["webapp"].Args["VAR_BOTH"], "webapp")
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"webapp"}, g["default"].Targets)
|
require.Equal(t, []string{"webapp"}, g[0].Targets)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("ContextOverride", func(t *testing.T) {
|
t.Run("ContextOverride", func(t *testing.T) {
|
||||||
t.Parallel()
|
|
||||||
_, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.context"}, nil)
|
_, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.context"}, nil)
|
||||||
require.NotNil(t, err)
|
require.NotNil(t, err)
|
||||||
|
|
||||||
@@ -121,53 +113,44 @@ target "webapp" {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, "foo", *m["webapp"].Context)
|
require.Equal(t, "foo", *m["webapp"].Context)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"webapp"}, g["default"].Targets)
|
require.Equal(t, []string{"webapp"}, g[0].Targets)
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("NoCacheOverride", func(t *testing.T) {
|
t.Run("NoCacheOverride", func(t *testing.T) {
|
||||||
t.Parallel()
|
|
||||||
m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.no-cache=false"}, nil)
|
m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.no-cache=false"}, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, false, *m["webapp"].NoCache)
|
require.Equal(t, false, *m["webapp"].NoCache)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"webapp"}, g["default"].Targets)
|
require.Equal(t, []string{"webapp"}, g[0].Targets)
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("ShmSizeOverride", func(t *testing.T) {
|
|
||||||
m, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.shm-size=256m"}, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, "256m", *m["webapp"].ShmSize)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("PullOverride", func(t *testing.T) {
|
t.Run("PullOverride", func(t *testing.T) {
|
||||||
t.Parallel()
|
|
||||||
m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.pull=false"}, nil)
|
m, g, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.pull=false"}, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, false, *m["webapp"].Pull)
|
require.Equal(t, false, *m["webapp"].Pull)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"webapp"}, g["default"].Targets)
|
require.Equal(t, []string{"webapp"}, g[0].Targets)
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("PatternOverride", func(t *testing.T) {
|
t.Run("PatternOverride", func(t *testing.T) {
|
||||||
t.Parallel()
|
|
||||||
// same check for two cases
|
// same check for two cases
|
||||||
multiTargetCheck := func(t *testing.T, m map[string]*Target, g map[string]*Group, err error) {
|
multiTargetCheck := func(t *testing.T, m map[string]*Target, g []*Group, err error) {
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 2, len(m))
|
require.Equal(t, 2, len(m))
|
||||||
require.Equal(t, "foo", *m["webapp"].Dockerfile)
|
require.Equal(t, "foo", *m["webapp"].Dockerfile)
|
||||||
require.Equal(t, ptrstr("webDEP"), m["webapp"].Args["VAR_INHERITED"])
|
require.Equal(t, "webDEP", m["webapp"].Args["VAR_INHERITED"])
|
||||||
require.Equal(t, "foo", *m["webDEP"].Dockerfile)
|
require.Equal(t, "foo", *m["webDEP"].Dockerfile)
|
||||||
require.Equal(t, ptrstr("webDEP"), m["webDEP"].Args["VAR_INHERITED"])
|
require.Equal(t, "webDEP", m["webDEP"].Args["VAR_INHERITED"])
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
sort.Strings(g["default"].Targets)
|
sort.Strings(g[0].Targets)
|
||||||
require.Equal(t, []string{"webDEP", "webapp"}, g["default"].Targets)
|
require.Equal(t, []string{"webDEP", "webapp"}, g[0].Targets)
|
||||||
}
|
}
|
||||||
|
|
||||||
cases := []struct {
|
cases := []struct {
|
||||||
name string
|
name string
|
||||||
targets []string
|
targets []string
|
||||||
overrides []string
|
overrides []string
|
||||||
check func(*testing.T, map[string]*Target, map[string]*Group, error)
|
check func(*testing.T, map[string]*Target, []*Group, error)
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "multi target single pattern",
|
name: "multi target single pattern",
|
||||||
@@ -185,20 +168,20 @@ target "webapp" {
|
|||||||
name: "single target",
|
name: "single target",
|
||||||
targets: []string{"webapp"},
|
targets: []string{"webapp"},
|
||||||
overrides: []string{"web*.dockerfile=foo"},
|
overrides: []string{"web*.dockerfile=foo"},
|
||||||
check: func(t *testing.T, m map[string]*Target, g map[string]*Group, err error) {
|
check: func(t *testing.T, m map[string]*Target, g []*Group, err error) {
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(m))
|
require.Equal(t, 1, len(m))
|
||||||
require.Equal(t, "foo", *m["webapp"].Dockerfile)
|
require.Equal(t, "foo", *m["webapp"].Dockerfile)
|
||||||
require.Equal(t, ptrstr("webDEP"), m["webapp"].Args["VAR_INHERITED"])
|
require.Equal(t, "webDEP", m["webapp"].Args["VAR_INHERITED"])
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"webapp"}, g["default"].Targets)
|
require.Equal(t, []string{"webapp"}, g[0].Targets)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "nomatch",
|
name: "nomatch",
|
||||||
targets: []string{"webapp"},
|
targets: []string{"webapp"},
|
||||||
overrides: []string{"nomatch*.dockerfile=foo"},
|
overrides: []string{"nomatch*.dockerfile=foo"},
|
||||||
check: func(t *testing.T, m map[string]*Target, g map[string]*Group, err error) {
|
check: func(t *testing.T, m map[string]*Target, g []*Group, err error) {
|
||||||
// NOTE: I am unsure whether failing to match should always error out
|
// NOTE: I am unsure whether failing to match should always error out
|
||||||
// instead of simply skipping that override.
|
// instead of simply skipping that override.
|
||||||
// Let's enforce the error and we can relax it later if users complain.
|
// Let's enforce the error and we can relax it later if users complain.
|
||||||
@@ -295,19 +278,9 @@ services:
|
|||||||
`),
|
`),
|
||||||
}
|
}
|
||||||
|
|
||||||
fp3 := File{
|
|
||||||
Name: "docker-compose3.yml",
|
|
||||||
Data: []byte(
|
|
||||||
`version: "3"
|
|
||||||
services:
|
|
||||||
webapp:
|
|
||||||
entrypoint: echo 1
|
|
||||||
`),
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := context.TODO()
|
ctx := context.TODO()
|
||||||
|
|
||||||
m, g, err := ReadTargets(ctx, []File{fp, fp2, fp3}, []string{"default"}, nil, nil)
|
m, g, err := ReadTargets(ctx, []File{fp, fp2}, []string{"default"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
require.Equal(t, 3, len(m))
|
require.Equal(t, 3, len(m))
|
||||||
@@ -316,76 +289,15 @@ services:
|
|||||||
require.True(t, ok)
|
require.True(t, ok)
|
||||||
require.Equal(t, "Dockerfile.webapp", *m["webapp"].Dockerfile)
|
require.Equal(t, "Dockerfile.webapp", *m["webapp"].Dockerfile)
|
||||||
require.Equal(t, ".", *m["webapp"].Context)
|
require.Equal(t, ".", *m["webapp"].Context)
|
||||||
require.Equal(t, ptrstr("1"), m["webapp"].Args["buildno"])
|
require.Equal(t, "1", m["webapp"].Args["buildno"])
|
||||||
require.Equal(t, ptrstr("12"), m["webapp"].Args["buildno2"])
|
require.Equal(t, "12", m["webapp"].Args["buildno2"])
|
||||||
|
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
sort.Strings(g["default"].Targets)
|
sort.Strings(g[0].Targets)
|
||||||
require.Equal(t, []string{"db", "newservice", "webapp"}, g["default"].Targets)
|
require.Equal(t, []string{"db", "newservice", "webapp"}, g[0].Targets)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestReadTargetsWithDotCompose(t *testing.T) {
|
func TestHCLCwdPrefix(t *testing.T) {
|
||||||
t.Parallel()
|
|
||||||
|
|
||||||
fp := File{
|
|
||||||
Name: "docker-compose.yml",
|
|
||||||
Data: []byte(
|
|
||||||
`version: "3"
|
|
||||||
services:
|
|
||||||
web.app:
|
|
||||||
build:
|
|
||||||
dockerfile: Dockerfile.webapp
|
|
||||||
args:
|
|
||||||
buildno: 1
|
|
||||||
`),
|
|
||||||
}
|
|
||||||
|
|
||||||
fp2 := File{
|
|
||||||
Name: "docker-compose2.yml",
|
|
||||||
Data: []byte(
|
|
||||||
`version: "3"
|
|
||||||
services:
|
|
||||||
web_app:
|
|
||||||
build:
|
|
||||||
args:
|
|
||||||
buildno2: 12
|
|
||||||
`),
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := context.TODO()
|
|
||||||
|
|
||||||
m, _, err := ReadTargets(ctx, []File{fp}, []string{"web.app"}, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, 1, len(m))
|
|
||||||
_, ok := m["web_app"]
|
|
||||||
require.True(t, ok)
|
|
||||||
require.Equal(t, "Dockerfile.webapp", *m["web_app"].Dockerfile)
|
|
||||||
require.Equal(t, ptrstr("1"), m["web_app"].Args["buildno"])
|
|
||||||
|
|
||||||
m, _, err = ReadTargets(ctx, []File{fp2}, []string{"web_app"}, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, 1, len(m))
|
|
||||||
_, ok = m["web_app"]
|
|
||||||
require.True(t, ok)
|
|
||||||
require.Equal(t, "Dockerfile", *m["web_app"].Dockerfile)
|
|
||||||
require.Equal(t, ptrstr("12"), m["web_app"].Args["buildno2"])
|
|
||||||
|
|
||||||
m, g, err := ReadTargets(ctx, []File{fp, fp2}, []string{"default"}, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, 1, len(m))
|
|
||||||
_, ok = m["web_app"]
|
|
||||||
require.True(t, ok)
|
|
||||||
require.Equal(t, "Dockerfile.webapp", *m["web_app"].Dockerfile)
|
|
||||||
require.Equal(t, ".", *m["web_app"].Context)
|
|
||||||
require.Equal(t, ptrstr("1"), m["web_app"].Args["buildno"])
|
|
||||||
require.Equal(t, ptrstr("12"), m["web_app"].Args["buildno2"])
|
|
||||||
|
|
||||||
require.Equal(t, 1, len(g))
|
|
||||||
sort.Strings(g["default"].Targets)
|
|
||||||
require.Equal(t, []string{"web_app"}, g["default"].Targets)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHCLContextCwdPrefix(t *testing.T) {
|
|
||||||
fp := File{
|
fp := File{
|
||||||
Name: "docker-bake.hcl",
|
Name: "docker-bake.hcl",
|
||||||
Data: []byte(
|
Data: []byte(
|
||||||
@@ -398,49 +310,18 @@ func TestHCLContextCwdPrefix(t *testing.T) {
|
|||||||
m, g, err := ReadTargets(ctx, []File{fp}, []string{"app"}, nil, nil)
|
m, g, err := ReadTargets(ctx, []File{fp}, []string{"app"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
bo, err := TargetsToBuildOpt(m, &Input{})
|
require.Equal(t, 1, len(m))
|
||||||
|
_, ok := m["app"]
|
||||||
|
require.True(t, ok)
|
||||||
|
|
||||||
|
_, err = TargetsToBuildOpt(m, &Input{})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
require.Equal(t, "test", *m["app"].Dockerfile)
|
||||||
|
require.Equal(t, "foo", *m["app"].Context)
|
||||||
|
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"app"}, g["default"].Targets)
|
require.Equal(t, []string{"app"}, g[0].Targets)
|
||||||
|
|
||||||
require.Equal(t, 1, len(m))
|
|
||||||
require.Contains(t, m, "app")
|
|
||||||
assert.Equal(t, "test", *m["app"].Dockerfile)
|
|
||||||
assert.Equal(t, "foo", *m["app"].Context)
|
|
||||||
assert.Equal(t, "foo/test", bo["app"].Inputs.DockerfilePath)
|
|
||||||
assert.Equal(t, "foo", bo["app"].Inputs.ContextPath)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHCLDockerfileCwdPrefix(t *testing.T) {
|
|
||||||
fp := File{
|
|
||||||
Name: "docker-bake.hcl",
|
|
||||||
Data: []byte(
|
|
||||||
`target "app" {
|
|
||||||
context = "."
|
|
||||||
dockerfile = "cwd://Dockerfile.app"
|
|
||||||
}`),
|
|
||||||
}
|
|
||||||
ctx := context.TODO()
|
|
||||||
|
|
||||||
cwd, err := os.Getwd()
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
m, g, err := ReadTargets(ctx, []File{fp}, []string{"app"}, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
bo, err := TargetsToBuildOpt(m, &Input{})
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
require.Equal(t, 1, len(g))
|
|
||||||
require.Equal(t, []string{"app"}, g["default"].Targets)
|
|
||||||
|
|
||||||
require.Equal(t, 1, len(m))
|
|
||||||
require.Contains(t, m, "app")
|
|
||||||
assert.Equal(t, "cwd://Dockerfile.app", *m["app"].Dockerfile)
|
|
||||||
assert.Equal(t, ".", *m["app"].Context)
|
|
||||||
assert.Equal(t, filepath.Join(cwd, "Dockerfile.app"), bo["app"].Inputs.DockerfilePath)
|
|
||||||
assert.Equal(t, ".", bo["app"].Inputs.ContextPath)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestOverrideMerge(t *testing.T) {
|
func TestOverrideMerge(t *testing.T) {
|
||||||
@@ -565,41 +446,6 @@ func TestReadContextFromTargetUnknown(t *testing.T) {
|
|||||||
require.Error(t, err)
|
require.Error(t, err)
|
||||||
require.Contains(t, err.Error(), "failed to find target bar")
|
require.Contains(t, err.Error(), "failed to find target bar")
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestReadEmptyTargets(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
|
|
||||||
fp := File{
|
|
||||||
Name: "docker-bake.hcl",
|
|
||||||
Data: []byte(`target "app1" {}`),
|
|
||||||
}
|
|
||||||
|
|
||||||
fp2 := File{
|
|
||||||
Name: "docker-compose.yml",
|
|
||||||
Data: []byte(`
|
|
||||||
services:
|
|
||||||
app2:
|
|
||||||
build: {}
|
|
||||||
`),
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := context.TODO()
|
|
||||||
|
|
||||||
m, _, err := ReadTargets(ctx, []File{fp, fp2}, []string{"app1", "app2"}, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
require.Equal(t, 2, len(m))
|
|
||||||
_, ok := m["app1"]
|
|
||||||
require.True(t, ok)
|
|
||||||
_, ok = m["app2"]
|
|
||||||
require.True(t, ok)
|
|
||||||
|
|
||||||
require.Equal(t, "Dockerfile", *m["app1"].Dockerfile)
|
|
||||||
require.Equal(t, ".", *m["app1"].Context)
|
|
||||||
require.Equal(t, "Dockerfile", *m["app2"].Dockerfile)
|
|
||||||
require.Equal(t, ".", *m["app2"].Context)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestReadContextFromTargetChain(t *testing.T) {
|
func TestReadContextFromTargetChain(t *testing.T) {
|
||||||
ctx := context.TODO()
|
ctx := context.TODO()
|
||||||
fp := File{
|
fp := File{
|
||||||
@@ -744,7 +590,7 @@ target "image" {
|
|||||||
m, g, err := ReadTargets(ctx, []File{f}, []string{"image"}, nil, nil)
|
m, g, err := ReadTargets(ctx, []File{f}, []string{"image"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"image"}, g["default"].Targets)
|
require.Equal(t, []string{"image"}, g[0].Targets)
|
||||||
require.Equal(t, 1, len(m))
|
require.Equal(t, 1, len(m))
|
||||||
require.Equal(t, "test", *m["image"].Dockerfile)
|
require.Equal(t, "test", *m["image"].Dockerfile)
|
||||||
}
|
}
|
||||||
@@ -765,9 +611,8 @@ target "image" {
|
|||||||
|
|
||||||
m, g, err := ReadTargets(ctx, []File{f}, []string{"foo"}, nil, nil)
|
m, g, err := ReadTargets(ctx, []File{f}, []string{"foo"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 2, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"foo"}, g["default"].Targets)
|
require.Equal(t, []string{"image"}, g[0].Targets)
|
||||||
require.Equal(t, []string{"image"}, g["foo"].Targets)
|
|
||||||
require.Equal(t, 1, len(m))
|
require.Equal(t, 1, len(m))
|
||||||
require.Equal(t, "test", *m["image"].Dockerfile)
|
require.Equal(t, "test", *m["image"].Dockerfile)
|
||||||
}
|
}
|
||||||
@@ -791,17 +636,15 @@ target "image" {
|
|||||||
|
|
||||||
m, g, err := ReadTargets(ctx, []File{f}, []string{"foo"}, nil, nil)
|
m, g, err := ReadTargets(ctx, []File{f}, []string{"foo"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 2, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"foo"}, g["default"].Targets)
|
require.Equal(t, []string{"image"}, g[0].Targets)
|
||||||
require.Equal(t, []string{"image"}, g["foo"].Targets)
|
|
||||||
require.Equal(t, 1, len(m))
|
require.Equal(t, 1, len(m))
|
||||||
require.Equal(t, "test", *m["image"].Dockerfile)
|
require.Equal(t, "test", *m["image"].Dockerfile)
|
||||||
|
|
||||||
m, g, err = ReadTargets(ctx, []File{f}, []string{"foo", "foo"}, nil, nil)
|
m, g, err = ReadTargets(ctx, []File{f}, []string{"foo", "foo"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 2, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"foo"}, g["default"].Targets)
|
require.Equal(t, []string{"image"}, g[0].Targets)
|
||||||
require.Equal(t, []string{"image"}, g["foo"].Targets)
|
|
||||||
require.Equal(t, 1, len(m))
|
require.Equal(t, 1, len(m))
|
||||||
require.Equal(t, "test", *m["image"].Dockerfile)
|
require.Equal(t, "test", *m["image"].Dockerfile)
|
||||||
}
|
}
|
||||||
@@ -880,7 +723,7 @@ services:
|
|||||||
m, g, err := ReadTargets(ctx, []File{fhcl}, []string{"default"}, nil, nil)
|
m, g, err := ReadTargets(ctx, []File{fhcl}, []string{"default"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"image"}, g["default"].Targets)
|
require.Equal(t, []string{"image"}, g[0].Targets)
|
||||||
require.Equal(t, 1, len(m))
|
require.Equal(t, 1, len(m))
|
||||||
require.Equal(t, 1, len(m["image"].Outputs))
|
require.Equal(t, 1, len(m["image"].Outputs))
|
||||||
require.Equal(t, "type=docker", m["image"].Outputs[0])
|
require.Equal(t, "type=docker", m["image"].Outputs[0])
|
||||||
@@ -888,7 +731,7 @@ services:
|
|||||||
m, g, err = ReadTargets(ctx, []File{fhcl}, []string{"image-release"}, nil, nil)
|
m, g, err = ReadTargets(ctx, []File{fhcl}, []string{"image-release"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"image-release"}, g["default"].Targets)
|
require.Equal(t, []string{"image-release"}, g[0].Targets)
|
||||||
require.Equal(t, 1, len(m))
|
require.Equal(t, 1, len(m))
|
||||||
require.Equal(t, 1, len(m["image-release"].Outputs))
|
require.Equal(t, 1, len(m["image-release"].Outputs))
|
||||||
require.Equal(t, "type=image,push=true", m["image-release"].Outputs[0])
|
require.Equal(t, "type=image,push=true", m["image-release"].Outputs[0])
|
||||||
@@ -896,7 +739,7 @@ services:
|
|||||||
m, g, err = ReadTargets(ctx, []File{fhcl}, []string{"image", "image-release"}, nil, nil)
|
m, g, err = ReadTargets(ctx, []File{fhcl}, []string{"image", "image-release"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"image", "image-release"}, g["default"].Targets)
|
require.Equal(t, []string{"image", "image-release"}, g[0].Targets)
|
||||||
require.Equal(t, 2, len(m))
|
require.Equal(t, 2, len(m))
|
||||||
require.Equal(t, ".", *m["image"].Context)
|
require.Equal(t, ".", *m["image"].Context)
|
||||||
require.Equal(t, 1, len(m["image-release"].Outputs))
|
require.Equal(t, 1, len(m["image-release"].Outputs))
|
||||||
@@ -905,22 +748,22 @@ services:
|
|||||||
m, g, err = ReadTargets(ctx, []File{fyml, fhcl}, []string{"default"}, nil, nil)
|
m, g, err = ReadTargets(ctx, []File{fyml, fhcl}, []string{"default"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"image"}, g["default"].Targets)
|
require.Equal(t, []string{"image"}, g[0].Targets)
|
||||||
require.Equal(t, 1, len(m))
|
require.Equal(t, 1, len(m))
|
||||||
require.Equal(t, ".", *m["image"].Context)
|
require.Equal(t, ".", *m["image"].Context)
|
||||||
|
|
||||||
m, g, err = ReadTargets(ctx, []File{fjson}, []string{"default"}, nil, nil)
|
m, g, err = ReadTargets(ctx, []File{fjson}, []string{"default"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"image"}, g["default"].Targets)
|
require.Equal(t, []string{"image"}, g[0].Targets)
|
||||||
require.Equal(t, 1, len(m))
|
require.Equal(t, 1, len(m))
|
||||||
require.Equal(t, ".", *m["image"].Context)
|
require.Equal(t, ".", *m["image"].Context)
|
||||||
|
|
||||||
m, g, err = ReadTargets(ctx, []File{fyml}, []string{"default"}, nil, nil)
|
m, g, err = ReadTargets(ctx, []File{fyml}, []string{"default"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
sort.Strings(g["default"].Targets)
|
sort.Strings(g[0].Targets)
|
||||||
require.Equal(t, []string{"addon", "aws"}, g["default"].Targets)
|
require.Equal(t, []string{"addon", "aws"}, g[0].Targets)
|
||||||
require.Equal(t, 2, len(m))
|
require.Equal(t, 2, len(m))
|
||||||
require.Equal(t, "./Dockerfile", *m["addon"].Dockerfile)
|
require.Equal(t, "./Dockerfile", *m["addon"].Dockerfile)
|
||||||
require.Equal(t, "./aws.Dockerfile", *m["aws"].Dockerfile)
|
require.Equal(t, "./aws.Dockerfile", *m["aws"].Dockerfile)
|
||||||
@@ -928,8 +771,8 @@ services:
|
|||||||
m, g, err = ReadTargets(ctx, []File{fyml, fhcl}, []string{"addon", "aws"}, nil, nil)
|
m, g, err = ReadTargets(ctx, []File{fyml, fhcl}, []string{"addon", "aws"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
sort.Strings(g["default"].Targets)
|
sort.Strings(g[0].Targets)
|
||||||
require.Equal(t, []string{"addon", "aws"}, g["default"].Targets)
|
require.Equal(t, []string{"addon", "aws"}, g[0].Targets)
|
||||||
require.Equal(t, 2, len(m))
|
require.Equal(t, 2, len(m))
|
||||||
require.Equal(t, "./Dockerfile", *m["addon"].Dockerfile)
|
require.Equal(t, "./Dockerfile", *m["addon"].Dockerfile)
|
||||||
require.Equal(t, "./aws.Dockerfile", *m["aws"].Dockerfile)
|
require.Equal(t, "./aws.Dockerfile", *m["aws"].Dockerfile)
|
||||||
@@ -937,8 +780,8 @@ services:
|
|||||||
m, g, err = ReadTargets(ctx, []File{fyml, fhcl}, []string{"addon", "aws", "image"}, nil, nil)
|
m, g, err = ReadTargets(ctx, []File{fyml, fhcl}, []string{"addon", "aws", "image"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
sort.Strings(g["default"].Targets)
|
sort.Strings(g[0].Targets)
|
||||||
require.Equal(t, []string{"addon", "aws", "image"}, g["default"].Targets)
|
require.Equal(t, []string{"addon", "aws", "image"}, g[0].Targets)
|
||||||
require.Equal(t, 3, len(m))
|
require.Equal(t, 3, len(m))
|
||||||
require.Equal(t, ".", *m["image"].Context)
|
require.Equal(t, ".", *m["image"].Context)
|
||||||
require.Equal(t, "./Dockerfile", *m["addon"].Dockerfile)
|
require.Equal(t, "./Dockerfile", *m["addon"].Dockerfile)
|
||||||
@@ -964,17 +807,15 @@ target "image" {
|
|||||||
|
|
||||||
m, g, err := ReadTargets(ctx, []File{f}, []string{"foo"}, nil, nil)
|
m, g, err := ReadTargets(ctx, []File{f}, []string{"foo"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 2, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"foo"}, g["default"].Targets)
|
require.Equal(t, []string{"foo"}, g[0].Targets)
|
||||||
require.Equal(t, []string{"foo"}, g["foo"].Targets)
|
|
||||||
require.Equal(t, 1, len(m))
|
require.Equal(t, 1, len(m))
|
||||||
require.Equal(t, "bar", *m["foo"].Dockerfile)
|
require.Equal(t, "bar", *m["foo"].Dockerfile)
|
||||||
|
|
||||||
m, g, err = ReadTargets(ctx, []File{f}, []string{"foo", "foo"}, nil, nil)
|
m, g, err = ReadTargets(ctx, []File{f}, []string{"foo", "foo"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 2, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"foo"}, g["default"].Targets)
|
require.Equal(t, []string{"foo"}, g[0].Targets)
|
||||||
require.Equal(t, []string{"foo"}, g["foo"].Targets)
|
|
||||||
require.Equal(t, 1, len(m))
|
require.Equal(t, 1, len(m))
|
||||||
require.Equal(t, "bar", *m["foo"].Dockerfile)
|
require.Equal(t, "bar", *m["foo"].Dockerfile)
|
||||||
}
|
}
|
||||||
@@ -998,18 +839,16 @@ target "image" {
|
|||||||
|
|
||||||
m, g, err := ReadTargets(ctx, []File{f}, []string{"foo"}, nil, nil)
|
m, g, err := ReadTargets(ctx, []File{f}, []string{"foo"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 2, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"foo"}, g["default"].Targets)
|
require.Equal(t, []string{"foo", "image"}, g[0].Targets)
|
||||||
require.Equal(t, []string{"foo", "image"}, g["foo"].Targets)
|
|
||||||
require.Equal(t, 2, len(m))
|
require.Equal(t, 2, len(m))
|
||||||
require.Equal(t, "bar", *m["foo"].Dockerfile)
|
require.Equal(t, "bar", *m["foo"].Dockerfile)
|
||||||
require.Equal(t, "type=docker", m["image"].Outputs[0])
|
require.Equal(t, "type=docker", m["image"].Outputs[0])
|
||||||
|
|
||||||
m, g, err = ReadTargets(ctx, []File{f}, []string{"foo", "image"}, nil, nil)
|
m, g, err = ReadTargets(ctx, []File{f}, []string{"foo", "image"}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 2, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"foo", "image"}, g["default"].Targets)
|
require.Equal(t, []string{"foo", "image"}, g[0].Targets)
|
||||||
require.Equal(t, []string{"foo", "image"}, g["foo"].Targets)
|
|
||||||
require.Equal(t, 2, len(m))
|
require.Equal(t, 2, len(m))
|
||||||
require.Equal(t, "bar", *m["foo"].Dockerfile)
|
require.Equal(t, "bar", *m["foo"].Dockerfile)
|
||||||
require.Equal(t, "type=docker", m["image"].Outputs[0])
|
require.Equal(t, "type=docker", m["image"].Outputs[0])
|
||||||
@@ -1046,22 +885,22 @@ target "d" {
|
|||||||
cases := []struct {
|
cases := []struct {
|
||||||
name string
|
name string
|
||||||
overrides []string
|
overrides []string
|
||||||
want map[string]*string
|
want map[string]string
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "nested simple",
|
name: "nested simple",
|
||||||
overrides: nil,
|
overrides: nil,
|
||||||
want: map[string]*string{"bar": ptrstr("234"), "baz": ptrstr("890"), "foo": ptrstr("123")},
|
want: map[string]string{"bar": "234", "baz": "890", "foo": "123"},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "nested with overrides first",
|
name: "nested with overrides first",
|
||||||
overrides: []string{"a.args.foo=321", "b.args.bar=432"},
|
overrides: []string{"a.args.foo=321", "b.args.bar=432"},
|
||||||
want: map[string]*string{"bar": ptrstr("234"), "baz": ptrstr("890"), "foo": ptrstr("321")},
|
want: map[string]string{"bar": "234", "baz": "890", "foo": "321"},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "nested with overrides last",
|
name: "nested with overrides last",
|
||||||
overrides: []string{"a.args.foo=321", "c.args.bar=432"},
|
overrides: []string{"a.args.foo=321", "c.args.bar=432"},
|
||||||
want: map[string]*string{"bar": ptrstr("432"), "baz": ptrstr("890"), "foo": ptrstr("321")},
|
want: map[string]string{"bar": "432", "baz": "890", "foo": "321"},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
for _, tt := range cases {
|
for _, tt := range cases {
|
||||||
@@ -1070,7 +909,7 @@ target "d" {
|
|||||||
m, g, err := ReadTargets(ctx, []File{f}, []string{"d"}, tt.overrides, nil)
|
m, g, err := ReadTargets(ctx, []File{f}, []string{"d"}, tt.overrides, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"d"}, g["default"].Targets)
|
require.Equal(t, []string{"d"}, g[0].Targets)
|
||||||
require.Equal(t, 1, len(m))
|
require.Equal(t, 1, len(m))
|
||||||
require.Equal(t, tt.want, m["d"].Args)
|
require.Equal(t, tt.want, m["d"].Args)
|
||||||
})
|
})
|
||||||
@@ -1114,26 +953,26 @@ group "default" {
|
|||||||
cases := []struct {
|
cases := []struct {
|
||||||
name string
|
name string
|
||||||
overrides []string
|
overrides []string
|
||||||
wantch1 map[string]*string
|
wantch1 map[string]string
|
||||||
wantch2 map[string]*string
|
wantch2 map[string]string
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "nested simple",
|
name: "nested simple",
|
||||||
overrides: nil,
|
overrides: nil,
|
||||||
wantch1: map[string]*string{"BAR": ptrstr("fuu"), "FOO": ptrstr("bar")},
|
wantch1: map[string]string{"BAR": "fuu", "FOO": "bar"},
|
||||||
wantch2: map[string]*string{"BAR": ptrstr("fuu"), "FOO": ptrstr("bar"), "FOO2": ptrstr("bar2")},
|
wantch2: map[string]string{"BAR": "fuu", "FOO": "bar", "FOO2": "bar2"},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "nested with overrides first",
|
name: "nested with overrides first",
|
||||||
overrides: []string{"grandparent.args.BAR=fii", "child1.args.FOO=baaar"},
|
overrides: []string{"grandparent.args.BAR=fii", "child1.args.FOO=baaar"},
|
||||||
wantch1: map[string]*string{"BAR": ptrstr("fii"), "FOO": ptrstr("baaar")},
|
wantch1: map[string]string{"BAR": "fii", "FOO": "baaar"},
|
||||||
wantch2: map[string]*string{"BAR": ptrstr("fii"), "FOO": ptrstr("bar"), "FOO2": ptrstr("bar2")},
|
wantch2: map[string]string{"BAR": "fii", "FOO": "bar", "FOO2": "bar2"},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "nested with overrides last",
|
name: "nested with overrides last",
|
||||||
overrides: []string{"grandparent.args.BAR=fii", "child2.args.FOO=baaar"},
|
overrides: []string{"grandparent.args.BAR=fii", "child2.args.FOO=baaar"},
|
||||||
wantch1: map[string]*string{"BAR": ptrstr("fii"), "FOO": ptrstr("bar")},
|
wantch1: map[string]string{"BAR": "fii", "FOO": "bar"},
|
||||||
wantch2: map[string]*string{"BAR": ptrstr("fii"), "FOO": ptrstr("baaar"), "FOO2": ptrstr("bar2")},
|
wantch2: map[string]string{"BAR": "fii", "FOO": "baaar", "FOO2": "bar2"},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
for _, tt := range cases {
|
for _, tt := range cases {
|
||||||
@@ -1142,7 +981,7 @@ group "default" {
|
|||||||
m, g, err := ReadTargets(ctx, []File{f}, []string{"default"}, tt.overrides, nil)
|
m, g, err := ReadTargets(ctx, []File{f}, []string{"default"}, tt.overrides, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(g))
|
require.Equal(t, 1, len(g))
|
||||||
require.Equal(t, []string{"child1", "child2"}, g["default"].Targets)
|
require.Equal(t, []string{"child1", "child2"}, g[0].Targets)
|
||||||
require.Equal(t, 2, len(m))
|
require.Equal(t, 2, len(m))
|
||||||
require.Equal(t, tt.wantch1, m["child1"].Args)
|
require.Equal(t, tt.wantch1, m["child1"].Args)
|
||||||
require.Equal(t, []string{"type=docker"}, m["child1"].Outputs)
|
require.Equal(t, []string{"type=docker"}, m["child1"].Outputs)
|
||||||
@@ -1239,285 +1078,46 @@ target "f" {
|
|||||||
}`)}
|
}`)}
|
||||||
|
|
||||||
cases := []struct {
|
cases := []struct {
|
||||||
names []string
|
name string
|
||||||
targets []string
|
targets []string
|
||||||
groups []string
|
ntargets int
|
||||||
count int
|
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
names: []string{"a"},
|
name: "a",
|
||||||
targets: []string{"a"},
|
targets: []string{"b", "c"},
|
||||||
groups: []string{"default", "a", "b", "c"},
|
ntargets: 1,
|
||||||
count: 1,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
names: []string{"b"},
|
name: "b",
|
||||||
targets: []string{"b"},
|
|
||||||
groups: []string{"default", "b"},
|
|
||||||
count: 1,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
names: []string{"c"},
|
|
||||||
targets: []string{"c"},
|
|
||||||
groups: []string{"default", "b", "c"},
|
|
||||||
count: 1,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
names: []string{"d"},
|
|
||||||
targets: []string{"d"},
|
targets: []string{"d"},
|
||||||
groups: []string{"default"},
|
ntargets: 1,
|
||||||
count: 1,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
names: []string{"e"},
|
name: "c",
|
||||||
targets: []string{"e"},
|
targets: []string{"b"},
|
||||||
groups: []string{"default", "a", "b", "c", "e"},
|
ntargets: 1,
|
||||||
count: 2,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
names: []string{"a", "e"},
|
name: "d",
|
||||||
targets: []string{"a", "e"},
|
targets: []string{"d"},
|
||||||
groups: []string{"default", "a", "b", "c", "e"},
|
ntargets: 1,
|
||||||
count: 2,
|
},
|
||||||
|
{
|
||||||
|
name: "e",
|
||||||
|
targets: []string{"a", "f"},
|
||||||
|
ntargets: 2,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
for _, tt := range cases {
|
for _, tt := range cases {
|
||||||
tt := tt
|
tt := tt
|
||||||
t.Run(strings.Join(tt.names, "+"), func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
m, g, err := ReadTargets(ctx, []File{f}, tt.names, nil, nil)
|
m, g, err := ReadTargets(ctx, []File{f}, []string{tt.name}, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
require.Equal(t, 1, len(g))
|
||||||
var gnames []string
|
require.Equal(t, tt.targets, g[0].Targets)
|
||||||
for _, g := range g {
|
require.Equal(t, tt.ntargets, len(m))
|
||||||
gnames = append(gnames, g.Name)
|
|
||||||
}
|
|
||||||
sort.Strings(gnames)
|
|
||||||
sort.Strings(tt.groups)
|
|
||||||
require.Equal(t, tt.groups, gnames)
|
|
||||||
|
|
||||||
sort.Strings(g["default"].Targets)
|
|
||||||
sort.Strings(tt.targets)
|
|
||||||
require.Equal(t, tt.targets, g["default"].Targets)
|
|
||||||
|
|
||||||
require.Equal(t, tt.count, len(m))
|
|
||||||
require.Equal(t, ".", *m["d"].Context)
|
require.Equal(t, ".", *m["d"].Context)
|
||||||
require.Equal(t, "./testdockerfile", *m["d"].Dockerfile)
|
require.Equal(t, "./testdockerfile", *m["d"].Dockerfile)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestUnknownExt(t *testing.T) {
|
|
||||||
dt := []byte(`
|
|
||||||
target "app" {
|
|
||||||
context = "dir"
|
|
||||||
args = {
|
|
||||||
v1 = "foo"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`)
|
|
||||||
dt2 := []byte(`
|
|
||||||
services:
|
|
||||||
app:
|
|
||||||
build:
|
|
||||||
dockerfile: Dockerfile-alternate
|
|
||||||
args:
|
|
||||||
v2: "bar"
|
|
||||||
`)
|
|
||||||
|
|
||||||
c, err := ParseFiles([]File{
|
|
||||||
{Data: dt, Name: "c1.foo"},
|
|
||||||
{Data: dt2, Name: "c2.bar"},
|
|
||||||
}, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
require.Equal(t, 1, len(c.Targets))
|
|
||||||
require.Equal(t, "app", c.Targets[0].Name)
|
|
||||||
require.Equal(t, ptrstr("foo"), c.Targets[0].Args["v1"])
|
|
||||||
require.Equal(t, ptrstr("bar"), c.Targets[0].Args["v2"])
|
|
||||||
require.Equal(t, "dir", *c.Targets[0].Context)
|
|
||||||
require.Equal(t, "Dockerfile-alternate", *c.Targets[0].Dockerfile)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHCLNullVars(t *testing.T) {
|
|
||||||
fp := File{
|
|
||||||
Name: "docker-bake.hcl",
|
|
||||||
Data: []byte(
|
|
||||||
`variable "FOO" {
|
|
||||||
default = null
|
|
||||||
}
|
|
||||||
variable "BAR" {
|
|
||||||
default = null
|
|
||||||
}
|
|
||||||
target "default" {
|
|
||||||
args = {
|
|
||||||
foo = FOO
|
|
||||||
bar = "baz"
|
|
||||||
}
|
|
||||||
labels = {
|
|
||||||
"com.docker.app.bar" = BAR
|
|
||||||
"com.docker.app.baz" = "foo"
|
|
||||||
}
|
|
||||||
}`),
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := context.TODO()
|
|
||||||
m, _, err := ReadTargets(ctx, []File{fp}, []string{"default"}, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
require.Equal(t, 1, len(m))
|
|
||||||
_, ok := m["default"]
|
|
||||||
require.True(t, ok)
|
|
||||||
|
|
||||||
_, err = TargetsToBuildOpt(m, &Input{})
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, map[string]*string{"bar": ptrstr("baz")}, m["default"].Args)
|
|
||||||
require.Equal(t, map[string]*string{"com.docker.app.baz": ptrstr("foo")}, m["default"].Labels)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestJSONNullVars(t *testing.T) {
|
|
||||||
fp := File{
|
|
||||||
Name: "docker-bake.json",
|
|
||||||
Data: []byte(
|
|
||||||
`{
|
|
||||||
"variable": {
|
|
||||||
"FOO": {
|
|
||||||
"default": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"target": {
|
|
||||||
"default": {
|
|
||||||
"args": {
|
|
||||||
"foo": "${FOO}",
|
|
||||||
"bar": "baz"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}`),
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := context.TODO()
|
|
||||||
m, _, err := ReadTargets(ctx, []File{fp}, []string{"default"}, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
require.Equal(t, 1, len(m))
|
|
||||||
_, ok := m["default"]
|
|
||||||
require.True(t, ok)
|
|
||||||
|
|
||||||
_, err = TargetsToBuildOpt(m, &Input{})
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, map[string]*string{"bar": ptrstr("baz")}, m["default"].Args)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestReadLocalFilesDefault(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
filenames []string
|
|
||||||
expected []string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
filenames: []string{"abc.yml", "docker-compose.yml"},
|
|
||||||
expected: []string{"docker-compose.yml"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
filenames: []string{"test.foo", "compose.yml", "docker-bake.hcl"},
|
|
||||||
expected: []string{"compose.yml", "docker-bake.hcl"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
filenames: []string{"compose.yaml", "docker-compose.yml", "docker-bake.hcl"},
|
|
||||||
expected: []string{"compose.yaml", "docker-compose.yml", "docker-bake.hcl"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
filenames: []string{"test.txt", "compsoe.yaml"}, // intentional misspell
|
|
||||||
expected: []string{},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
pwd, err := os.Getwd()
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(strings.Join(tt.filenames, "-"), func(t *testing.T) {
|
|
||||||
dir := t.TempDir()
|
|
||||||
t.Cleanup(func() { _ = os.Chdir(pwd) })
|
|
||||||
require.NoError(t, os.Chdir(dir))
|
|
||||||
for _, tf := range tt.filenames {
|
|
||||||
require.NoError(t, os.WriteFile(tf, []byte(tf), 0644))
|
|
||||||
}
|
|
||||||
files, err := ReadLocalFiles(nil, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
if len(files) == 0 {
|
|
||||||
require.Equal(t, len(tt.expected), len(files))
|
|
||||||
} else {
|
|
||||||
found := false
|
|
||||||
for _, exp := range tt.expected {
|
|
||||||
for _, f := range files {
|
|
||||||
if f.Name == exp {
|
|
||||||
found = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
require.True(t, found, exp)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestAttestDuplicates(t *testing.T) {
|
|
||||||
fp := File{
|
|
||||||
Name: "docker-bake.hcl",
|
|
||||||
Data: []byte(
|
|
||||||
`target "default" {
|
|
||||||
attest = ["type=sbom", "type=sbom,generator=custom", "type=sbom,foo=bar", "type=provenance,mode=max"]
|
|
||||||
}`),
|
|
||||||
}
|
|
||||||
ctx := context.TODO()
|
|
||||||
|
|
||||||
m, _, err := ReadTargets(ctx, []File{fp}, []string{"default"}, nil, nil)
|
|
||||||
require.Equal(t, []string{"type=sbom,foo=bar", "type=provenance,mode=max"}, m["default"].Attest)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
opts, err := TargetsToBuildOpt(m, &Input{})
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, map[string]*string{
|
|
||||||
"sbom": ptrstr("type=sbom,foo=bar"),
|
|
||||||
"provenance": ptrstr("type=provenance,mode=max"),
|
|
||||||
}, opts["default"].Attests)
|
|
||||||
|
|
||||||
m, _, err = ReadTargets(ctx, []File{fp}, []string{"default"}, []string{"*.attest=type=sbom,disabled=true"}, nil)
|
|
||||||
require.Equal(t, []string{"type=sbom,disabled=true", "type=provenance,mode=max"}, m["default"].Attest)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
opts, err = TargetsToBuildOpt(m, &Input{})
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, map[string]*string{
|
|
||||||
"sbom": nil,
|
|
||||||
"provenance": ptrstr("type=provenance,mode=max"),
|
|
||||||
}, opts["default"].Attests)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestAnnotations(t *testing.T) {
|
|
||||||
fp := File{
|
|
||||||
Name: "docker-bake.hcl",
|
|
||||||
Data: []byte(
|
|
||||||
`target "app" {
|
|
||||||
output = ["type=image,name=foo"]
|
|
||||||
annotations = ["manifest[linux/amd64]:foo=bar"]
|
|
||||||
}`),
|
|
||||||
}
|
|
||||||
ctx := context.TODO()
|
|
||||||
m, g, err := ReadTargets(ctx, []File{fp}, []string{"app"}, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
bo, err := TargetsToBuildOpt(m, &Input{})
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
require.Equal(t, 1, len(g))
|
|
||||||
require.Equal(t, []string{"app"}, g["default"].Targets)
|
|
||||||
|
|
||||||
require.Equal(t, 1, len(m))
|
|
||||||
require.Contains(t, m, "app")
|
|
||||||
require.Equal(t, "type=image,name=foo", m["app"].Outputs[0])
|
|
||||||
require.Equal(t, "manifest[linux/amd64]:foo=bar", m["app"].Annotations[0])
|
|
||||||
|
|
||||||
require.Len(t, bo["app"].Exports, 1)
|
|
||||||
require.Equal(t, "bar", bo["app"].Exports[0].Attrs["annotation-manifest[linux/amd64].foo"])
|
|
||||||
}
|
|
||||||
|
|||||||
377
bake/compose.go
377
bake/compose.go
@@ -1,53 +1,49 @@
|
|||||||
package bake
|
package bake
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/compose-spec/compose-go/v2/dotenv"
|
"github.com/compose-spec/compose-go/loader"
|
||||||
"github.com/compose-spec/compose-go/v2/loader"
|
compose "github.com/compose-spec/compose-go/types"
|
||||||
composetypes "github.com/compose-spec/compose-go/v2/types"
|
|
||||||
dockeropts "github.com/docker/cli/opts"
|
|
||||||
"github.com/docker/go-units"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"gopkg.in/yaml.v3"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func ParseComposeFiles(fs []File) (*Config, error) {
|
func parseCompose(dt []byte) (*compose.Project, error) {
|
||||||
envs, err := composeEnv()
|
return loader.Load(compose.ConfigDetails{
|
||||||
if err != nil {
|
ConfigFiles: []compose.ConfigFile{
|
||||||
return nil, err
|
{
|
||||||
}
|
Content: dt,
|
||||||
var cfgs []composetypes.ConfigFile
|
},
|
||||||
for _, f := range fs {
|
},
|
||||||
cfgs = append(cfgs, composetypes.ConfigFile{
|
Environment: envMap(os.Environ()),
|
||||||
Filename: f.Name,
|
}, func(options *loader.Options) {
|
||||||
Content: f.Data,
|
options.SkipNormalization = true
|
||||||
})
|
})
|
||||||
}
|
|
||||||
return ParseCompose(cfgs, envs)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func ParseCompose(cfgs []composetypes.ConfigFile, envs map[string]string) (*Config, error) {
|
func envMap(env []string) map[string]string {
|
||||||
if envs == nil {
|
result := make(map[string]string, len(env))
|
||||||
envs = make(map[string]string)
|
for _, s := range env {
|
||||||
|
kv := strings.SplitN(s, "=", 2)
|
||||||
|
if len(kv) != 2 {
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
cfg, err := loader.LoadWithContext(context.Background(), composetypes.ConfigDetails{
|
result[kv[0]] = kv[1]
|
||||||
ConfigFiles: cfgs,
|
}
|
||||||
Environment: envs,
|
return result
|
||||||
}, func(options *loader.Options) {
|
}
|
||||||
options.SetProjectName("bake", false)
|
|
||||||
options.SkipNormalization = true
|
func ParseCompose(dt []byte) (*Config, error) {
|
||||||
options.Profiles = []string{"*"}
|
cfg, err := parseCompose(dt)
|
||||||
})
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
var c Config
|
var c Config
|
||||||
|
var zeroBuildConfig compose.BuildConfig
|
||||||
if len(cfg.Services) > 0 {
|
if len(cfg.Services) > 0 {
|
||||||
c.Groups = []*Group{}
|
c.Groups = []*Group{}
|
||||||
c.Targets = []*Target{}
|
c.Targets = []*Target{}
|
||||||
@@ -55,14 +51,17 @@ func ParseCompose(cfgs []composetypes.ConfigFile, envs map[string]string) (*Conf
|
|||||||
g := &Group{Name: "default"}
|
g := &Group{Name: "default"}
|
||||||
|
|
||||||
for _, s := range cfg.Services {
|
for _, s := range cfg.Services {
|
||||||
s := s
|
|
||||||
if s.Build == nil {
|
if s.Build == nil || reflect.DeepEqual(s.Build, zeroBuildConfig) {
|
||||||
|
// if not make sure they're setting an image or it's invalid d-c.yml
|
||||||
|
if s.Image == "" {
|
||||||
|
return nil, fmt.Errorf("compose file invalid: service %s has neither an image nor a build context specified. At least one must be provided", s.Name)
|
||||||
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
targetName := sanitizeTargetName(s.Name)
|
if err = validateTargetNameCompose(s.Name); err != nil {
|
||||||
if err = validateTargetName(targetName); err != nil {
|
return nil, errors.Wrapf(err, "invalid service name %q", s.Name)
|
||||||
return nil, errors.Wrapf(err, "invalid service name %q", targetName)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var contextPathP *string
|
var contextPathP *string
|
||||||
@@ -75,63 +74,12 @@ func ParseCompose(cfgs []composetypes.ConfigFile, envs map[string]string) (*Conf
|
|||||||
dockerfilePath := s.Build.Dockerfile
|
dockerfilePath := s.Build.Dockerfile
|
||||||
dockerfilePathP = &dockerfilePath
|
dockerfilePathP = &dockerfilePath
|
||||||
}
|
}
|
||||||
var dockerfileInlineP *string
|
g.Targets = append(g.Targets, s.Name)
|
||||||
if s.Build.DockerfileInline != "" {
|
|
||||||
dockerfileInline := s.Build.DockerfileInline
|
|
||||||
dockerfileInlineP = &dockerfileInline
|
|
||||||
}
|
|
||||||
|
|
||||||
var additionalContexts map[string]string
|
|
||||||
if s.Build.AdditionalContexts != nil {
|
|
||||||
additionalContexts = map[string]string{}
|
|
||||||
for k, v := range s.Build.AdditionalContexts {
|
|
||||||
additionalContexts[k] = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var shmSize *string
|
|
||||||
if s.Build.ShmSize > 0 {
|
|
||||||
shmSizeBytes := dockeropts.MemBytes(s.Build.ShmSize)
|
|
||||||
shmSizeStr := shmSizeBytes.String()
|
|
||||||
shmSize = &shmSizeStr
|
|
||||||
}
|
|
||||||
|
|
||||||
var ulimits []string
|
|
||||||
if s.Build.Ulimits != nil {
|
|
||||||
for n, u := range s.Build.Ulimits {
|
|
||||||
ulimit, err := units.ParseUlimit(fmt.Sprintf("%s=%d:%d", n, u.Soft, u.Hard))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
ulimits = append(ulimits, ulimit.String())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var secrets []string
|
|
||||||
for _, bs := range s.Build.Secrets {
|
|
||||||
secret, err := composeToBuildkitSecret(bs, cfg.Secrets[bs.Source])
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
secrets = append(secrets, secret)
|
|
||||||
}
|
|
||||||
|
|
||||||
// compose does not support nil values for labels
|
|
||||||
labels := map[string]*string{}
|
|
||||||
for k, v := range s.Build.Labels {
|
|
||||||
v := v
|
|
||||||
labels[k] = &v
|
|
||||||
}
|
|
||||||
|
|
||||||
g.Targets = append(g.Targets, targetName)
|
|
||||||
t := &Target{
|
t := &Target{
|
||||||
Name: targetName,
|
Name: s.Name,
|
||||||
Context: contextPathP,
|
Context: contextPathP,
|
||||||
Contexts: additionalContexts,
|
|
||||||
Dockerfile: dockerfilePathP,
|
Dockerfile: dockerfilePathP,
|
||||||
DockerfileInline: dockerfileInlineP,
|
Labels: s.Build.Labels,
|
||||||
Tags: s.Build.Tags,
|
|
||||||
Labels: labels,
|
|
||||||
Args: flatten(s.Build.Args.Resolve(func(val string) (string, bool) {
|
Args: flatten(s.Build.Args.Resolve(func(val string) (string, bool) {
|
||||||
if val, ok := s.Environment[val]; ok && val != nil {
|
if val, ok := s.Environment[val]; ok && val != nil {
|
||||||
return *val, true
|
return *val, true
|
||||||
@@ -140,11 +88,7 @@ func ParseCompose(cfgs []composetypes.ConfigFile, envs map[string]string) (*Conf
|
|||||||
return val, ok
|
return val, ok
|
||||||
})),
|
})),
|
||||||
CacheFrom: s.Build.CacheFrom,
|
CacheFrom: s.Build.CacheFrom,
|
||||||
CacheTo: s.Build.CacheTo,
|
|
||||||
NetworkMode: &s.Build.Network,
|
NetworkMode: &s.Build.Network,
|
||||||
Secrets: secrets,
|
|
||||||
ShmSize: shmSize,
|
|
||||||
Ulimits: ulimits,
|
|
||||||
}
|
}
|
||||||
if err = t.composeExtTarget(s.Build.Extensions); err != nil {
|
if err = t.composeExtTarget(s.Build.Extensions); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -165,206 +109,103 @@ func ParseCompose(cfgs []composetypes.ConfigFile, envs map[string]string) (*Conf
|
|||||||
return &c, nil
|
return &c, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func validateComposeFile(dt []byte, fn string) (bool, error) {
|
func flatten(in compose.MappingWithEquals) compose.Mapping {
|
||||||
envs, err := composeEnv()
|
|
||||||
if err != nil {
|
|
||||||
return true, err
|
|
||||||
}
|
|
||||||
fnl := strings.ToLower(fn)
|
|
||||||
if strings.HasSuffix(fnl, ".yml") || strings.HasSuffix(fnl, ".yaml") {
|
|
||||||
return true, validateCompose(dt, envs)
|
|
||||||
}
|
|
||||||
if strings.HasSuffix(fnl, ".json") || strings.HasSuffix(fnl, ".hcl") {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
err = validateCompose(dt, envs)
|
|
||||||
return err == nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
func validateCompose(dt []byte, envs map[string]string) error {
|
|
||||||
_, err := loader.Load(composetypes.ConfigDetails{
|
|
||||||
ConfigFiles: []composetypes.ConfigFile{
|
|
||||||
{
|
|
||||||
Content: dt,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Environment: envs,
|
|
||||||
}, func(options *loader.Options) {
|
|
||||||
options.SetProjectName("bake", false)
|
|
||||||
options.SkipNormalization = true
|
|
||||||
// consistency is checked later in ParseCompose to ensure multiple
|
|
||||||
// compose files can be merged together
|
|
||||||
options.SkipConsistencyCheck = true
|
|
||||||
})
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
func composeEnv() (map[string]string, error) {
|
|
||||||
envs := sliceToMap(os.Environ())
|
|
||||||
if wd, err := os.Getwd(); err == nil {
|
|
||||||
envs, err = loadDotEnv(envs, wd)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return envs, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func loadDotEnv(curenv map[string]string, workingDir string) (map[string]string, error) {
|
|
||||||
if curenv == nil {
|
|
||||||
curenv = make(map[string]string)
|
|
||||||
}
|
|
||||||
|
|
||||||
ef, err := filepath.Abs(filepath.Join(workingDir, ".env"))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err = os.Stat(ef); os.IsNotExist(err) {
|
|
||||||
return curenv, nil
|
|
||||||
} else if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
dt, err := os.ReadFile(ef)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
envs, err := dotenv.UnmarshalBytesWithLookup(dt, nil)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
for k, v := range envs {
|
|
||||||
if _, set := curenv[k]; set {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
curenv[k] = v
|
|
||||||
}
|
|
||||||
|
|
||||||
return curenv, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func flatten(in composetypes.MappingWithEquals) map[string]*string {
|
|
||||||
if len(in) == 0 {
|
if len(in) == 0 {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
out := map[string]*string{}
|
out := compose.Mapping{}
|
||||||
for k, v := range in {
|
for k, v := range in {
|
||||||
if v == nil {
|
if v == nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
out[k] = v
|
out[k] = *v
|
||||||
}
|
}
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
// xbake Compose build extension provides fields not (yet) available in
|
|
||||||
// Compose build specification: https://github.com/compose-spec/compose-spec/blob/master/build.md
|
|
||||||
type xbake struct {
|
|
||||||
Tags stringArray `yaml:"tags,omitempty"`
|
|
||||||
CacheFrom stringArray `yaml:"cache-from,omitempty"`
|
|
||||||
CacheTo stringArray `yaml:"cache-to,omitempty"`
|
|
||||||
Secrets stringArray `yaml:"secret,omitempty"`
|
|
||||||
SSH stringArray `yaml:"ssh,omitempty"`
|
|
||||||
Platforms stringArray `yaml:"platforms,omitempty"`
|
|
||||||
Outputs stringArray `yaml:"output,omitempty"`
|
|
||||||
Pull *bool `yaml:"pull,omitempty"`
|
|
||||||
NoCache *bool `yaml:"no-cache,omitempty"`
|
|
||||||
NoCacheFilter stringArray `yaml:"no-cache-filter,omitempty"`
|
|
||||||
Contexts stringMap `yaml:"contexts,omitempty"`
|
|
||||||
// don't forget to update documentation if you add a new field:
|
|
||||||
// docs/manuals/bake/compose-file.md#extension-field-with-x-bake
|
|
||||||
}
|
|
||||||
|
|
||||||
type stringMap map[string]string
|
|
||||||
type stringArray []string
|
|
||||||
|
|
||||||
func (sa *stringArray) UnmarshalYAML(unmarshal func(interface{}) error) error {
|
|
||||||
var multi []string
|
|
||||||
err := unmarshal(&multi)
|
|
||||||
if err != nil {
|
|
||||||
var single string
|
|
||||||
if err := unmarshal(&single); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
*sa = strings.Fields(single)
|
|
||||||
} else {
|
|
||||||
*sa = multi
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// composeExtTarget converts Compose build extension x-bake to bake Target
|
// composeExtTarget converts Compose build extension x-bake to bake Target
|
||||||
// https://github.com/compose-spec/compose-spec/blob/master/spec.md#extension
|
// https://github.com/compose-spec/compose-spec/blob/master/spec.md#extension
|
||||||
func (t *Target) composeExtTarget(exts map[string]interface{}) error {
|
func (t *Target) composeExtTarget(exts map[string]interface{}) error {
|
||||||
var xb xbake
|
if ext, ok := exts["x-bake"]; ok {
|
||||||
|
for key, val := range ext.(map[string]interface{}) {
|
||||||
ext, ok := exts["x-bake"]
|
switch key {
|
||||||
if !ok || ext == nil {
|
case "tags":
|
||||||
return nil
|
if res, k := val.(string); k {
|
||||||
|
t.Tags = append(t.Tags, res)
|
||||||
|
} else {
|
||||||
|
for _, res := range val.([]interface{}) {
|
||||||
|
t.Tags = append(t.Tags, res.(string))
|
||||||
}
|
}
|
||||||
|
|
||||||
yb, _ := yaml.Marshal(ext)
|
|
||||||
if err := yaml.Unmarshal(yb, &xb); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
case "cache-from":
|
||||||
if len(xb.Tags) > 0 {
|
t.CacheFrom = []string{} // Needed to override the main field
|
||||||
t.Tags = dedupSlice(append(t.Tags, xb.Tags...))
|
if res, k := val.(string); k {
|
||||||
|
t.CacheFrom = append(t.CacheFrom, res)
|
||||||
|
} else {
|
||||||
|
for _, res := range val.([]interface{}) {
|
||||||
|
t.CacheFrom = append(t.CacheFrom, res.(string))
|
||||||
}
|
}
|
||||||
if len(xb.CacheFrom) > 0 {
|
|
||||||
t.CacheFrom = dedupSlice(append(t.CacheFrom, xb.CacheFrom...))
|
|
||||||
}
|
}
|
||||||
if len(xb.CacheTo) > 0 {
|
case "cache-to":
|
||||||
t.CacheTo = dedupSlice(append(t.CacheTo, xb.CacheTo...))
|
if res, k := val.(string); k {
|
||||||
|
t.CacheTo = append(t.CacheTo, res)
|
||||||
|
} else {
|
||||||
|
for _, res := range val.([]interface{}) {
|
||||||
|
t.CacheTo = append(t.CacheTo, res.(string))
|
||||||
}
|
}
|
||||||
if len(xb.Secrets) > 0 {
|
|
||||||
t.Secrets = dedupSlice(append(t.Secrets, xb.Secrets...))
|
|
||||||
}
|
}
|
||||||
if len(xb.SSH) > 0 {
|
case "secret":
|
||||||
t.SSH = dedupSlice(append(t.SSH, xb.SSH...))
|
if res, k := val.(string); k {
|
||||||
|
t.Secrets = append(t.Secrets, res)
|
||||||
|
} else {
|
||||||
|
for _, res := range val.([]interface{}) {
|
||||||
|
t.Secrets = append(t.Secrets, res.(string))
|
||||||
}
|
}
|
||||||
if len(xb.Platforms) > 0 {
|
|
||||||
t.Platforms = dedupSlice(append(t.Platforms, xb.Platforms...))
|
|
||||||
}
|
}
|
||||||
if len(xb.Outputs) > 0 {
|
case "ssh":
|
||||||
t.Outputs = dedupSlice(append(t.Outputs, xb.Outputs...))
|
if res, k := val.(string); k {
|
||||||
|
t.SSH = append(t.SSH, res)
|
||||||
|
} else {
|
||||||
|
for _, res := range val.([]interface{}) {
|
||||||
|
t.SSH = append(t.SSH, res.(string))
|
||||||
}
|
}
|
||||||
if xb.Pull != nil {
|
|
||||||
t.Pull = xb.Pull
|
|
||||||
}
|
}
|
||||||
if xb.NoCache != nil {
|
case "platforms":
|
||||||
t.NoCache = xb.NoCache
|
if res, k := val.(string); k {
|
||||||
|
t.Platforms = append(t.Platforms, res)
|
||||||
|
} else {
|
||||||
|
for _, res := range val.([]interface{}) {
|
||||||
|
t.Platforms = append(t.Platforms, res.(string))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case "output":
|
||||||
|
if res, k := val.(string); k {
|
||||||
|
t.Outputs = append(t.Outputs, res)
|
||||||
|
} else {
|
||||||
|
for _, res := range val.([]interface{}) {
|
||||||
|
t.Outputs = append(t.Outputs, res.(string))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case "pull":
|
||||||
|
if res, ok := val.(bool); ok {
|
||||||
|
t.Pull = &res
|
||||||
|
}
|
||||||
|
case "no-cache":
|
||||||
|
if res, ok := val.(bool); ok {
|
||||||
|
t.NoCache = &res
|
||||||
|
}
|
||||||
|
case "no-cache-filter":
|
||||||
|
if res, k := val.(string); k {
|
||||||
|
t.NoCacheFilter = append(t.NoCacheFilter, res)
|
||||||
|
} else {
|
||||||
|
for _, res := range val.([]interface{}) {
|
||||||
|
t.NoCacheFilter = append(t.NoCacheFilter, res.(string))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("compose file invalid: unkwown %s field for x-bake", key)
|
||||||
}
|
}
|
||||||
if len(xb.NoCacheFilter) > 0 {
|
|
||||||
t.NoCacheFilter = dedupSlice(append(t.NoCacheFilter, xb.NoCacheFilter...))
|
|
||||||
}
|
}
|
||||||
if len(xb.Contexts) > 0 {
|
|
||||||
t.Contexts = dedupMap(t.Contexts, xb.Contexts)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// composeToBuildkitSecret converts secret from compose format to buildkit's
|
|
||||||
// csv format.
|
|
||||||
func composeToBuildkitSecret(inp composetypes.ServiceSecretConfig, psecret composetypes.SecretConfig) (string, error) {
|
|
||||||
if psecret.External {
|
|
||||||
return "", errors.Errorf("unsupported external secret %s", psecret.Name)
|
|
||||||
}
|
|
||||||
|
|
||||||
var bkattrs []string
|
|
||||||
if inp.Source != "" {
|
|
||||||
bkattrs = append(bkattrs, "id="+inp.Source)
|
|
||||||
}
|
|
||||||
if psecret.File != "" {
|
|
||||||
bkattrs = append(bkattrs, "src="+psecret.File)
|
|
||||||
}
|
|
||||||
if psecret.Environment != "" {
|
|
||||||
bkattrs = append(bkattrs, "env="+psecret.Environment)
|
|
||||||
}
|
|
||||||
|
|
||||||
return strings.Join(bkattrs, ","), nil
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -2,12 +2,9 @@ package bake
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
|
||||||
"sort"
|
"sort"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
composetypes "github.com/compose-spec/compose-go/v2/types"
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -21,67 +18,34 @@ services:
|
|||||||
webapp:
|
webapp:
|
||||||
build:
|
build:
|
||||||
context: ./dir
|
context: ./dir
|
||||||
additional_contexts:
|
|
||||||
foo: ./bar
|
|
||||||
dockerfile: Dockerfile-alternate
|
dockerfile: Dockerfile-alternate
|
||||||
network:
|
network:
|
||||||
none
|
none
|
||||||
args:
|
args:
|
||||||
buildno: 123
|
buildno: 123
|
||||||
cache_from:
|
|
||||||
- type=local,src=path/to/cache
|
|
||||||
cache_to:
|
|
||||||
- type=local,dest=path/to/cache
|
|
||||||
secrets:
|
|
||||||
- token
|
|
||||||
- aws
|
|
||||||
webapp2:
|
|
||||||
profiles:
|
|
||||||
- test
|
|
||||||
build:
|
|
||||||
context: ./dir
|
|
||||||
dockerfile_inline: |
|
|
||||||
FROM alpine
|
|
||||||
secrets:
|
|
||||||
token:
|
|
||||||
environment: ENV_TOKEN
|
|
||||||
aws:
|
|
||||||
file: /root/.aws/credentials
|
|
||||||
`)
|
`)
|
||||||
|
|
||||||
c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
c, err := ParseCompose(dt)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
require.Equal(t, 1, len(c.Groups))
|
require.Equal(t, 1, len(c.Groups))
|
||||||
require.Equal(t, "default", c.Groups[0].Name)
|
require.Equal(t, c.Groups[0].Name, "default")
|
||||||
sort.Strings(c.Groups[0].Targets)
|
sort.Strings(c.Groups[0].Targets)
|
||||||
require.Equal(t, []string{"db", "webapp", "webapp2"}, c.Groups[0].Targets)
|
require.Equal(t, []string{"db", "webapp"}, c.Groups[0].Targets)
|
||||||
|
|
||||||
require.Equal(t, 3, len(c.Targets))
|
require.Equal(t, 2, len(c.Targets))
|
||||||
sort.Slice(c.Targets, func(i, j int) bool {
|
sort.Slice(c.Targets, func(i, j int) bool {
|
||||||
return c.Targets[i].Name < c.Targets[j].Name
|
return c.Targets[i].Name < c.Targets[j].Name
|
||||||
})
|
})
|
||||||
require.Equal(t, "db", c.Targets[0].Name)
|
require.Equal(t, "db", c.Targets[0].Name)
|
||||||
require.Equal(t, "db", *c.Targets[0].Context)
|
require.Equal(t, "./db", *c.Targets[0].Context)
|
||||||
require.Equal(t, []string{"docker.io/tonistiigi/db"}, c.Targets[0].Tags)
|
|
||||||
|
|
||||||
require.Equal(t, "webapp", c.Targets[1].Name)
|
require.Equal(t, "webapp", c.Targets[1].Name)
|
||||||
require.Equal(t, "dir", *c.Targets[1].Context)
|
require.Equal(t, "./dir", *c.Targets[1].Context)
|
||||||
require.Equal(t, map[string]string{"foo": "bar"}, c.Targets[1].Contexts)
|
|
||||||
require.Equal(t, "Dockerfile-alternate", *c.Targets[1].Dockerfile)
|
require.Equal(t, "Dockerfile-alternate", *c.Targets[1].Dockerfile)
|
||||||
require.Equal(t, 1, len(c.Targets[1].Args))
|
require.Equal(t, 1, len(c.Targets[1].Args))
|
||||||
require.Equal(t, ptrstr("123"), c.Targets[1].Args["buildno"])
|
require.Equal(t, "123", c.Targets[1].Args["buildno"])
|
||||||
require.Equal(t, []string{"type=local,src=path/to/cache"}, c.Targets[1].CacheFrom)
|
|
||||||
require.Equal(t, []string{"type=local,dest=path/to/cache"}, c.Targets[1].CacheTo)
|
|
||||||
require.Equal(t, "none", *c.Targets[1].NetworkMode)
|
require.Equal(t, "none", *c.Targets[1].NetworkMode)
|
||||||
require.Equal(t, []string{
|
|
||||||
"id=token,env=ENV_TOKEN",
|
|
||||||
"id=aws,src=/root/.aws/credentials",
|
|
||||||
}, c.Targets[1].Secrets)
|
|
||||||
|
|
||||||
require.Equal(t, "webapp2", c.Targets[2].Name)
|
|
||||||
require.Equal(t, "dir", *c.Targets[2].Context)
|
|
||||||
require.Equal(t, "FROM alpine\n", *c.Targets[2].DockerfileInline)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestNoBuildOutOfTreeService(t *testing.T) {
|
func TestNoBuildOutOfTreeService(t *testing.T) {
|
||||||
@@ -92,10 +56,9 @@ services:
|
|||||||
webapp:
|
webapp:
|
||||||
build: ./db
|
build: ./db
|
||||||
`)
|
`)
|
||||||
c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
c, err := ParseCompose(dt)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 1, len(c.Groups))
|
require.Equal(t, 1, len(c.Groups))
|
||||||
require.Equal(t, 1, len(c.Targets))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestParseComposeTarget(t *testing.T) {
|
func TestParseComposeTarget(t *testing.T) {
|
||||||
@@ -111,7 +74,7 @@ services:
|
|||||||
target: webapp
|
target: webapp
|
||||||
`)
|
`)
|
||||||
|
|
||||||
c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
c, err := ParseCompose(dt)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
require.Equal(t, 2, len(c.Targets))
|
require.Equal(t, 2, len(c.Targets))
|
||||||
@@ -136,15 +99,15 @@ services:
|
|||||||
target: webapp
|
target: webapp
|
||||||
`)
|
`)
|
||||||
|
|
||||||
c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
c, err := ParseCompose(dt)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 2, len(c.Targets))
|
require.Equal(t, 2, len(c.Targets))
|
||||||
sort.Slice(c.Targets, func(i, j int) bool {
|
sort.Slice(c.Targets, func(i, j int) bool {
|
||||||
return c.Targets[i].Name < c.Targets[j].Name
|
return c.Targets[i].Name < c.Targets[j].Name
|
||||||
})
|
})
|
||||||
require.Equal(t, "db", c.Targets[0].Name)
|
require.Equal(t, c.Targets[0].Name, "db")
|
||||||
require.Equal(t, "db", *c.Targets[0].Target)
|
require.Equal(t, "db", *c.Targets[0].Target)
|
||||||
require.Equal(t, "webapp", c.Targets[1].Name)
|
require.Equal(t, c.Targets[1].Name, "webapp")
|
||||||
require.Equal(t, "webapp", *c.Targets[1].Target)
|
require.Equal(t, "webapp", *c.Targets[1].Target)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -163,26 +126,35 @@ services:
|
|||||||
BRB: FOO
|
BRB: FOO
|
||||||
`)
|
`)
|
||||||
|
|
||||||
t.Setenv("FOO", "bar")
|
os.Setenv("FOO", "bar")
|
||||||
t.Setenv("BAR", "foo")
|
defer os.Unsetenv("FOO")
|
||||||
t.Setenv("ZZZ_BAR", "zzz_foo")
|
os.Setenv("BAR", "foo")
|
||||||
|
defer os.Unsetenv("BAR")
|
||||||
|
os.Setenv("ZZZ_BAR", "zzz_foo")
|
||||||
|
defer os.Unsetenv("ZZZ_BAR")
|
||||||
|
|
||||||
c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, sliceToMap(os.Environ()))
|
c, err := ParseCompose(dt)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, ptrstr("bar"), c.Targets[0].Args["FOO"])
|
require.Equal(t, c.Targets[0].Args["FOO"], "bar")
|
||||||
require.Equal(t, ptrstr("zzz_foo"), c.Targets[0].Args["BAR"])
|
require.Equal(t, c.Targets[0].Args["BAR"], "zzz_foo")
|
||||||
require.Equal(t, ptrstr("FOO"), c.Targets[0].Args["BRB"])
|
require.Equal(t, c.Targets[0].Args["BRB"], "FOO")
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestInconsistentComposeFile(t *testing.T) {
|
func TestBogusCompose(t *testing.T) {
|
||||||
var dt = []byte(`
|
var dt = []byte(`
|
||||||
services:
|
services:
|
||||||
|
db:
|
||||||
|
labels:
|
||||||
|
- "foo"
|
||||||
webapp:
|
webapp:
|
||||||
entrypoint: echo 1
|
build:
|
||||||
|
context: .
|
||||||
|
target: webapp
|
||||||
`)
|
`)
|
||||||
|
|
||||||
_, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
_, err := ParseCompose(dt)
|
||||||
require.Error(t, err)
|
require.Error(t, err)
|
||||||
|
require.Contains(t, err.Error(), "has neither an image nor a build context specified: invalid compose project")
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestAdvancedNetwork(t *testing.T) {
|
func TestAdvancedNetwork(t *testing.T) {
|
||||||
@@ -206,28 +178,10 @@ networks:
|
|||||||
gateway: 10.5.0.254
|
gateway: 10.5.0.254
|
||||||
`)
|
`)
|
||||||
|
|
||||||
_, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
_, err := ParseCompose(dt)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestTags(t *testing.T) {
|
|
||||||
var dt = []byte(`
|
|
||||||
services:
|
|
||||||
example:
|
|
||||||
image: example
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
tags:
|
|
||||||
- foo
|
|
||||||
- bar
|
|
||||||
`)
|
|
||||||
|
|
||||||
c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, []string{"foo", "bar"}, c.Targets[0].Tags)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestDependsOnList(t *testing.T) {
|
func TestDependsOnList(t *testing.T) {
|
||||||
var dt = []byte(`
|
var dt = []byte(`
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
@@ -260,7 +214,7 @@ networks:
|
|||||||
name: test-net
|
name: test-net
|
||||||
`)
|
`)
|
||||||
|
|
||||||
_, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
_, err := ParseCompose(dt)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -274,16 +228,10 @@ services:
|
|||||||
dockerfile: ./Dockerfile
|
dockerfile: ./Dockerfile
|
||||||
cache_from:
|
cache_from:
|
||||||
- user/app:cache
|
- user/app:cache
|
||||||
cache_to:
|
|
||||||
- user/app:cache
|
|
||||||
tags:
|
|
||||||
- ct-addon:baz
|
|
||||||
args:
|
args:
|
||||||
CT_ECR: foo
|
CT_ECR: foo
|
||||||
CT_TAG: bar
|
CT_TAG: bar
|
||||||
x-bake:
|
x-bake:
|
||||||
contexts:
|
|
||||||
alpine: docker-image://alpine:3.13
|
|
||||||
tags:
|
tags:
|
||||||
- ct-addon:foo
|
- ct-addon:foo
|
||||||
- ct-addon:alp
|
- ct-addon:alp
|
||||||
@@ -292,8 +240,7 @@ services:
|
|||||||
- linux/arm64
|
- linux/arm64
|
||||||
cache-from:
|
cache-from:
|
||||||
- type=local,src=path/to/cache
|
- type=local,src=path/to/cache
|
||||||
cache-to:
|
cache-to: local,dest=path/to/cache
|
||||||
- type=local,dest=path/to/cache
|
|
||||||
pull: true
|
pull: true
|
||||||
|
|
||||||
aws:
|
aws:
|
||||||
@@ -303,11 +250,6 @@ services:
|
|||||||
args:
|
args:
|
||||||
CT_ECR: foo
|
CT_ECR: foo
|
||||||
CT_TAG: bar
|
CT_TAG: bar
|
||||||
shm_size: 128m
|
|
||||||
ulimits:
|
|
||||||
nofile:
|
|
||||||
soft: 1024
|
|
||||||
hard: 1024
|
|
||||||
x-bake:
|
x-bake:
|
||||||
secret:
|
secret:
|
||||||
- id=mysecret,src=/local/secret
|
- id=mysecret,src=/local/secret
|
||||||
@@ -318,58 +260,24 @@ services:
|
|||||||
no-cache: true
|
no-cache: true
|
||||||
`)
|
`)
|
||||||
|
|
||||||
c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
c, err := ParseCompose(dt)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 2, len(c.Targets))
|
require.Equal(t, 2, len(c.Targets))
|
||||||
sort.Slice(c.Targets, func(i, j int) bool {
|
sort.Slice(c.Targets, func(i, j int) bool {
|
||||||
return c.Targets[i].Name < c.Targets[j].Name
|
return c.Targets[i].Name < c.Targets[j].Name
|
||||||
})
|
})
|
||||||
require.Equal(t, map[string]*string{"CT_ECR": ptrstr("foo"), "CT_TAG": ptrstr("bar")}, c.Targets[0].Args)
|
require.Equal(t, c.Targets[0].Args, map[string]string{"CT_ECR": "foo", "CT_TAG": "bar"})
|
||||||
require.Equal(t, []string{"ct-addon:baz", "ct-addon:foo", "ct-addon:alp"}, c.Targets[0].Tags)
|
require.Equal(t, c.Targets[0].Tags, []string{"ct-addon:foo", "ct-addon:alp"})
|
||||||
require.Equal(t, []string{"linux/amd64", "linux/arm64"}, c.Targets[0].Platforms)
|
require.Equal(t, c.Targets[0].Platforms, []string{"linux/amd64", "linux/arm64"})
|
||||||
require.Equal(t, []string{"user/app:cache", "type=local,src=path/to/cache"}, c.Targets[0].CacheFrom)
|
require.Equal(t, c.Targets[0].CacheFrom, []string{"type=local,src=path/to/cache"})
|
||||||
require.Equal(t, []string{"user/app:cache", "type=local,dest=path/to/cache"}, c.Targets[0].CacheTo)
|
require.Equal(t, c.Targets[0].CacheTo, []string{"local,dest=path/to/cache"})
|
||||||
require.Equal(t, newBool(true), c.Targets[0].Pull)
|
require.Equal(t, c.Targets[0].Pull, newBool(true))
|
||||||
require.Equal(t, map[string]string{"alpine": "docker-image://alpine:3.13"}, c.Targets[0].Contexts)
|
require.Equal(t, c.Targets[1].Tags, []string{"ct-fake-aws:bar"})
|
||||||
require.Equal(t, []string{"ct-fake-aws:bar"}, c.Targets[1].Tags)
|
require.Equal(t, c.Targets[1].Secrets, []string{"id=mysecret,src=/local/secret", "id=mysecret2,src=/local/secret2"})
|
||||||
require.Equal(t, []string{"id=mysecret,src=/local/secret", "id=mysecret2,src=/local/secret2"}, c.Targets[1].Secrets)
|
require.Equal(t, c.Targets[1].SSH, []string{"default"})
|
||||||
require.Equal(t, []string{"default"}, c.Targets[1].SSH)
|
require.Equal(t, c.Targets[1].Platforms, []string{"linux/arm64"})
|
||||||
require.Equal(t, []string{"linux/arm64"}, c.Targets[1].Platforms)
|
require.Equal(t, c.Targets[1].Outputs, []string{"type=docker"})
|
||||||
require.Equal(t, []string{"type=docker"}, c.Targets[1].Outputs)
|
require.Equal(t, c.Targets[1].NoCache, newBool(true))
|
||||||
require.Equal(t, newBool(true), c.Targets[1].NoCache)
|
|
||||||
require.Equal(t, ptrstr("128MiB"), c.Targets[1].ShmSize)
|
|
||||||
require.Equal(t, []string{"nofile=1024:1024"}, c.Targets[1].Ulimits)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestComposeExtDedup(t *testing.T) {
|
|
||||||
var dt = []byte(`
|
|
||||||
services:
|
|
||||||
webapp:
|
|
||||||
image: app:bar
|
|
||||||
build:
|
|
||||||
cache_from:
|
|
||||||
- user/app:cache
|
|
||||||
cache_to:
|
|
||||||
- user/app:cache
|
|
||||||
tags:
|
|
||||||
- ct-addon:foo
|
|
||||||
x-bake:
|
|
||||||
tags:
|
|
||||||
- ct-addon:foo
|
|
||||||
- ct-addon:baz
|
|
||||||
cache-from:
|
|
||||||
- user/app:cache
|
|
||||||
- type=local,src=path/to/cache
|
|
||||||
cache-to:
|
|
||||||
- type=local,dest=path/to/cache
|
|
||||||
`)
|
|
||||||
|
|
||||||
c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, 1, len(c.Targets))
|
|
||||||
require.Equal(t, []string{"ct-addon:foo", "ct-addon:baz"}, c.Targets[0].Tags)
|
|
||||||
require.Equal(t, []string{"user/app:cache", "type=local,src=path/to/cache"}, c.Targets[0].CacheFrom)
|
|
||||||
require.Equal(t, []string{"user/app:cache", "type=local,dest=path/to/cache"}, c.Targets[0].CacheTo)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestEnv(t *testing.T) {
|
func TestEnv(t *testing.T) {
|
||||||
@@ -397,33 +305,9 @@ services:
|
|||||||
- ` + envf.Name() + `
|
- ` + envf.Name() + `
|
||||||
`)
|
`)
|
||||||
|
|
||||||
c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
c, err := ParseCompose(dt)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, map[string]*string{"CT_ECR": ptrstr("foo"), "FOO": ptrstr("bsdf -csdf"), "NODE_ENV": ptrstr("test")}, c.Targets[0].Args)
|
require.Equal(t, c.Targets[0].Args, map[string]string{"CT_ECR": "foo", "FOO": "bsdf -csdf", "NODE_ENV": "test"})
|
||||||
}
|
|
||||||
|
|
||||||
func TestDotEnv(t *testing.T) {
|
|
||||||
tmpdir := t.TempDir()
|
|
||||||
|
|
||||||
err := os.WriteFile(filepath.Join(tmpdir, ".env"), []byte("FOO=bar"), 0644)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
var dt = []byte(`
|
|
||||||
services:
|
|
||||||
scratch:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
args:
|
|
||||||
FOO:
|
|
||||||
`)
|
|
||||||
|
|
||||||
chdir(t, tmpdir)
|
|
||||||
c, err := ParseComposeFiles([]File{{
|
|
||||||
Name: "docker-compose.yml",
|
|
||||||
Data: dt,
|
|
||||||
}})
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, map[string]*string{"FOO": ptrstr("bar")}, c.Targets[0].Args)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestPorts(t *testing.T) {
|
func TestPorts(t *testing.T) {
|
||||||
@@ -443,7 +327,7 @@ services:
|
|||||||
published: "3306"
|
published: "3306"
|
||||||
protocol: tcp
|
protocol: tcp
|
||||||
`)
|
`)
|
||||||
_, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
_, err := ParseCompose(dt)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -469,6 +353,10 @@ func TestServiceName(t *testing.T) {
|
|||||||
svc: "a.b",
|
svc: "a.b",
|
||||||
wantErr: false,
|
wantErr: false,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
svc: "a?b",
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
svc: "_a",
|
svc: "_a",
|
||||||
wantErr: false,
|
wantErr: false,
|
||||||
@@ -489,12 +377,12 @@ func TestServiceName(t *testing.T) {
|
|||||||
for _, tt := range cases {
|
for _, tt := range cases {
|
||||||
tt := tt
|
tt := tt
|
||||||
t.Run(tt.svc, func(t *testing.T) {
|
t.Run(tt.svc, func(t *testing.T) {
|
||||||
_, err := ParseCompose([]composetypes.ConfigFile{{Content: []byte(`
|
_, err := ParseCompose([]byte(`
|
||||||
services:
|
services:
|
||||||
` + tt.svc + `:
|
` + tt.svc + `:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
`)}}, nil)
|
`))
|
||||||
if tt.wantErr {
|
if tt.wantErr {
|
||||||
require.Error(t, err)
|
require.Error(t, err)
|
||||||
} else {
|
} else {
|
||||||
@@ -503,259 +391,3 @@ services:
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestValidateComposeSecret(t *testing.T) {
|
|
||||||
cases := []struct {
|
|
||||||
name string
|
|
||||||
dt []byte
|
|
||||||
wantErr bool
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "secret set by file",
|
|
||||||
dt: []byte(`
|
|
||||||
secrets:
|
|
||||||
foo:
|
|
||||||
file: .secret
|
|
||||||
`),
|
|
||||||
wantErr: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "secret set by environment",
|
|
||||||
dt: []byte(`
|
|
||||||
secrets:
|
|
||||||
foo:
|
|
||||||
environment: TOKEN
|
|
||||||
`),
|
|
||||||
wantErr: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "external secret",
|
|
||||||
dt: []byte(`
|
|
||||||
secrets:
|
|
||||||
foo:
|
|
||||||
external: true
|
|
||||||
`),
|
|
||||||
wantErr: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "unset secret",
|
|
||||||
dt: []byte(`
|
|
||||||
secrets:
|
|
||||||
foo: {}
|
|
||||||
`),
|
|
||||||
wantErr: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "undefined secret",
|
|
||||||
dt: []byte(`
|
|
||||||
services:
|
|
||||||
foo:
|
|
||||||
build:
|
|
||||||
secrets:
|
|
||||||
- token
|
|
||||||
`),
|
|
||||||
wantErr: true,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
for _, tt := range cases {
|
|
||||||
tt := tt
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
_, err := ParseCompose([]composetypes.ConfigFile{{Content: tt.dt}}, nil)
|
|
||||||
if tt.wantErr {
|
|
||||||
require.Error(t, err)
|
|
||||||
} else {
|
|
||||||
require.NoError(t, err)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestValidateComposeFile(t *testing.T) {
|
|
||||||
cases := []struct {
|
|
||||||
name string
|
|
||||||
fn string
|
|
||||||
dt []byte
|
|
||||||
isCompose bool
|
|
||||||
wantErr bool
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "empty service",
|
|
||||||
fn: "docker-compose.yml",
|
|
||||||
dt: []byte(`
|
|
||||||
services:
|
|
||||||
foo:
|
|
||||||
`),
|
|
||||||
isCompose: true,
|
|
||||||
wantErr: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "build",
|
|
||||||
fn: "docker-compose.yml",
|
|
||||||
dt: []byte(`
|
|
||||||
services:
|
|
||||||
foo:
|
|
||||||
build: .
|
|
||||||
`),
|
|
||||||
isCompose: true,
|
|
||||||
wantErr: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "image",
|
|
||||||
fn: "docker-compose.yml",
|
|
||||||
dt: []byte(`
|
|
||||||
services:
|
|
||||||
simple:
|
|
||||||
image: nginx
|
|
||||||
`),
|
|
||||||
isCompose: true,
|
|
||||||
wantErr: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "unknown ext",
|
|
||||||
fn: "docker-compose.foo",
|
|
||||||
dt: []byte(`
|
|
||||||
services:
|
|
||||||
simple:
|
|
||||||
image: nginx
|
|
||||||
`),
|
|
||||||
isCompose: true,
|
|
||||||
wantErr: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "hcl",
|
|
||||||
fn: "docker-bake.hcl",
|
|
||||||
dt: []byte(`
|
|
||||||
target "default" {
|
|
||||||
dockerfile = "test"
|
|
||||||
}
|
|
||||||
`),
|
|
||||||
isCompose: false,
|
|
||||||
wantErr: false,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
for _, tt := range cases {
|
|
||||||
tt := tt
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
isCompose, err := validateComposeFile(tt.dt, tt.fn)
|
|
||||||
assert.Equal(t, tt.isCompose, isCompose)
|
|
||||||
if tt.wantErr {
|
|
||||||
require.Error(t, err)
|
|
||||||
} else {
|
|
||||||
require.NoError(t, err)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestComposeNullArgs(t *testing.T) {
|
|
||||||
var dt = []byte(`
|
|
||||||
services:
|
|
||||||
scratch:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
args:
|
|
||||||
FOO: null
|
|
||||||
bar: "baz"
|
|
||||||
`)
|
|
||||||
|
|
||||||
c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, map[string]*string{"bar": ptrstr("baz")}, c.Targets[0].Args)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestDependsOn(t *testing.T) {
|
|
||||||
var dt = []byte(`
|
|
||||||
services:
|
|
||||||
foo:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
ports:
|
|
||||||
- 3306:3306
|
|
||||||
depends_on:
|
|
||||||
- bar
|
|
||||||
bar:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
`)
|
|
||||||
_, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestInclude(t *testing.T) {
|
|
||||||
tmpdir := t.TempDir()
|
|
||||||
|
|
||||||
err := os.WriteFile(filepath.Join(tmpdir, "compose-foo.yml"), []byte(`
|
|
||||||
services:
|
|
||||||
foo:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
target: buildfoo
|
|
||||||
ports:
|
|
||||||
- 3306:3306
|
|
||||||
`), 0644)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
var dt = []byte(`
|
|
||||||
include:
|
|
||||||
- compose-foo.yml
|
|
||||||
|
|
||||||
services:
|
|
||||||
bar:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
target: buildbar
|
|
||||||
`)
|
|
||||||
|
|
||||||
chdir(t, tmpdir)
|
|
||||||
c, err := ParseComposeFiles([]File{{
|
|
||||||
Name: "composetypes.yml",
|
|
||||||
Data: dt,
|
|
||||||
}})
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
require.Equal(t, 2, len(c.Targets))
|
|
||||||
sort.Slice(c.Targets, func(i, j int) bool {
|
|
||||||
return c.Targets[i].Name < c.Targets[j].Name
|
|
||||||
})
|
|
||||||
require.Equal(t, "bar", c.Targets[0].Name)
|
|
||||||
require.Equal(t, "buildbar", *c.Targets[0].Target)
|
|
||||||
require.Equal(t, "foo", c.Targets[1].Name)
|
|
||||||
require.Equal(t, "buildfoo", *c.Targets[1].Target)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestDevelop(t *testing.T) {
|
|
||||||
var dt = []byte(`
|
|
||||||
services:
|
|
||||||
scratch:
|
|
||||||
build:
|
|
||||||
context: ./webapp
|
|
||||||
develop:
|
|
||||||
watch:
|
|
||||||
- path: ./webapp/html
|
|
||||||
action: sync
|
|
||||||
target: /var/www
|
|
||||||
ignore:
|
|
||||||
- node_modules/
|
|
||||||
`)
|
|
||||||
|
|
||||||
_, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// chdir changes the current working directory to the named directory,
|
|
||||||
// and then restore the original working directory at the end of the test.
|
|
||||||
func chdir(t *testing.T, dir string) {
|
|
||||||
olddir, err := os.Getwd()
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("chdir: %v", err)
|
|
||||||
}
|
|
||||||
if err := os.Chdir(dir); err != nil {
|
|
||||||
t.Fatalf("chdir %s: %v", dir, err)
|
|
||||||
}
|
|
||||||
t.Cleanup(func() {
|
|
||||||
if err := os.Chdir(olddir); err != nil {
|
|
||||||
t.Errorf("chdir to original working directory %s: %v", olddir, err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|||||||
923
bake/hcl_test.go
923
bake/hcl_test.go
File diff suppressed because it is too large
Load Diff
@@ -1,103 +0,0 @@
|
|||||||
package hclparser
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/hashicorp/hcl/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
type filterBody struct {
|
|
||||||
body hcl.Body
|
|
||||||
schema *hcl.BodySchema
|
|
||||||
exclude bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func FilterIncludeBody(body hcl.Body, schema *hcl.BodySchema) hcl.Body {
|
|
||||||
return &filterBody{
|
|
||||||
body: body,
|
|
||||||
schema: schema,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func FilterExcludeBody(body hcl.Body, schema *hcl.BodySchema) hcl.Body {
|
|
||||||
return &filterBody{
|
|
||||||
body: body,
|
|
||||||
schema: schema,
|
|
||||||
exclude: true,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *filterBody) Content(schema *hcl.BodySchema) (*hcl.BodyContent, hcl.Diagnostics) {
|
|
||||||
if b.exclude {
|
|
||||||
schema = subtractSchemas(schema, b.schema)
|
|
||||||
} else {
|
|
||||||
schema = intersectSchemas(schema, b.schema)
|
|
||||||
}
|
|
||||||
content, _, diag := b.body.PartialContent(schema)
|
|
||||||
return content, diag
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *filterBody) PartialContent(schema *hcl.BodySchema) (*hcl.BodyContent, hcl.Body, hcl.Diagnostics) {
|
|
||||||
if b.exclude {
|
|
||||||
schema = subtractSchemas(schema, b.schema)
|
|
||||||
} else {
|
|
||||||
schema = intersectSchemas(schema, b.schema)
|
|
||||||
}
|
|
||||||
return b.body.PartialContent(schema)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *filterBody) JustAttributes() (hcl.Attributes, hcl.Diagnostics) {
|
|
||||||
return b.body.JustAttributes()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *filterBody) MissingItemRange() hcl.Range {
|
|
||||||
return b.body.MissingItemRange()
|
|
||||||
}
|
|
||||||
|
|
||||||
func intersectSchemas(a, b *hcl.BodySchema) *hcl.BodySchema {
|
|
||||||
result := &hcl.BodySchema{}
|
|
||||||
for _, blockA := range a.Blocks {
|
|
||||||
for _, blockB := range b.Blocks {
|
|
||||||
if blockA.Type == blockB.Type {
|
|
||||||
result.Blocks = append(result.Blocks, blockA)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, attrA := range a.Attributes {
|
|
||||||
for _, attrB := range b.Attributes {
|
|
||||||
if attrA.Name == attrB.Name {
|
|
||||||
result.Attributes = append(result.Attributes, attrA)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
func subtractSchemas(a, b *hcl.BodySchema) *hcl.BodySchema {
|
|
||||||
result := &hcl.BodySchema{}
|
|
||||||
for _, blockA := range a.Blocks {
|
|
||||||
found := false
|
|
||||||
for _, blockB := range b.Blocks {
|
|
||||||
if blockA.Type == blockB.Type {
|
|
||||||
found = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !found {
|
|
||||||
result.Blocks = append(result.Blocks, blockA)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, attrA := range a.Attributes {
|
|
||||||
found := false
|
|
||||||
for _, attrB := range b.Attributes {
|
|
||||||
if attrA.Name == attrB.Name {
|
|
||||||
found = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !found {
|
|
||||||
result.Attributes = append(result.Attributes, attrA)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
@@ -14,7 +14,15 @@ func funcCalls(exp hcl.Expression) ([]string, hcl.Diagnostics) {
|
|||||||
if !ok {
|
if !ok {
|
||||||
fns, err := jsonFuncCallsRecursive(exp)
|
fns, err := jsonFuncCallsRecursive(exp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, wrapErrorDiagnostic("Invalid expression", err, exp.Range().Ptr(), exp.Range().Ptr())
|
return nil, hcl.Diagnostics{
|
||||||
|
&hcl.Diagnostic{
|
||||||
|
Severity: hcl.DiagError,
|
||||||
|
Summary: "Invalid expression",
|
||||||
|
Detail: err.Error(),
|
||||||
|
Subject: exp.Range().Ptr(),
|
||||||
|
Context: exp.Range().Ptr(),
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return fns, nil
|
return fns, nil
|
||||||
}
|
}
|
||||||
@@ -75,11 +83,11 @@ func appendJSONFuncCalls(exp hcl.Expression, m map[string]struct{}) error {
|
|||||||
|
|
||||||
// hcl/v2/json/ast#stringVal
|
// hcl/v2/json/ast#stringVal
|
||||||
val := src.FieldByName("Value")
|
val := src.FieldByName("Value")
|
||||||
if !val.IsValid() || val.IsZero() {
|
if val.IsZero() {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
rng := src.FieldByName("SrcRange")
|
rng := src.FieldByName("SrcRange")
|
||||||
if rng.IsZero() {
|
if val.IsZero() {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
var stringVal struct {
|
var stringVal struct {
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
package hclparser
|
package hclparser
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/binary"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"hash/fnv"
|
|
||||||
"math"
|
"math"
|
||||||
"math/big"
|
"math/big"
|
||||||
"reflect"
|
"reflect"
|
||||||
@@ -15,7 +13,6 @@ import (
|
|||||||
"github.com/hashicorp/hcl/v2/gohcl"
|
"github.com/hashicorp/hcl/v2/gohcl"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/zclconf/go-cty/cty"
|
"github.com/zclconf/go-cty/cty"
|
||||||
"github.com/zclconf/go-cty/cty/gocty"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type Opt struct {
|
type Opt struct {
|
||||||
@@ -51,42 +48,30 @@ type parser struct {
|
|||||||
attrs map[string]*hcl.Attribute
|
attrs map[string]*hcl.Attribute
|
||||||
funcs map[string]*functionDef
|
funcs map[string]*functionDef
|
||||||
|
|
||||||
blocks map[string]map[string][]*hcl.Block
|
|
||||||
blockValues map[*hcl.Block][]reflect.Value
|
|
||||||
blockEvalCtx map[*hcl.Block][]*hcl.EvalContext
|
|
||||||
blockNames map[*hcl.Block][]string
|
|
||||||
blockTypes map[string]reflect.Type
|
|
||||||
|
|
||||||
ectx *hcl.EvalContext
|
ectx *hcl.EvalContext
|
||||||
|
|
||||||
progressV map[uint64]struct{}
|
progress map[string]struct{}
|
||||||
progressF map[uint64]struct{}
|
progressF map[string]struct{}
|
||||||
progressB map[uint64]map[string]struct{}
|
doneF map[string]struct{}
|
||||||
doneB map[uint64]map[string]struct{}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type WithEvalContexts interface {
|
func (p *parser) loadDeps(exp hcl.Expression, exclude map[string]struct{}) hcl.Diagnostics {
|
||||||
GetEvalContexts(base *hcl.EvalContext, block *hcl.Block, loadDeps func(hcl.Expression) hcl.Diagnostics) ([]*hcl.EvalContext, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
type WithGetName interface {
|
|
||||||
GetName(ectx *hcl.EvalContext, block *hcl.Block, loadDeps func(hcl.Expression) hcl.Diagnostics) (string, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
var errUndefined = errors.New("undefined")
|
|
||||||
|
|
||||||
func (p *parser) loadDeps(ectx *hcl.EvalContext, exp hcl.Expression, exclude map[string]struct{}, allowMissing bool) hcl.Diagnostics {
|
|
||||||
fns, hcldiags := funcCalls(exp)
|
fns, hcldiags := funcCalls(exp)
|
||||||
if hcldiags.HasErrors() {
|
if hcldiags.HasErrors() {
|
||||||
return hcldiags
|
return hcldiags
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, fn := range fns {
|
for _, fn := range fns {
|
||||||
if err := p.resolveFunction(ectx, fn); err != nil {
|
if err := p.resolveFunction(fn); err != nil {
|
||||||
if allowMissing && errors.Is(err, errUndefined) {
|
return hcl.Diagnostics{
|
||||||
continue
|
&hcl.Diagnostic{
|
||||||
|
Severity: hcl.DiagError,
|
||||||
|
Summary: "Invalid expression",
|
||||||
|
Detail: err.Error(),
|
||||||
|
Subject: exp.Range().Ptr(),
|
||||||
|
Context: exp.Range().Ptr(),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
return wrapErrorDiagnostic("Invalid expression", err, exp.Range().Ptr(), exp.Range().Ptr())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,92 +79,37 @@ func (p *parser) loadDeps(ectx *hcl.EvalContext, exp hcl.Expression, exclude map
|
|||||||
if _, ok := exclude[v.RootName()]; ok {
|
if _, ok := exclude[v.RootName()]; ok {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if _, ok := p.blockTypes[v.RootName()]; ok {
|
if err := p.resolveValue(v.RootName()); err != nil {
|
||||||
blockType := v.RootName()
|
|
||||||
|
|
||||||
split := v.SimpleSplit().Rel
|
|
||||||
if len(split) == 0 {
|
|
||||||
return hcl.Diagnostics{
|
return hcl.Diagnostics{
|
||||||
&hcl.Diagnostic{
|
&hcl.Diagnostic{
|
||||||
Severity: hcl.DiagError,
|
Severity: hcl.DiagError,
|
||||||
Summary: "Invalid expression",
|
Summary: "Invalid expression",
|
||||||
Detail: fmt.Sprintf("cannot access %s as a variable", blockType),
|
Detail: err.Error(),
|
||||||
Subject: exp.Range().Ptr(),
|
Subject: v.SourceRange().Ptr(),
|
||||||
Context: exp.Range().Ptr(),
|
Context: v.SourceRange().Ptr(),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
blockName, ok := split[0].(hcl.TraverseAttr)
|
|
||||||
if !ok {
|
|
||||||
return hcl.Diagnostics{
|
|
||||||
&hcl.Diagnostic{
|
|
||||||
Severity: hcl.DiagError,
|
|
||||||
Summary: "Invalid expression",
|
|
||||||
Detail: fmt.Sprintf("cannot traverse %s without attribute", blockType),
|
|
||||||
Subject: exp.Range().Ptr(),
|
|
||||||
Context: exp.Range().Ptr(),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
blocks := p.blocks[blockType][blockName.Name]
|
|
||||||
if len(blocks) == 0 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
var target *hcl.BodySchema
|
|
||||||
if len(split) > 1 {
|
|
||||||
if attr, ok := split[1].(hcl.TraverseAttr); ok {
|
|
||||||
target = &hcl.BodySchema{
|
|
||||||
Attributes: []hcl.AttributeSchema{{Name: attr.Name}},
|
|
||||||
Blocks: []hcl.BlockHeaderSchema{{Type: attr.Name}},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, block := range blocks {
|
|
||||||
if err := p.resolveBlock(block, target); err != nil {
|
|
||||||
if allowMissing && errors.Is(err, errUndefined) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
return wrapErrorDiagnostic("Invalid expression", err, exp.Range().Ptr(), exp.Range().Ptr())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if err := p.resolveValue(ectx, v.RootName()); err != nil {
|
|
||||||
if allowMissing && errors.Is(err, errUndefined) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
return wrapErrorDiagnostic("Invalid expression", err, exp.Range().Ptr(), exp.Range().Ptr())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// resolveFunction forces evaluation of a function, storing the result into the
|
func (p *parser) resolveFunction(name string) error {
|
||||||
// parser.
|
if _, ok := p.doneF[name]; ok {
|
||||||
func (p *parser) resolveFunction(ectx *hcl.EvalContext, name string) error {
|
|
||||||
if _, ok := p.ectx.Functions[name]; ok {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if _, ok := ectx.Functions[name]; ok {
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
f, ok := p.funcs[name]
|
f, ok := p.funcs[name]
|
||||||
if !ok {
|
if !ok {
|
||||||
return errors.Wrapf(errUndefined, "function %q does not exist", name)
|
if _, ok := p.ectx.Functions[name]; ok {
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
if _, ok := p.progressF[key(ectx, name)]; ok {
|
return errors.Errorf("undefined function %s", name)
|
||||||
|
}
|
||||||
|
if _, ok := p.progressF[name]; ok {
|
||||||
return errors.Errorf("function cycle not allowed for %s", name)
|
return errors.Errorf("function cycle not allowed for %s", name)
|
||||||
}
|
}
|
||||||
p.progressF[key(ectx, name)] = struct{}{}
|
p.progressF[name] = struct{}{}
|
||||||
|
|
||||||
if f.Result == nil {
|
|
||||||
return errors.Errorf("empty result not allowed for %s", name)
|
|
||||||
}
|
|
||||||
if f.Params == nil {
|
|
||||||
return errors.Errorf("empty params not allowed for %s", name)
|
|
||||||
}
|
|
||||||
|
|
||||||
paramExprs, paramsDiags := hcl.ExprList(f.Params.Expr)
|
paramExprs, paramsDiags := hcl.ExprList(f.Params.Expr)
|
||||||
if paramsDiags.HasErrors() {
|
if paramsDiags.HasErrors() {
|
||||||
@@ -217,7 +147,7 @@ func (p *parser) resolveFunction(ectx *hcl.EvalContext, name string) error {
|
|||||||
return diags
|
return diags
|
||||||
}
|
}
|
||||||
|
|
||||||
if diags := p.loadDeps(p.ectx, f.Result.Expr, params, false); diags.HasErrors() {
|
if diags := p.loadDeps(f.Result.Expr, params); diags.HasErrors() {
|
||||||
return diags
|
return diags
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -227,24 +157,20 @@ func (p *parser) resolveFunction(ectx *hcl.EvalContext, name string) error {
|
|||||||
if diags.HasErrors() {
|
if diags.HasErrors() {
|
||||||
return diags
|
return diags
|
||||||
}
|
}
|
||||||
|
p.doneF[name] = struct{}{}
|
||||||
p.ectx.Functions[name] = v
|
p.ectx.Functions[name] = v
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// resolveValue forces evaluation of a named value, storing the result into the
|
func (p *parser) resolveValue(name string) (err error) {
|
||||||
// parser.
|
|
||||||
func (p *parser) resolveValue(ectx *hcl.EvalContext, name string) (err error) {
|
|
||||||
if _, ok := p.ectx.Variables[name]; ok {
|
if _, ok := p.ectx.Variables[name]; ok {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if _, ok := ectx.Variables[name]; ok {
|
if _, ok := p.progress[name]; ok {
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if _, ok := p.progressV[key(ectx, name)]; ok {
|
|
||||||
return errors.Errorf("variable cycle not allowed for %s", name)
|
return errors.Errorf("variable cycle not allowed for %s", name)
|
||||||
}
|
}
|
||||||
p.progressV[key(ectx, name)] = struct{}{}
|
p.progress[name] = struct{}{}
|
||||||
|
|
||||||
var v *cty.Value
|
var v *cty.Value
|
||||||
defer func() {
|
defer func() {
|
||||||
@@ -257,10 +183,9 @@ func (p *parser) resolveValue(ectx *hcl.EvalContext, name string) (err error) {
|
|||||||
if _, builtin := p.opt.Vars[name]; !ok && !builtin {
|
if _, builtin := p.opt.Vars[name]; !ok && !builtin {
|
||||||
vr, ok := p.vars[name]
|
vr, ok := p.vars[name]
|
||||||
if !ok {
|
if !ok {
|
||||||
return errors.Wrapf(errUndefined, "variable %q does not exist", name)
|
return errors.Errorf("undefined variable %q", name)
|
||||||
}
|
}
|
||||||
def = vr.Default
|
def = vr.Default
|
||||||
ectx = p.ectx
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if def == nil {
|
if def == nil {
|
||||||
@@ -273,10 +198,10 @@ func (p *parser) resolveValue(ectx *hcl.EvalContext, name string) (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if diags := p.loadDeps(ectx, def.Expr, nil, true); diags.HasErrors() {
|
if diags := p.loadDeps(def.Expr, nil); diags.HasErrors() {
|
||||||
return diags
|
return diags
|
||||||
}
|
}
|
||||||
vv, diags := def.Expr.Value(ectx)
|
vv, diags := def.Expr.Value(p.ectx)
|
||||||
if diags.HasErrors() {
|
if diags.HasErrors() {
|
||||||
return diags
|
return diags
|
||||||
}
|
}
|
||||||
@@ -284,16 +209,19 @@ func (p *parser) resolveValue(ectx *hcl.EvalContext, name string) (err error) {
|
|||||||
_, isVar := p.vars[name]
|
_, isVar := p.vars[name]
|
||||||
|
|
||||||
if envv, ok := p.opt.LookupVar(name); ok && isVar {
|
if envv, ok := p.opt.LookupVar(name); ok && isVar {
|
||||||
switch {
|
if vv.Type().Equals(cty.Bool) {
|
||||||
case vv.Type().Equals(cty.Bool):
|
|
||||||
b, err := strconv.ParseBool(envv)
|
b, err := strconv.ParseBool(envv)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.Wrapf(err, "failed to parse %s as bool", name)
|
return errors.Wrapf(err, "failed to parse %s as bool", name)
|
||||||
}
|
}
|
||||||
vv = cty.BoolVal(b)
|
vv := cty.BoolVal(b)
|
||||||
case vv.Type().Equals(cty.String), vv.Type().Equals(cty.DynamicPseudoType):
|
v = &vv
|
||||||
vv = cty.StringVal(envv)
|
return nil
|
||||||
case vv.Type().Equals(cty.Number):
|
} else if vv.Type().Equals(cty.String) {
|
||||||
|
vv := cty.StringVal(envv)
|
||||||
|
v = &vv
|
||||||
|
return nil
|
||||||
|
} else if vv.Type().Equals(cty.Number) {
|
||||||
n, err := strconv.ParseFloat(envv, 64)
|
n, err := strconv.ParseFloat(envv, 64)
|
||||||
if err == nil && (math.IsNaN(n) || math.IsInf(n, 0)) {
|
if err == nil && (math.IsNaN(n) || math.IsInf(n, 0)) {
|
||||||
err = errors.Errorf("invalid number value")
|
err = errors.Errorf("invalid number value")
|
||||||
@@ -301,240 +229,19 @@ func (p *parser) resolveValue(ectx *hcl.EvalContext, name string) (err error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.Wrapf(err, "failed to parse %s as number", name)
|
return errors.Wrapf(err, "failed to parse %s as number", name)
|
||||||
}
|
}
|
||||||
vv = cty.NumberVal(big.NewFloat(n))
|
vv := cty.NumberVal(big.NewFloat(n))
|
||||||
default:
|
v = &vv
|
||||||
|
return nil
|
||||||
|
} else {
|
||||||
// TODO: support lists with csv values
|
// TODO: support lists with csv values
|
||||||
return errors.Errorf("unsupported type %s for variable %s", vv.Type().FriendlyName(), name)
|
return errors.Errorf("unsupported type %s for variable %s", v.Type(), name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
v = &vv
|
v = &vv
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// resolveBlock force evaluates a block, storing the result in the parser. If a
|
func Parse(b hcl.Body, opt Opt, val interface{}) hcl.Diagnostics {
|
||||||
// target schema is provided, only the attributes and blocks present in the
|
|
||||||
// schema will be evaluated.
|
|
||||||
func (p *parser) resolveBlock(block *hcl.Block, target *hcl.BodySchema) (err error) {
|
|
||||||
// prepare the variable map for this type
|
|
||||||
if _, ok := p.ectx.Variables[block.Type]; !ok {
|
|
||||||
p.ectx.Variables[block.Type] = cty.MapValEmpty(cty.Map(cty.String))
|
|
||||||
}
|
|
||||||
|
|
||||||
// prepare the output destination and evaluation context
|
|
||||||
t, ok := p.blockTypes[block.Type]
|
|
||||||
if !ok {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
var outputs []reflect.Value
|
|
||||||
var ectxs []*hcl.EvalContext
|
|
||||||
if prev, ok := p.blockValues[block]; ok {
|
|
||||||
outputs = prev
|
|
||||||
ectxs = p.blockEvalCtx[block]
|
|
||||||
} else {
|
|
||||||
if v, ok := reflect.New(t).Interface().(WithEvalContexts); ok {
|
|
||||||
ectxs, err = v.GetEvalContexts(p.ectx, block, func(expr hcl.Expression) hcl.Diagnostics {
|
|
||||||
return p.loadDeps(p.ectx, expr, nil, true)
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
for _, ectx := range ectxs {
|
|
||||||
if ectx != p.ectx && ectx.Parent() != p.ectx {
|
|
||||||
return errors.Errorf("EvalContext must return a context with the correct parent")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
ectxs = append([]*hcl.EvalContext{}, p.ectx)
|
|
||||||
}
|
|
||||||
for range ectxs {
|
|
||||||
outputs = append(outputs, reflect.New(t))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
p.blockValues[block] = outputs
|
|
||||||
p.blockEvalCtx[block] = ectxs
|
|
||||||
|
|
||||||
for i, output := range outputs {
|
|
||||||
target := target
|
|
||||||
ectx := ectxs[i]
|
|
||||||
name := block.Labels[0]
|
|
||||||
if names, ok := p.blockNames[block]; ok {
|
|
||||||
name = names[i]
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, ok := p.doneB[key(block, ectx)]; !ok {
|
|
||||||
p.doneB[key(block, ectx)] = map[string]struct{}{}
|
|
||||||
}
|
|
||||||
if _, ok := p.progressB[key(block, ectx)]; !ok {
|
|
||||||
p.progressB[key(block, ectx)] = map[string]struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
if target != nil {
|
|
||||||
// filter out attributes and blocks that are already evaluated
|
|
||||||
original := target
|
|
||||||
target = &hcl.BodySchema{}
|
|
||||||
for _, a := range original.Attributes {
|
|
||||||
if _, ok := p.doneB[key(block, ectx)][a.Name]; !ok {
|
|
||||||
target.Attributes = append(target.Attributes, a)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, b := range original.Blocks {
|
|
||||||
if _, ok := p.doneB[key(block, ectx)][b.Type]; !ok {
|
|
||||||
target.Blocks = append(target.Blocks, b)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if len(target.Attributes) == 0 && len(target.Blocks) == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if target != nil {
|
|
||||||
// detect reference cycles
|
|
||||||
for _, a := range target.Attributes {
|
|
||||||
if _, ok := p.progressB[key(block, ectx)][a.Name]; ok {
|
|
||||||
return errors.Errorf("reference cycle not allowed for %s.%s.%s", block.Type, name, a.Name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, b := range target.Blocks {
|
|
||||||
if _, ok := p.progressB[key(block, ectx)][b.Type]; ok {
|
|
||||||
return errors.Errorf("reference cycle not allowed for %s.%s.%s", block.Type, name, b.Type)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, a := range target.Attributes {
|
|
||||||
p.progressB[key(block, ectx)][a.Name] = struct{}{}
|
|
||||||
}
|
|
||||||
for _, b := range target.Blocks {
|
|
||||||
p.progressB[key(block, ectx)][b.Type] = struct{}{}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// create a filtered body that contains only the target properties
|
|
||||||
body := func() hcl.Body {
|
|
||||||
if target != nil {
|
|
||||||
return FilterIncludeBody(block.Body, target)
|
|
||||||
}
|
|
||||||
|
|
||||||
filter := &hcl.BodySchema{}
|
|
||||||
for k := range p.doneB[key(block, ectx)] {
|
|
||||||
filter.Attributes = append(filter.Attributes, hcl.AttributeSchema{Name: k})
|
|
||||||
filter.Blocks = append(filter.Blocks, hcl.BlockHeaderSchema{Type: k})
|
|
||||||
}
|
|
||||||
return FilterExcludeBody(block.Body, filter)
|
|
||||||
}
|
|
||||||
|
|
||||||
// load dependencies from all targeted properties
|
|
||||||
schema, _ := gohcl.ImpliedBodySchema(reflect.New(t).Interface())
|
|
||||||
content, _, diag := body().PartialContent(schema)
|
|
||||||
if diag.HasErrors() {
|
|
||||||
return diag
|
|
||||||
}
|
|
||||||
for _, a := range content.Attributes {
|
|
||||||
diag := p.loadDeps(ectx, a.Expr, nil, true)
|
|
||||||
if diag.HasErrors() {
|
|
||||||
return diag
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, b := range content.Blocks {
|
|
||||||
err := p.resolveBlock(b, nil)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// decode!
|
|
||||||
diag = gohcl.DecodeBody(body(), ectx, output.Interface())
|
|
||||||
if diag.HasErrors() {
|
|
||||||
return diag
|
|
||||||
}
|
|
||||||
|
|
||||||
// mark all targeted properties as done
|
|
||||||
for _, a := range content.Attributes {
|
|
||||||
p.doneB[key(block, ectx)][a.Name] = struct{}{}
|
|
||||||
}
|
|
||||||
for _, b := range content.Blocks {
|
|
||||||
p.doneB[key(block, ectx)][b.Type] = struct{}{}
|
|
||||||
}
|
|
||||||
if target != nil {
|
|
||||||
for _, a := range target.Attributes {
|
|
||||||
p.doneB[key(block, ectx)][a.Name] = struct{}{}
|
|
||||||
}
|
|
||||||
for _, b := range target.Blocks {
|
|
||||||
p.doneB[key(block, ectx)][b.Type] = struct{}{}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// store the result into the evaluation context (so it can be referenced)
|
|
||||||
outputType, err := gocty.ImpliedType(output.Interface())
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
outputValue, err := gocty.ToCtyValue(output.Interface(), outputType)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
var m map[string]cty.Value
|
|
||||||
if m2, ok := p.ectx.Variables[block.Type]; ok {
|
|
||||||
m = m2.AsValueMap()
|
|
||||||
}
|
|
||||||
if m == nil {
|
|
||||||
m = map[string]cty.Value{}
|
|
||||||
}
|
|
||||||
m[name] = outputValue
|
|
||||||
p.ectx.Variables[block.Type] = cty.MapVal(m)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// resolveBlockNames returns the names of the block, calling resolveBlock to
|
|
||||||
// evaluate any label fields to correctly resolve the name.
|
|
||||||
func (p *parser) resolveBlockNames(block *hcl.Block) ([]string, error) {
|
|
||||||
if names, ok := p.blockNames[block]; ok {
|
|
||||||
return names, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := p.resolveBlock(block, &hcl.BodySchema{}); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
names := make([]string, 0, len(p.blockValues[block]))
|
|
||||||
for i, val := range p.blockValues[block] {
|
|
||||||
ectx := p.blockEvalCtx[block][i]
|
|
||||||
|
|
||||||
name := block.Labels[0]
|
|
||||||
if err := p.opt.ValidateLabel(name); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if v, ok := val.Interface().(WithGetName); ok {
|
|
||||||
var err error
|
|
||||||
name, err = v.GetName(ectx, block, func(expr hcl.Expression) hcl.Diagnostics {
|
|
||||||
return p.loadDeps(ectx, expr, nil, true)
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err := p.opt.ValidateLabel(name); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
setName(val, name)
|
|
||||||
names = append(names, name)
|
|
||||||
}
|
|
||||||
|
|
||||||
found := map[string]struct{}{}
|
|
||||||
for _, name := range names {
|
|
||||||
if _, ok := found[name]; ok {
|
|
||||||
return nil, errors.Errorf("duplicate name %q", name)
|
|
||||||
}
|
|
||||||
found[name] = struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
p.blockNames[block] = names
|
|
||||||
return names, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string, hcl.Diagnostics) {
|
|
||||||
reserved := map[string]struct{}{}
|
reserved := map[string]struct{}{}
|
||||||
schema, _ := gohcl.ImpliedBodySchema(val)
|
schema, _ := gohcl.ImpliedBodySchema(val)
|
||||||
|
|
||||||
@@ -547,9 +254,8 @@ func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string
|
|||||||
|
|
||||||
var defs inputs
|
var defs inputs
|
||||||
if err := gohcl.DecodeBody(b, nil, &defs); err != nil {
|
if err := gohcl.DecodeBody(b, nil, &defs); err != nil {
|
||||||
return nil, err
|
return err
|
||||||
}
|
}
|
||||||
defsSchema, _ := gohcl.ImpliedBodySchema(defs)
|
|
||||||
|
|
||||||
if opt.LookupVar == nil {
|
if opt.LookupVar == nil {
|
||||||
opt.LookupVar = func(string) (string, bool) {
|
opt.LookupVar = func(string) (string, bool) {
|
||||||
@@ -570,20 +276,13 @@ func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string
|
|||||||
attrs: map[string]*hcl.Attribute{},
|
attrs: map[string]*hcl.Attribute{},
|
||||||
funcs: map[string]*functionDef{},
|
funcs: map[string]*functionDef{},
|
||||||
|
|
||||||
blocks: map[string]map[string][]*hcl.Block{},
|
progress: map[string]struct{}{},
|
||||||
blockValues: map[*hcl.Block][]reflect.Value{},
|
progressF: map[string]struct{}{},
|
||||||
blockEvalCtx: map[*hcl.Block][]*hcl.EvalContext{},
|
doneF: map[string]struct{}{},
|
||||||
blockNames: map[*hcl.Block][]string{},
|
|
||||||
blockTypes: map[string]reflect.Type{},
|
|
||||||
ectx: &hcl.EvalContext{
|
ectx: &hcl.EvalContext{
|
||||||
Variables: map[string]cty.Value{},
|
Variables: map[string]cty.Value{},
|
||||||
Functions: Stdlib(),
|
Functions: stdlibFunctions,
|
||||||
},
|
},
|
||||||
|
|
||||||
progressV: map[uint64]struct{}{},
|
|
||||||
progressF: map[uint64]struct{}{},
|
|
||||||
progressB: map[uint64]map[string]struct{}{},
|
|
||||||
doneB: map[uint64]map[string]struct{}{},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, v := range defs.Variables {
|
for _, v := range defs.Variables {
|
||||||
@@ -601,20 +300,12 @@ func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string
|
|||||||
p.funcs[v.Name] = v
|
p.funcs[v.Name] = v
|
||||||
}
|
}
|
||||||
|
|
||||||
content, b, diags := b.PartialContent(schema)
|
|
||||||
if diags.HasErrors() {
|
|
||||||
return nil, diags
|
|
||||||
}
|
|
||||||
|
|
||||||
blocks, b, diags := b.PartialContent(defsSchema)
|
|
||||||
if diags.HasErrors() {
|
|
||||||
return nil, diags
|
|
||||||
}
|
|
||||||
|
|
||||||
attrs, diags := b.JustAttributes()
|
attrs, diags := b.JustAttributes()
|
||||||
if diags.HasErrors() {
|
if diags.HasErrors() {
|
||||||
if d := removeAttributesDiags(diags, reserved, p.vars, attrs); len(d) > 0 {
|
for _, d := range diags {
|
||||||
return nil, d
|
if d.Detail != "Blocks are not allowed here." {
|
||||||
|
return diags
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -627,56 +318,104 @@ func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string
|
|||||||
delete(p.attrs, "function")
|
delete(p.attrs, "function")
|
||||||
|
|
||||||
for k := range p.opt.Vars {
|
for k := range p.opt.Vars {
|
||||||
_ = p.resolveValue(p.ectx, k)
|
_ = p.resolveValue(k)
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, a := range content.Attributes {
|
for k := range p.attrs {
|
||||||
a := a
|
if err := p.resolveValue(k); err != nil {
|
||||||
return nil, hcl.Diagnostics{
|
if diags, ok := err.(hcl.Diagnostics); ok {
|
||||||
|
return diags
|
||||||
|
}
|
||||||
|
return hcl.Diagnostics{
|
||||||
&hcl.Diagnostic{
|
&hcl.Diagnostic{
|
||||||
Severity: hcl.DiagError,
|
Severity: hcl.DiagError,
|
||||||
Summary: "Invalid attribute",
|
Summary: "Invalid attribute",
|
||||||
Detail: "global attributes currently not supported",
|
Detail: err.Error(),
|
||||||
Subject: a.Range.Ptr(),
|
Subject: &p.attrs[k].Range,
|
||||||
Context: a.Range.Ptr(),
|
Context: &p.attrs[k].Range,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for k := range p.vars {
|
for k := range p.vars {
|
||||||
if err := p.resolveValue(p.ectx, k); err != nil {
|
if err := p.resolveValue(k); err != nil {
|
||||||
if diags, ok := err.(hcl.Diagnostics); ok {
|
if diags, ok := err.(hcl.Diagnostics); ok {
|
||||||
return nil, diags
|
return diags
|
||||||
}
|
}
|
||||||
r := p.vars[k].Body.MissingItemRange()
|
r := p.vars[k].Body.MissingItemRange()
|
||||||
return nil, wrapErrorDiagnostic("Invalid value", err, &r, &r)
|
return hcl.Diagnostics{
|
||||||
|
&hcl.Diagnostic{
|
||||||
|
Severity: hcl.DiagError,
|
||||||
|
Summary: "Invalid value",
|
||||||
|
Detail: err.Error(),
|
||||||
|
Subject: &r,
|
||||||
|
Context: &r,
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for k := range p.funcs {
|
for k := range p.funcs {
|
||||||
if err := p.resolveFunction(p.ectx, k); err != nil {
|
if err := p.resolveFunction(k); err != nil {
|
||||||
if diags, ok := err.(hcl.Diagnostics); ok {
|
if diags, ok := err.(hcl.Diagnostics); ok {
|
||||||
return nil, diags
|
return diags
|
||||||
}
|
}
|
||||||
var subject *hcl.Range
|
return hcl.Diagnostics{
|
||||||
var context *hcl.Range
|
&hcl.Diagnostic{
|
||||||
if p.funcs[k].Params != nil {
|
Severity: hcl.DiagError,
|
||||||
subject = p.funcs[k].Params.Range.Ptr()
|
Summary: "Invalid function",
|
||||||
context = subject
|
Detail: err.Error(),
|
||||||
} else {
|
Subject: &p.funcs[k].Params.Range,
|
||||||
for _, block := range blocks.Blocks {
|
Context: &p.funcs[k].Params.Range,
|
||||||
block := block
|
},
|
||||||
if block.Type == "function" && len(block.Labels) == 1 && block.Labels[0] == k {
|
|
||||||
subject = block.LabelRanges[0].Ptr()
|
|
||||||
context = block.DefRange.Ptr()
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil, wrapErrorDiagnostic("Invalid function", err, subject, context)
|
|
||||||
|
content, _, diags := b.PartialContent(schema)
|
||||||
|
if diags.HasErrors() {
|
||||||
|
return diags
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, a := range content.Attributes {
|
||||||
|
return hcl.Diagnostics{
|
||||||
|
&hcl.Diagnostic{
|
||||||
|
Severity: hcl.DiagError,
|
||||||
|
Summary: "Invalid attribute",
|
||||||
|
Detail: "global attributes currently not supported",
|
||||||
|
Subject: &a.Range,
|
||||||
|
Context: &a.Range,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m := map[string]map[string][]*hcl.Block{}
|
||||||
|
for _, b := range content.Blocks {
|
||||||
|
if len(b.Labels) == 0 || len(b.Labels) > 1 {
|
||||||
|
return hcl.Diagnostics{
|
||||||
|
&hcl.Diagnostic{
|
||||||
|
Severity: hcl.DiagError,
|
||||||
|
Summary: "Invalid block",
|
||||||
|
Detail: fmt.Sprintf("invalid block label: %v", b.Labels),
|
||||||
|
Subject: &b.LabelRanges[0],
|
||||||
|
Context: &b.LabelRanges[0],
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
bm, ok := m[b.Type]
|
||||||
|
if !ok {
|
||||||
|
bm = map[string][]*hcl.Block{}
|
||||||
|
m[b.Type] = bm
|
||||||
|
}
|
||||||
|
|
||||||
|
lbl := b.Labels[0]
|
||||||
|
bm[lbl] = append(bm[lbl], b)
|
||||||
|
}
|
||||||
|
|
||||||
|
vt := reflect.ValueOf(val).Elem().Type()
|
||||||
|
numFields := vt.NumField()
|
||||||
|
|
||||||
type value struct {
|
type value struct {
|
||||||
reflect.Value
|
reflect.Value
|
||||||
idx int
|
idx int
|
||||||
@@ -687,84 +426,58 @@ func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string
|
|||||||
values map[string]value
|
values map[string]value
|
||||||
}
|
}
|
||||||
types := map[string]field{}
|
types := map[string]field{}
|
||||||
renamed := map[string]map[string][]string{}
|
|
||||||
vt := reflect.ValueOf(val).Elem().Type()
|
for i := 0; i < numFields; i++ {
|
||||||
for i := 0; i < vt.NumField(); i++ {
|
|
||||||
tags := strings.Split(vt.Field(i).Tag.Get("hcl"), ",")
|
tags := strings.Split(vt.Field(i).Tag.Get("hcl"), ",")
|
||||||
|
|
||||||
p.blockTypes[tags[0]] = vt.Field(i).Type.Elem().Elem()
|
|
||||||
types[tags[0]] = field{
|
types[tags[0]] = field{
|
||||||
idx: i,
|
idx: i,
|
||||||
typ: vt.Field(i).Type,
|
typ: vt.Field(i).Type,
|
||||||
values: make(map[string]value),
|
values: make(map[string]value),
|
||||||
}
|
}
|
||||||
renamed[tags[0]] = map[string][]string{}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tmpBlocks := map[string]map[string][]*hcl.Block{}
|
|
||||||
for _, b := range content.Blocks {
|
|
||||||
if len(b.Labels) == 0 || len(b.Labels) > 1 {
|
|
||||||
return nil, hcl.Diagnostics{
|
|
||||||
&hcl.Diagnostic{
|
|
||||||
Severity: hcl.DiagError,
|
|
||||||
Summary: "Invalid block",
|
|
||||||
Detail: fmt.Sprintf("invalid block label: %v", b.Labels),
|
|
||||||
Subject: &b.LabelRanges[0],
|
|
||||||
Context: &b.LabelRanges[0],
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bm, ok := tmpBlocks[b.Type]
|
|
||||||
if !ok {
|
|
||||||
bm = map[string][]*hcl.Block{}
|
|
||||||
tmpBlocks[b.Type] = bm
|
|
||||||
}
|
|
||||||
|
|
||||||
names, err := p.resolveBlockNames(b)
|
|
||||||
if err != nil {
|
|
||||||
return nil, wrapErrorDiagnostic("Invalid name", err, &b.LabelRanges[0], &b.LabelRanges[0])
|
|
||||||
}
|
|
||||||
for _, name := range names {
|
|
||||||
bm[name] = append(bm[name], b)
|
|
||||||
renamed[b.Type][b.Labels[0]] = append(renamed[b.Type][b.Labels[0]], name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
p.blocks = tmpBlocks
|
|
||||||
|
|
||||||
diags = hcl.Diagnostics{}
|
diags = hcl.Diagnostics{}
|
||||||
for _, b := range content.Blocks {
|
for _, b := range content.Blocks {
|
||||||
b := b
|
|
||||||
v := reflect.ValueOf(val)
|
v := reflect.ValueOf(val)
|
||||||
|
|
||||||
err := p.resolveBlock(b, nil)
|
t, ok := types[b.Type]
|
||||||
if err != nil {
|
if !ok {
|
||||||
if diag, ok := err.(hcl.Diagnostics); ok {
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
vv := reflect.New(t.typ.Elem().Elem())
|
||||||
|
diag := gohcl.DecodeBody(b.Body, p.ectx, vv.Interface())
|
||||||
if diag.HasErrors() {
|
if diag.HasErrors() {
|
||||||
diags = append(diags, diag...)
|
diags = append(diags, diag...)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
return nil, wrapErrorDiagnostic("Invalid block", err, b.LabelRanges[0].Ptr(), b.DefRange.Ptr())
|
if err := opt.ValidateLabel(b.Labels[0]); err != nil {
|
||||||
|
return hcl.Diagnostics{
|
||||||
|
&hcl.Diagnostic{
|
||||||
|
Severity: hcl.DiagError,
|
||||||
|
Summary: "Invalid name",
|
||||||
|
Detail: err.Error(),
|
||||||
|
Subject: &b.LabelRanges[0],
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
vvs := p.blockValues[b]
|
lblIndex := setLabel(vv, b.Labels[0])
|
||||||
for _, vv := range vvs {
|
|
||||||
t := types[b.Type]
|
oldValue, exists := t.values[b.Labels[0]]
|
||||||
lblIndex, lblExists := getNameIndex(vv)
|
if !exists && lblIndex != -1 {
|
||||||
lblName, _ := getName(vv)
|
|
||||||
oldValue, exists := t.values[lblName]
|
|
||||||
if !exists && lblExists {
|
|
||||||
if v.Elem().Field(t.idx).Type().Kind() == reflect.Slice {
|
if v.Elem().Field(t.idx).Type().Kind() == reflect.Slice {
|
||||||
for i := 0; i < v.Elem().Field(t.idx).Len(); i++ {
|
for i := 0; i < v.Elem().Field(t.idx).Len(); i++ {
|
||||||
if lblName == v.Elem().Field(t.idx).Index(i).Elem().Field(lblIndex).String() {
|
if b.Labels[0] == v.Elem().Field(t.idx).Index(i).Elem().Field(lblIndex).String() {
|
||||||
exists = true
|
exists = true
|
||||||
oldValue = value{Value: v.Elem().Field(t.idx).Index(i), idx: i}
|
oldValue = value{Value: v.Elem().Field(t.idx).Index(i), idx: i}
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if exists {
|
if exists {
|
||||||
if m := oldValue.Value.MethodByName("Merge"); m.IsValid() {
|
if m := oldValue.Value.MethodByName("Merge"); m.IsValid() {
|
||||||
@@ -777,136 +490,27 @@ func Parse(b hcl.Body, opt Opt, val interface{}) (map[string]map[string][]string
|
|||||||
if slice.IsNil() {
|
if slice.IsNil() {
|
||||||
slice = reflect.New(t.typ).Elem()
|
slice = reflect.New(t.typ).Elem()
|
||||||
}
|
}
|
||||||
t.values[lblName] = value{Value: vv, idx: slice.Len()}
|
t.values[b.Labels[0]] = value{Value: vv, idx: slice.Len()}
|
||||||
v.Elem().Field(t.idx).Set(reflect.Append(slice, vv))
|
v.Elem().Field(t.idx).Set(reflect.Append(slice, vv))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if diags.HasErrors() {
|
if diags.HasErrors() {
|
||||||
return nil, diags
|
return diags
|
||||||
}
|
}
|
||||||
|
|
||||||
for k := range p.attrs {
|
return nil
|
||||||
if err := p.resolveValue(p.ectx, k); err != nil {
|
|
||||||
if diags, ok := err.(hcl.Diagnostics); ok {
|
|
||||||
return nil, diags
|
|
||||||
}
|
|
||||||
return nil, wrapErrorDiagnostic("Invalid attribute", err, &p.attrs[k].Range, &p.attrs[k].Range)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return renamed, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// wrapErrorDiagnostic wraps an error into a hcl.Diagnostics object.
|
func setLabel(v reflect.Value, lbl string) int {
|
||||||
// If the error is already an hcl.Diagnostics object, it is returned as is.
|
// cache field index?
|
||||||
func wrapErrorDiagnostic(message string, err error, subject *hcl.Range, context *hcl.Range) hcl.Diagnostics {
|
|
||||||
switch err := err.(type) {
|
|
||||||
case *hcl.Diagnostic:
|
|
||||||
return hcl.Diagnostics{err}
|
|
||||||
case hcl.Diagnostics:
|
|
||||||
return err
|
|
||||||
default:
|
|
||||||
return hcl.Diagnostics{
|
|
||||||
&hcl.Diagnostic{
|
|
||||||
Severity: hcl.DiagError,
|
|
||||||
Summary: message,
|
|
||||||
Detail: err.Error(),
|
|
||||||
Subject: subject,
|
|
||||||
Context: context,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func setName(v reflect.Value, name string) {
|
|
||||||
numFields := v.Elem().Type().NumField()
|
numFields := v.Elem().Type().NumField()
|
||||||
for i := 0; i < numFields; i++ {
|
for i := 0; i < numFields; i++ {
|
||||||
parts := strings.Split(v.Elem().Type().Field(i).Tag.Get("hcl"), ",")
|
for _, t := range strings.Split(v.Elem().Type().Field(i).Tag.Get("hcl"), ",") {
|
||||||
for _, t := range parts[1:] {
|
|
||||||
if t == "label" {
|
if t == "label" {
|
||||||
v.Elem().Field(i).Set(reflect.ValueOf(name))
|
v.Elem().Field(i).Set(reflect.ValueOf(lbl))
|
||||||
|
return i
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
return -1
|
||||||
|
|
||||||
func getName(v reflect.Value) (string, bool) {
|
|
||||||
numFields := v.Elem().Type().NumField()
|
|
||||||
for i := 0; i < numFields; i++ {
|
|
||||||
parts := strings.Split(v.Elem().Type().Field(i).Tag.Get("hcl"), ",")
|
|
||||||
for _, t := range parts[1:] {
|
|
||||||
if t == "label" {
|
|
||||||
return v.Elem().Field(i).String(), true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return "", false
|
|
||||||
}
|
|
||||||
|
|
||||||
func getNameIndex(v reflect.Value) (int, bool) {
|
|
||||||
numFields := v.Elem().Type().NumField()
|
|
||||||
for i := 0; i < numFields; i++ {
|
|
||||||
parts := strings.Split(v.Elem().Type().Field(i).Tag.Get("hcl"), ",")
|
|
||||||
for _, t := range parts[1:] {
|
|
||||||
if t == "label" {
|
|
||||||
return i, true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0, false
|
|
||||||
}
|
|
||||||
|
|
||||||
func removeAttributesDiags(diags hcl.Diagnostics, reserved map[string]struct{}, vars map[string]*variable, attrs hcl.Attributes) hcl.Diagnostics {
|
|
||||||
var fdiags hcl.Diagnostics
|
|
||||||
for _, d := range diags {
|
|
||||||
if fout := func(d *hcl.Diagnostic) bool {
|
|
||||||
// https://github.com/docker/buildx/pull/541
|
|
||||||
if d.Detail == "Blocks are not allowed here." {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
for r := range reserved {
|
|
||||||
// JSON body objects don't handle repeated blocks like HCL but
|
|
||||||
// reserved name attributes should be allowed when multi bodies are merged.
|
|
||||||
// https://github.com/hashicorp/hcl/blob/main/json/spec.md#blocks
|
|
||||||
if strings.HasPrefix(d.Detail, fmt.Sprintf(`Argument "%s" was already set at `, r)) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for v := range vars {
|
|
||||||
// Do the same for global variables
|
|
||||||
if strings.HasPrefix(d.Detail, fmt.Sprintf(`Argument "%s" was already set at `, v)) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for a := range attrs {
|
|
||||||
// Do the same for attributes
|
|
||||||
if strings.HasPrefix(d.Detail, fmt.Sprintf(`Argument "%s" was already set at `, a)) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}(d); !fout {
|
|
||||||
fdiags = append(fdiags, d)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return fdiags
|
|
||||||
}
|
|
||||||
|
|
||||||
// key returns a unique hash for the given values
|
|
||||||
func key(ks ...any) uint64 {
|
|
||||||
hash := fnv.New64a()
|
|
||||||
for _, k := range ks {
|
|
||||||
v := reflect.ValueOf(k)
|
|
||||||
switch v.Kind() {
|
|
||||||
case reflect.String:
|
|
||||||
hash.Write([]byte(v.String()))
|
|
||||||
case reflect.Pointer:
|
|
||||||
ptr := reflect.ValueOf(k).Pointer()
|
|
||||||
binary.Write(hash, binary.LittleEndian, uint64(ptr))
|
|
||||||
default:
|
|
||||||
panic(fmt.Sprintf("unknown key kind %s", v.Kind().String()))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return hash.Sum64()
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,230 +0,0 @@
|
|||||||
// Copyright (c) HashiCorp, Inc.
|
|
||||||
// SPDX-License-Identifier: MPL-2.0
|
|
||||||
|
|
||||||
// Forked from https://github.com/hashicorp/hcl/blob/4679383728fe331fc8a6b46036a27b8f818d9bc0/merged.go
|
|
||||||
|
|
||||||
package hclparser
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/hashicorp/hcl/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
// MergeFiles combines the given files to produce a single body that contains
|
|
||||||
// configuration from all of the given files.
|
|
||||||
//
|
|
||||||
// The ordering of the given files decides the order in which contained
|
|
||||||
// elements will be returned. If any top-level attributes are defined with
|
|
||||||
// the same name across multiple files, a diagnostic will be produced from
|
|
||||||
// the Content and PartialContent methods describing this error in a
|
|
||||||
// user-friendly way.
|
|
||||||
func MergeFiles(files []*hcl.File) hcl.Body {
|
|
||||||
var bodies []hcl.Body
|
|
||||||
for _, file := range files {
|
|
||||||
bodies = append(bodies, file.Body)
|
|
||||||
}
|
|
||||||
return MergeBodies(bodies)
|
|
||||||
}
|
|
||||||
|
|
||||||
// MergeBodies is like MergeFiles except it deals directly with bodies, rather
|
|
||||||
// than with entire files.
|
|
||||||
func MergeBodies(bodies []hcl.Body) hcl.Body {
|
|
||||||
if len(bodies) == 0 {
|
|
||||||
// Swap out for our singleton empty body, to reduce the number of
|
|
||||||
// empty slices we have hanging around.
|
|
||||||
return emptyBody
|
|
||||||
}
|
|
||||||
|
|
||||||
// If any of the given bodies are already merged bodies, we'll unpack
|
|
||||||
// to flatten to a single mergedBodies, since that's conceptually simpler.
|
|
||||||
// This also, as a side-effect, eliminates any empty bodies, since
|
|
||||||
// empties are merged bodies with no inner bodies.
|
|
||||||
var newLen int
|
|
||||||
var flatten bool
|
|
||||||
for _, body := range bodies {
|
|
||||||
if children, merged := body.(mergedBodies); merged {
|
|
||||||
newLen += len(children)
|
|
||||||
flatten = true
|
|
||||||
} else {
|
|
||||||
newLen++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !flatten { // not just newLen == len, because we might have mergedBodies with single bodies inside
|
|
||||||
return mergedBodies(bodies)
|
|
||||||
}
|
|
||||||
|
|
||||||
if newLen == 0 {
|
|
||||||
// Don't allocate a new empty when we already have one
|
|
||||||
return emptyBody
|
|
||||||
}
|
|
||||||
|
|
||||||
n := make([]hcl.Body, 0, newLen)
|
|
||||||
for _, body := range bodies {
|
|
||||||
if children, merged := body.(mergedBodies); merged {
|
|
||||||
n = append(n, children...)
|
|
||||||
} else {
|
|
||||||
n = append(n, body)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return mergedBodies(n)
|
|
||||||
}
|
|
||||||
|
|
||||||
var emptyBody = mergedBodies([]hcl.Body{})
|
|
||||||
|
|
||||||
// EmptyBody returns a body with no content. This body can be used as a
|
|
||||||
// placeholder when a body is required but no body content is available.
|
|
||||||
func EmptyBody() hcl.Body {
|
|
||||||
return emptyBody
|
|
||||||
}
|
|
||||||
|
|
||||||
type mergedBodies []hcl.Body
|
|
||||||
|
|
||||||
// Content returns the content produced by applying the given schema to all
|
|
||||||
// of the merged bodies and merging the result.
|
|
||||||
//
|
|
||||||
// Although required attributes _are_ supported, they should be used sparingly
|
|
||||||
// with merged bodies since in this case there is no contextual information
|
|
||||||
// with which to return good diagnostics. Applications working with merged
|
|
||||||
// bodies may wish to mark all attributes as optional and then check for
|
|
||||||
// required attributes afterwards, to produce better diagnostics.
|
|
||||||
func (mb mergedBodies) Content(schema *hcl.BodySchema) (*hcl.BodyContent, hcl.Diagnostics) {
|
|
||||||
// the returned body will always be empty in this case, because mergedContent
|
|
||||||
// will only ever call Content on the child bodies.
|
|
||||||
content, _, diags := mb.mergedContent(schema, false)
|
|
||||||
return content, diags
|
|
||||||
}
|
|
||||||
|
|
||||||
func (mb mergedBodies) PartialContent(schema *hcl.BodySchema) (*hcl.BodyContent, hcl.Body, hcl.Diagnostics) {
|
|
||||||
return mb.mergedContent(schema, true)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (mb mergedBodies) JustAttributes() (hcl.Attributes, hcl.Diagnostics) {
|
|
||||||
attrs := make(map[string]*hcl.Attribute)
|
|
||||||
var diags hcl.Diagnostics
|
|
||||||
|
|
||||||
for _, body := range mb {
|
|
||||||
thisAttrs, thisDiags := body.JustAttributes()
|
|
||||||
|
|
||||||
if len(thisDiags) != 0 {
|
|
||||||
diags = append(diags, thisDiags...)
|
|
||||||
}
|
|
||||||
|
|
||||||
if thisAttrs != nil {
|
|
||||||
for name, attr := range thisAttrs {
|
|
||||||
if existing := attrs[name]; existing != nil {
|
|
||||||
diags = diags.Append(&hcl.Diagnostic{
|
|
||||||
Severity: hcl.DiagError,
|
|
||||||
Summary: "Duplicate argument",
|
|
||||||
Detail: fmt.Sprintf(
|
|
||||||
"Argument %q was already set at %s",
|
|
||||||
name, existing.NameRange.String(),
|
|
||||||
),
|
|
||||||
Subject: thisAttrs[name].NameRange.Ptr(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
attrs[name] = attr
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return attrs, diags
|
|
||||||
}
|
|
||||||
|
|
||||||
func (mb mergedBodies) MissingItemRange() hcl.Range {
|
|
||||||
if len(mb) == 0 {
|
|
||||||
// Nothing useful to return here, so we'll return some garbage.
|
|
||||||
return hcl.Range{
|
|
||||||
Filename: "<empty>",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// arbitrarily use the first body's missing item range
|
|
||||||
return mb[0].MissingItemRange()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (mb mergedBodies) mergedContent(schema *hcl.BodySchema, partial bool) (*hcl.BodyContent, hcl.Body, hcl.Diagnostics) {
|
|
||||||
// We need to produce a new schema with none of the attributes marked as
|
|
||||||
// required, since _any one_ of our bodies can contribute an attribute value.
|
|
||||||
// We'll separately check that all required attributes are present at
|
|
||||||
// the end.
|
|
||||||
mergedSchema := &hcl.BodySchema{
|
|
||||||
Blocks: schema.Blocks,
|
|
||||||
}
|
|
||||||
for _, attrS := range schema.Attributes {
|
|
||||||
mergedAttrS := attrS
|
|
||||||
mergedAttrS.Required = false
|
|
||||||
mergedSchema.Attributes = append(mergedSchema.Attributes, mergedAttrS)
|
|
||||||
}
|
|
||||||
|
|
||||||
var mergedLeftovers []hcl.Body
|
|
||||||
content := &hcl.BodyContent{
|
|
||||||
Attributes: map[string]*hcl.Attribute{},
|
|
||||||
}
|
|
||||||
|
|
||||||
var diags hcl.Diagnostics
|
|
||||||
for _, body := range mb {
|
|
||||||
var thisContent *hcl.BodyContent
|
|
||||||
var thisLeftovers hcl.Body
|
|
||||||
var thisDiags hcl.Diagnostics
|
|
||||||
|
|
||||||
if partial {
|
|
||||||
thisContent, thisLeftovers, thisDiags = body.PartialContent(mergedSchema)
|
|
||||||
} else {
|
|
||||||
thisContent, thisDiags = body.Content(mergedSchema)
|
|
||||||
}
|
|
||||||
|
|
||||||
if thisLeftovers != nil {
|
|
||||||
mergedLeftovers = append(mergedLeftovers, thisLeftovers)
|
|
||||||
}
|
|
||||||
if len(thisDiags) != 0 {
|
|
||||||
diags = append(diags, thisDiags...)
|
|
||||||
}
|
|
||||||
|
|
||||||
if thisContent.Attributes != nil {
|
|
||||||
for name, attr := range thisContent.Attributes {
|
|
||||||
if existing := content.Attributes[name]; existing != nil {
|
|
||||||
diags = diags.Append(&hcl.Diagnostic{
|
|
||||||
Severity: hcl.DiagError,
|
|
||||||
Summary: "Duplicate argument",
|
|
||||||
Detail: fmt.Sprintf(
|
|
||||||
"Argument %q was already set at %s",
|
|
||||||
name, existing.NameRange.String(),
|
|
||||||
),
|
|
||||||
Subject: thisContent.Attributes[name].NameRange.Ptr(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
content.Attributes[name] = attr
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(thisContent.Blocks) != 0 {
|
|
||||||
content.Blocks = append(content.Blocks, thisContent.Blocks...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finally, we check for required attributes.
|
|
||||||
for _, attrS := range schema.Attributes {
|
|
||||||
if !attrS.Required {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if content.Attributes[attrS.Name] == nil {
|
|
||||||
// We don't have any context here to produce a good diagnostic,
|
|
||||||
// which is why we warn in the Content docstring to minimize the
|
|
||||||
// use of required attributes on merged bodies.
|
|
||||||
diags = diags.Append(&hcl.Diagnostic{
|
|
||||||
Severity: hcl.DiagError,
|
|
||||||
Summary: "Missing required argument",
|
|
||||||
Detail: fmt.Sprintf(
|
|
||||||
"The argument %q is required, but was not set.",
|
|
||||||
attrS.Name,
|
|
||||||
),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
leftoverBody := MergeBodies(mergedLeftovers)
|
|
||||||
return content, leftoverBody, diags
|
|
||||||
}
|
|
||||||
@@ -1,15 +1,12 @@
|
|||||||
package hclparser
|
package hclparser
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/hashicorp/go-cty-funcs/cidr"
|
"github.com/hashicorp/go-cty-funcs/cidr"
|
||||||
"github.com/hashicorp/go-cty-funcs/crypto"
|
"github.com/hashicorp/go-cty-funcs/crypto"
|
||||||
"github.com/hashicorp/go-cty-funcs/encoding"
|
"github.com/hashicorp/go-cty-funcs/encoding"
|
||||||
"github.com/hashicorp/go-cty-funcs/uuid"
|
"github.com/hashicorp/go-cty-funcs/uuid"
|
||||||
"github.com/hashicorp/hcl/v2/ext/tryfunc"
|
"github.com/hashicorp/hcl/v2/ext/tryfunc"
|
||||||
"github.com/hashicorp/hcl/v2/ext/typeexpr"
|
"github.com/hashicorp/hcl/v2/ext/typeexpr"
|
||||||
"github.com/zclconf/go-cty/cty"
|
|
||||||
"github.com/zclconf/go-cty/cty/function"
|
"github.com/zclconf/go-cty/cty/function"
|
||||||
"github.com/zclconf/go-cty/cty/function/stdlib"
|
"github.com/zclconf/go-cty/cty/function/stdlib"
|
||||||
)
|
)
|
||||||
@@ -31,21 +28,21 @@ var stdlibFunctions = map[string]function.Function{
|
|||||||
"cidrnetmask": cidr.NetmaskFunc,
|
"cidrnetmask": cidr.NetmaskFunc,
|
||||||
"cidrsubnet": cidr.SubnetFunc,
|
"cidrsubnet": cidr.SubnetFunc,
|
||||||
"cidrsubnets": cidr.SubnetsFunc,
|
"cidrsubnets": cidr.SubnetsFunc,
|
||||||
|
"csvdecode": stdlib.CSVDecodeFunc,
|
||||||
"coalesce": stdlib.CoalesceFunc,
|
"coalesce": stdlib.CoalesceFunc,
|
||||||
"coalescelist": stdlib.CoalesceListFunc,
|
"coalescelist": stdlib.CoalesceListFunc,
|
||||||
"compact": stdlib.CompactFunc,
|
"compact": stdlib.CompactFunc,
|
||||||
"concat": stdlib.ConcatFunc,
|
"concat": stdlib.ConcatFunc,
|
||||||
"contains": stdlib.ContainsFunc,
|
"contains": stdlib.ContainsFunc,
|
||||||
"convert": typeexpr.ConvertFunc,
|
"convert": typeexpr.ConvertFunc,
|
||||||
"csvdecode": stdlib.CSVDecodeFunc,
|
|
||||||
"distinct": stdlib.DistinctFunc,
|
"distinct": stdlib.DistinctFunc,
|
||||||
"divide": stdlib.DivideFunc,
|
"divide": stdlib.DivideFunc,
|
||||||
"element": stdlib.ElementFunc,
|
"element": stdlib.ElementFunc,
|
||||||
"equal": stdlib.EqualFunc,
|
"equal": stdlib.EqualFunc,
|
||||||
"flatten": stdlib.FlattenFunc,
|
"flatten": stdlib.FlattenFunc,
|
||||||
"floor": stdlib.FloorFunc,
|
"floor": stdlib.FloorFunc,
|
||||||
"format": stdlib.FormatFunc,
|
|
||||||
"formatdate": stdlib.FormatDateFunc,
|
"formatdate": stdlib.FormatDateFunc,
|
||||||
|
"format": stdlib.FormatFunc,
|
||||||
"formatlist": stdlib.FormatListFunc,
|
"formatlist": stdlib.FormatListFunc,
|
||||||
"greaterthan": stdlib.GreaterThanFunc,
|
"greaterthan": stdlib.GreaterThanFunc,
|
||||||
"greaterthanorequalto": stdlib.GreaterThanOrEqualToFunc,
|
"greaterthanorequalto": stdlib.GreaterThanOrEqualToFunc,
|
||||||
@@ -53,10 +50,10 @@ var stdlibFunctions = map[string]function.Function{
|
|||||||
"indent": stdlib.IndentFunc,
|
"indent": stdlib.IndentFunc,
|
||||||
"index": stdlib.IndexFunc,
|
"index": stdlib.IndexFunc,
|
||||||
"int": stdlib.IntFunc,
|
"int": stdlib.IntFunc,
|
||||||
"join": stdlib.JoinFunc,
|
|
||||||
"jsondecode": stdlib.JSONDecodeFunc,
|
"jsondecode": stdlib.JSONDecodeFunc,
|
||||||
"jsonencode": stdlib.JSONEncodeFunc,
|
"jsonencode": stdlib.JSONEncodeFunc,
|
||||||
"keys": stdlib.KeysFunc,
|
"keys": stdlib.KeysFunc,
|
||||||
|
"join": stdlib.JoinFunc,
|
||||||
"length": stdlib.LengthFunc,
|
"length": stdlib.LengthFunc,
|
||||||
"lessthan": stdlib.LessThanFunc,
|
"lessthan": stdlib.LessThanFunc,
|
||||||
"lessthanorequalto": stdlib.LessThanOrEqualToFunc,
|
"lessthanorequalto": stdlib.LessThanOrEqualToFunc,
|
||||||
@@ -70,16 +67,15 @@ var stdlibFunctions = map[string]function.Function{
|
|||||||
"modulo": stdlib.ModuloFunc,
|
"modulo": stdlib.ModuloFunc,
|
||||||
"multiply": stdlib.MultiplyFunc,
|
"multiply": stdlib.MultiplyFunc,
|
||||||
"negate": stdlib.NegateFunc,
|
"negate": stdlib.NegateFunc,
|
||||||
"not": stdlib.NotFunc,
|
|
||||||
"notequal": stdlib.NotEqualFunc,
|
"notequal": stdlib.NotEqualFunc,
|
||||||
|
"not": stdlib.NotFunc,
|
||||||
"or": stdlib.OrFunc,
|
"or": stdlib.OrFunc,
|
||||||
"parseint": stdlib.ParseIntFunc,
|
"parseint": stdlib.ParseIntFunc,
|
||||||
"pow": stdlib.PowFunc,
|
"pow": stdlib.PowFunc,
|
||||||
"range": stdlib.RangeFunc,
|
"range": stdlib.RangeFunc,
|
||||||
"regex_replace": stdlib.RegexReplaceFunc,
|
|
||||||
"regex": stdlib.RegexFunc,
|
|
||||||
"regexall": stdlib.RegexAllFunc,
|
"regexall": stdlib.RegexAllFunc,
|
||||||
"replace": stdlib.ReplaceFunc,
|
"regex": stdlib.RegexFunc,
|
||||||
|
"regex_replace": stdlib.RegexReplaceFunc,
|
||||||
"reverse": stdlib.ReverseFunc,
|
"reverse": stdlib.ReverseFunc,
|
||||||
"reverselist": stdlib.ReverseListFunc,
|
"reverselist": stdlib.ReverseListFunc,
|
||||||
"rsadecrypt": crypto.RsaDecryptFunc,
|
"rsadecrypt": crypto.RsaDecryptFunc,
|
||||||
@@ -100,7 +96,6 @@ var stdlibFunctions = map[string]function.Function{
|
|||||||
"substr": stdlib.SubstrFunc,
|
"substr": stdlib.SubstrFunc,
|
||||||
"subtract": stdlib.SubtractFunc,
|
"subtract": stdlib.SubtractFunc,
|
||||||
"timeadd": stdlib.TimeAddFunc,
|
"timeadd": stdlib.TimeAddFunc,
|
||||||
"timestamp": timestampFunc,
|
|
||||||
"title": stdlib.TitleFunc,
|
"title": stdlib.TitleFunc,
|
||||||
"trim": stdlib.TrimFunc,
|
"trim": stdlib.TrimFunc,
|
||||||
"trimprefix": stdlib.TrimPrefixFunc,
|
"trimprefix": stdlib.TrimPrefixFunc,
|
||||||
@@ -114,22 +109,3 @@ var stdlibFunctions = map[string]function.Function{
|
|||||||
"values": stdlib.ValuesFunc,
|
"values": stdlib.ValuesFunc,
|
||||||
"zipmap": stdlib.ZipmapFunc,
|
"zipmap": stdlib.ZipmapFunc,
|
||||||
}
|
}
|
||||||
|
|
||||||
// timestampFunc constructs a function that returns a string representation of the current date and time.
|
|
||||||
//
|
|
||||||
// This function was imported from terraform's datetime utilities.
|
|
||||||
var timestampFunc = function.New(&function.Spec{
|
|
||||||
Params: []function.Parameter{},
|
|
||||||
Type: function.StaticReturnType(cty.String),
|
|
||||||
Impl: func(args []cty.Value, retType cty.Type) (cty.Value, error) {
|
|
||||||
return cty.StringVal(time.Now().UTC().Format(time.RFC3339)), nil
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
func Stdlib() map[string]function.Function {
|
|
||||||
funcs := make(map[string]function.Function, len(stdlibFunctions))
|
|
||||||
for k, v := range stdlibFunctions {
|
|
||||||
funcs[k] = v
|
|
||||||
}
|
|
||||||
return funcs
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -4,16 +4,14 @@ import (
|
|||||||
"archive/tar"
|
"archive/tar"
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/docker/buildx/builder"
|
"github.com/docker/buildx/build"
|
||||||
controllerapi "github.com/docker/buildx/controller/pb"
|
|
||||||
"github.com/docker/buildx/driver"
|
"github.com/docker/buildx/driver"
|
||||||
"github.com/docker/buildx/util/progress"
|
"github.com/docker/buildx/util/progress"
|
||||||
"github.com/moby/buildkit/client"
|
"github.com/moby/buildkit/client"
|
||||||
"github.com/moby/buildkit/client/llb"
|
"github.com/moby/buildkit/client/llb"
|
||||||
"github.com/moby/buildkit/frontend/dockerui"
|
|
||||||
gwclient "github.com/moby/buildkit/frontend/gateway/client"
|
gwclient "github.com/moby/buildkit/frontend/gateway/client"
|
||||||
"github.com/moby/buildkit/session"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -22,17 +20,11 @@ type Input struct {
|
|||||||
URL string
|
URL string
|
||||||
}
|
}
|
||||||
|
|
||||||
func ReadRemoteFiles(ctx context.Context, nodes []builder.Node, url string, names []string, pw progress.Writer) ([]File, *Input, error) {
|
func ReadRemoteFiles(ctx context.Context, dis []build.DriverInfo, url string, names []string, pw progress.Writer) ([]File, *Input, error) {
|
||||||
var session []session.Attachable
|
|
||||||
var filename string
|
var filename string
|
||||||
st, ok := dockerui.DetectGitContext(url, false)
|
st, ok := detectGitContext(url)
|
||||||
if ok {
|
if !ok {
|
||||||
ssh, err := controllerapi.CreateSSH([]*controllerapi.SSH{{ID: "default"}})
|
st, filename, ok = detectHTTPContext(url)
|
||||||
if err == nil {
|
|
||||||
session = append(session, ssh)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
st, filename, ok = dockerui.DetectHTTPContext(url)
|
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, nil, errors.Errorf("not url context")
|
return nil, nil, errors.Errorf("not url context")
|
||||||
}
|
}
|
||||||
@@ -41,25 +33,25 @@ func ReadRemoteFiles(ctx context.Context, nodes []builder.Node, url string, name
|
|||||||
inp := &Input{State: st, URL: url}
|
inp := &Input{State: st, URL: url}
|
||||||
var files []File
|
var files []File
|
||||||
|
|
||||||
var node *builder.Node
|
var di *build.DriverInfo
|
||||||
for i, n := range nodes {
|
for _, d := range dis {
|
||||||
if n.Err == nil {
|
if d.Err == nil {
|
||||||
node = &nodes[i]
|
di = &d
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if node == nil {
|
if di == nil {
|
||||||
return nil, nil, nil
|
return nil, nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
c, err := driver.Boot(ctx, ctx, node.Driver, pw)
|
c, err := driver.Boot(ctx, ctx, di.Driver, pw)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
ch, done := progress.NewChannel(pw)
|
ch, done := progress.NewChannel(pw)
|
||||||
defer func() { <-done }()
|
defer func() { <-done }()
|
||||||
_, err = c.Build(ctx, client.SolveOpt{Session: session, Internal: true}, "buildx", func(ctx context.Context, c gwclient.Client) (*gwclient.Result, error) {
|
_, err = c.Build(ctx, client.SolveOpt{}, "buildx", func(ctx context.Context, c gwclient.Client) (*gwclient.Result, error) {
|
||||||
def, err := st.Marshal(ctx)
|
def, err := st.Marshal(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -91,6 +83,51 @@ func ReadRemoteFiles(ctx context.Context, nodes []builder.Node, url string, name
|
|||||||
return files, inp, nil
|
return files, inp, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func IsRemoteURL(url string) bool {
|
||||||
|
if _, _, ok := detectHTTPContext(url); ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if _, ok := detectGitContext(url); ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func detectHTTPContext(url string) (*llb.State, string, bool) {
|
||||||
|
if httpPrefix.MatchString(url) {
|
||||||
|
httpContext := llb.HTTP(url, llb.Filename("context"), llb.WithCustomName("[internal] load remote build context"))
|
||||||
|
return &httpContext, "context", true
|
||||||
|
}
|
||||||
|
return nil, "", false
|
||||||
|
}
|
||||||
|
|
||||||
|
func detectGitContext(ref string) (*llb.State, bool) {
|
||||||
|
found := false
|
||||||
|
if httpPrefix.MatchString(ref) && gitURLPathWithFragmentSuffix.MatchString(ref) {
|
||||||
|
found = true
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, prefix := range []string{"git://", "github.com/", "git@"} {
|
||||||
|
if strings.HasPrefix(ref, prefix) {
|
||||||
|
found = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
|
||||||
|
parts := strings.SplitN(ref, "#", 2)
|
||||||
|
branch := ""
|
||||||
|
if len(parts) > 1 {
|
||||||
|
branch = parts[1]
|
||||||
|
}
|
||||||
|
gitOpts := []llb.GitOption{llb.WithCustomName("[internal] load git source " + ref)}
|
||||||
|
|
||||||
|
st := llb.Git(parts[0], branch, gitOpts...)
|
||||||
|
return &st, true
|
||||||
|
}
|
||||||
|
|
||||||
func isArchive(header []byte) bool {
|
func isArchive(header []byte) bool {
|
||||||
for _, m := range [][]byte{
|
for _, m := range [][]byte{
|
||||||
{0x42, 0x5A, 0x68}, // bzip2
|
{0x42, 0x5A, 0x68}, // bzip2
|
||||||
|
|||||||
1074
build/build.go
1074
build/build.go
File diff suppressed because it is too large
Load Diff
@@ -1,62 +0,0 @@
|
|||||||
package build
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
stderrors "errors"
|
|
||||||
"net"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/platforms"
|
|
||||||
"github.com/docker/buildx/builder"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
v1 "github.com/opencontainers/image-spec/specs-go/v1"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
func Dial(ctx context.Context, nodes []builder.Node, pw progress.Writer, platform *v1.Platform) (net.Conn, error) {
|
|
||||||
nodes, err := filterAvailableNodes(nodes)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(nodes) == 0 {
|
|
||||||
return nil, errors.New("no nodes available")
|
|
||||||
}
|
|
||||||
|
|
||||||
var pls []v1.Platform
|
|
||||||
if platform != nil {
|
|
||||||
pls = []v1.Platform{*platform}
|
|
||||||
}
|
|
||||||
|
|
||||||
opts := map[string]Options{"default": {Platforms: pls}}
|
|
||||||
resolved, err := resolveDrivers(ctx, nodes, opts, pw)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var dialError error
|
|
||||||
for _, ls := range resolved {
|
|
||||||
for _, rn := range ls {
|
|
||||||
if platform != nil {
|
|
||||||
p := *platform
|
|
||||||
var found bool
|
|
||||||
for _, pp := range rn.platforms {
|
|
||||||
if platforms.Only(p).Match(pp) {
|
|
||||||
found = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !found {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
conn, err := nodes[rn.driverIndex].Driver.Dial(ctx)
|
|
||||||
if err == nil {
|
|
||||||
return conn, nil
|
|
||||||
}
|
|
||||||
dialError = stderrors.Join(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil, errors.Wrap(dialError, "no nodes available")
|
|
||||||
}
|
|
||||||
312
build/driver.go
312
build/driver.go
@@ -1,312 +0,0 @@
|
|||||||
package build
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/platforms"
|
|
||||||
"github.com/docker/buildx/builder"
|
|
||||||
"github.com/docker/buildx/driver"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
gateway "github.com/moby/buildkit/frontend/gateway/client"
|
|
||||||
"github.com/moby/buildkit/util/flightcontrol"
|
|
||||||
"github.com/moby/buildkit/util/tracing"
|
|
||||||
specs "github.com/opencontainers/image-spec/specs-go/v1"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"go.opentelemetry.io/otel/trace"
|
|
||||||
"golang.org/x/sync/errgroup"
|
|
||||||
)
|
|
||||||
|
|
||||||
type resolvedNode struct {
|
|
||||||
resolver *nodeResolver
|
|
||||||
driverIndex int
|
|
||||||
platforms []specs.Platform
|
|
||||||
}
|
|
||||||
|
|
||||||
func (dp resolvedNode) Node() builder.Node {
|
|
||||||
return dp.resolver.nodes[dp.driverIndex]
|
|
||||||
}
|
|
||||||
|
|
||||||
func (dp resolvedNode) Client(ctx context.Context) (*client.Client, error) {
|
|
||||||
clients, err := dp.resolver.boot(ctx, []int{dp.driverIndex}, nil)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return clients[0], nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (dp resolvedNode) BuildOpts(ctx context.Context) (gateway.BuildOpts, error) {
|
|
||||||
opts, err := dp.resolver.opts(ctx, []int{dp.driverIndex}, nil)
|
|
||||||
if err != nil {
|
|
||||||
return gateway.BuildOpts{}, err
|
|
||||||
}
|
|
||||||
return opts[0], nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type matchMaker func(specs.Platform) platforms.MatchComparer
|
|
||||||
|
|
||||||
type nodeResolver struct {
|
|
||||||
nodes []builder.Node
|
|
||||||
clients flightcontrol.Group[*client.Client]
|
|
||||||
opt flightcontrol.Group[gateway.BuildOpts]
|
|
||||||
}
|
|
||||||
|
|
||||||
func resolveDrivers(ctx context.Context, nodes []builder.Node, opt map[string]Options, pw progress.Writer) (map[string][]*resolvedNode, error) {
|
|
||||||
driverRes := newDriverResolver(nodes)
|
|
||||||
drivers, err := driverRes.Resolve(ctx, opt, pw)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return drivers, err
|
|
||||||
}
|
|
||||||
|
|
||||||
func newDriverResolver(nodes []builder.Node) *nodeResolver {
|
|
||||||
r := &nodeResolver{
|
|
||||||
nodes: nodes,
|
|
||||||
}
|
|
||||||
return r
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *nodeResolver) Resolve(ctx context.Context, opt map[string]Options, pw progress.Writer) (map[string][]*resolvedNode, error) {
|
|
||||||
if len(r.nodes) == 0 {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
nodes := map[string][]*resolvedNode{}
|
|
||||||
for k, opt := range opt {
|
|
||||||
node, perfect, err := r.resolve(ctx, opt.Platforms, pw, platforms.OnlyStrict, nil)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if !perfect {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
nodes[k] = node
|
|
||||||
}
|
|
||||||
if len(nodes) != len(opt) {
|
|
||||||
// if we didn't get a perfect match, we need to boot all drivers
|
|
||||||
allIndexes := make([]int, len(r.nodes))
|
|
||||||
for i := range allIndexes {
|
|
||||||
allIndexes[i] = i
|
|
||||||
}
|
|
||||||
|
|
||||||
clients, err := r.boot(ctx, allIndexes, pw)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
eg, egCtx := errgroup.WithContext(ctx)
|
|
||||||
workers := make([][]specs.Platform, len(clients))
|
|
||||||
for i, c := range clients {
|
|
||||||
i, c := i, c
|
|
||||||
if c == nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
eg.Go(func() error {
|
|
||||||
ww, err := c.ListWorkers(egCtx)
|
|
||||||
if err != nil {
|
|
||||||
return errors.Wrap(err, "listing workers")
|
|
||||||
}
|
|
||||||
|
|
||||||
ps := make(map[string]specs.Platform, len(ww))
|
|
||||||
for _, w := range ww {
|
|
||||||
for _, p := range w.Platforms {
|
|
||||||
pk := platforms.Format(platforms.Normalize(p))
|
|
||||||
ps[pk] = p
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, p := range ps {
|
|
||||||
workers[i] = append(workers[i], p)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
}
|
|
||||||
if err := eg.Wait(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// then we can attempt to match against all the available platforms
|
|
||||||
// (this time we don't care about imperfect matches)
|
|
||||||
nodes = map[string][]*resolvedNode{}
|
|
||||||
for k, opt := range opt {
|
|
||||||
node, _, err := r.resolve(ctx, opt.Platforms, pw, platforms.Only, func(idx int, n builder.Node) []specs.Platform {
|
|
||||||
return workers[idx]
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
nodes[k] = node
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
idxs := make([]int, 0, len(r.nodes))
|
|
||||||
for _, nodes := range nodes {
|
|
||||||
for _, node := range nodes {
|
|
||||||
idxs = append(idxs, node.driverIndex)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// preload capabilities
|
|
||||||
span, ctx := tracing.StartSpan(ctx, "load buildkit capabilities", trace.WithSpanKind(trace.SpanKindInternal))
|
|
||||||
_, err := r.opts(ctx, idxs, pw)
|
|
||||||
tracing.FinishWithError(span, err)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nodes, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *nodeResolver) resolve(ctx context.Context, ps []specs.Platform, pw progress.Writer, matcher matchMaker, additional func(idx int, n builder.Node) []specs.Platform) ([]*resolvedNode, bool, error) {
|
|
||||||
if len(r.nodes) == 0 {
|
|
||||||
return nil, true, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
perfect := true
|
|
||||||
nodeIdxs := make([]int, 0)
|
|
||||||
for _, p := range ps {
|
|
||||||
idx := r.get(p, matcher, additional)
|
|
||||||
if idx == -1 {
|
|
||||||
idx = 0
|
|
||||||
perfect = false
|
|
||||||
}
|
|
||||||
nodeIdxs = append(nodeIdxs, idx)
|
|
||||||
}
|
|
||||||
|
|
||||||
var nodes []*resolvedNode
|
|
||||||
if len(nodeIdxs) == 0 {
|
|
||||||
nodes = append(nodes, &resolvedNode{
|
|
||||||
resolver: r,
|
|
||||||
driverIndex: 0,
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
for i, idx := range nodeIdxs {
|
|
||||||
node := &resolvedNode{
|
|
||||||
resolver: r,
|
|
||||||
driverIndex: idx,
|
|
||||||
}
|
|
||||||
if len(ps) > 0 {
|
|
||||||
node.platforms = []specs.Platform{ps[i]}
|
|
||||||
}
|
|
||||||
nodes = append(nodes, node)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
nodes = recombineNodes(nodes)
|
|
||||||
if _, err := r.boot(ctx, nodeIdxs, pw); err != nil {
|
|
||||||
return nil, false, err
|
|
||||||
}
|
|
||||||
return nodes, perfect, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *nodeResolver) get(p specs.Platform, matcher matchMaker, additionalPlatforms func(int, builder.Node) []specs.Platform) int {
|
|
||||||
best := -1
|
|
||||||
bestPlatform := specs.Platform{}
|
|
||||||
for i, node := range r.nodes {
|
|
||||||
platforms := node.Platforms
|
|
||||||
if additionalPlatforms != nil {
|
|
||||||
platforms = append([]specs.Platform{}, platforms...)
|
|
||||||
platforms = append(platforms, additionalPlatforms(i, node)...)
|
|
||||||
}
|
|
||||||
for _, p2 := range platforms {
|
|
||||||
m := matcher(p2)
|
|
||||||
if !m.Match(p) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if best == -1 {
|
|
||||||
best = i
|
|
||||||
bestPlatform = p2
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if matcher(p2).Less(p, bestPlatform) {
|
|
||||||
best = i
|
|
||||||
bestPlatform = p2
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return best
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *nodeResolver) boot(ctx context.Context, idxs []int, pw progress.Writer) ([]*client.Client, error) {
|
|
||||||
clients := make([]*client.Client, len(idxs))
|
|
||||||
|
|
||||||
baseCtx := ctx
|
|
||||||
eg, ctx := errgroup.WithContext(ctx)
|
|
||||||
|
|
||||||
for i, idx := range idxs {
|
|
||||||
i, idx := i, idx
|
|
||||||
eg.Go(func() error {
|
|
||||||
c, err := r.clients.Do(ctx, fmt.Sprint(idx), func(ctx context.Context) (*client.Client, error) {
|
|
||||||
if r.nodes[idx].Driver == nil {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
return driver.Boot(ctx, baseCtx, r.nodes[idx].Driver, pw)
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
clients[i] = c
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
}
|
|
||||||
if err := eg.Wait(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return clients, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *nodeResolver) opts(ctx context.Context, idxs []int, pw progress.Writer) ([]gateway.BuildOpts, error) {
|
|
||||||
clients, err := r.boot(ctx, idxs, pw)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
bopts := make([]gateway.BuildOpts, len(clients))
|
|
||||||
eg, ctx := errgroup.WithContext(ctx)
|
|
||||||
for i, idxs := range idxs {
|
|
||||||
i, idx := i, idxs
|
|
||||||
c := clients[i]
|
|
||||||
if c == nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
eg.Go(func() error {
|
|
||||||
opt, err := r.opt.Do(ctx, fmt.Sprint(idx), func(ctx context.Context) (gateway.BuildOpts, error) {
|
|
||||||
opt := gateway.BuildOpts{}
|
|
||||||
_, err := c.Build(ctx, client.SolveOpt{
|
|
||||||
Internal: true,
|
|
||||||
}, "buildx", func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
|
|
||||||
opt = c.BuildOpts()
|
|
||||||
return nil, nil
|
|
||||||
}, nil)
|
|
||||||
return opt, err
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
bopts[i] = opt
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
}
|
|
||||||
if err := eg.Wait(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return bopts, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// recombineDriverPairs recombines resolved nodes that are on the same driver
|
|
||||||
// back together into a single node.
|
|
||||||
func recombineNodes(nodes []*resolvedNode) []*resolvedNode {
|
|
||||||
result := make([]*resolvedNode, 0, len(nodes))
|
|
||||||
lookup := map[int]int{}
|
|
||||||
for _, node := range nodes {
|
|
||||||
if idx, ok := lookup[node.driverIndex]; ok {
|
|
||||||
result[idx].platforms = append(result[idx].platforms, node.platforms...)
|
|
||||||
} else {
|
|
||||||
lookup[node.driverIndex] = len(result)
|
|
||||||
result = append(result, node)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
@@ -1,315 +0,0 @@
|
|||||||
package build
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"sort"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/platforms"
|
|
||||||
"github.com/docker/buildx/builder"
|
|
||||||
specs "github.com/opencontainers/image-spec/specs-go/v1"
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestFindDriverSanity(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.DefaultSpec()},
|
|
||||||
})
|
|
||||||
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.DefaultSpec()}, nil, platforms.OnlyStrict, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, 0, res[0].driverIndex)
|
|
||||||
require.Equal(t, "aaa", res[0].Node().Builder)
|
|
||||||
require.Equal(t, []specs.Platform{platforms.DefaultSpec()}, res[0].platforms)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestFindDriverEmpty(t *testing.T) {
|
|
||||||
r := makeTestResolver(nil)
|
|
||||||
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.DefaultSpec()}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Nil(t, res)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestFindDriverWeirdName(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.MustParse("linux/amd64")},
|
|
||||||
"bbb": {platforms.MustParse("linux/foobar")},
|
|
||||||
})
|
|
||||||
|
|
||||||
// find first platform
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/foobar")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, 1, res[0].driverIndex)
|
|
||||||
require.Equal(t, "bbb", res[0].Node().Builder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestFindDriverUnknown(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.MustParse("linux/amd64")},
|
|
||||||
})
|
|
||||||
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/riscv64")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.False(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, 0, res[0].driverIndex)
|
|
||||||
require.Equal(t, "aaa", res[0].Node().Builder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSelectNodeSinglePlatform(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.MustParse("linux/amd64")},
|
|
||||||
"bbb": {platforms.MustParse("linux/riscv64")},
|
|
||||||
})
|
|
||||||
|
|
||||||
// find first platform
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/amd64")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, 0, res[0].driverIndex)
|
|
||||||
require.Equal(t, "aaa", res[0].Node().Builder)
|
|
||||||
|
|
||||||
// find second platform
|
|
||||||
res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/riscv64")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, 1, res[0].driverIndex)
|
|
||||||
require.Equal(t, "bbb", res[0].Node().Builder)
|
|
||||||
|
|
||||||
// find an unknown platform, should match the first driver
|
|
||||||
res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/s390x")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.False(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, 0, res[0].driverIndex)
|
|
||||||
require.Equal(t, "aaa", res[0].Node().Builder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSelectNodeMultiPlatform(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.MustParse("linux/amd64"), platforms.MustParse("linux/arm64")},
|
|
||||||
"bbb": {platforms.MustParse("linux/riscv64")},
|
|
||||||
})
|
|
||||||
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/amd64")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, 0, res[0].driverIndex)
|
|
||||||
require.Equal(t, "aaa", res[0].Node().Builder)
|
|
||||||
|
|
||||||
res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm64")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, 0, res[0].driverIndex)
|
|
||||||
require.Equal(t, "aaa", res[0].Node().Builder)
|
|
||||||
|
|
||||||
res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/riscv64")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, 1, res[0].driverIndex)
|
|
||||||
require.Equal(t, "bbb", res[0].Node().Builder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSelectNodeNonStrict(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.MustParse("linux/amd64")},
|
|
||||||
"bbb": {platforms.MustParse("linux/arm64")},
|
|
||||||
})
|
|
||||||
|
|
||||||
// arm64 should match itself
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm64")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, "bbb", res[0].Node().Builder)
|
|
||||||
|
|
||||||
// arm64 may support arm/v8
|
|
||||||
res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v8")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, "bbb", res[0].Node().Builder)
|
|
||||||
|
|
||||||
// arm64 may support arm/v7
|
|
||||||
res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v7")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, "bbb", res[0].Node().Builder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSelectNodeNonStrictARM(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.MustParse("linux/amd64")},
|
|
||||||
"bbb": {platforms.MustParse("linux/arm64")},
|
|
||||||
"ccc": {platforms.MustParse("linux/arm/v8")},
|
|
||||||
})
|
|
||||||
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v8")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, "ccc", res[0].Node().Builder)
|
|
||||||
|
|
||||||
res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v7")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, "ccc", res[0].Node().Builder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSelectNodeNonStrictLower(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.MustParse("linux/amd64")},
|
|
||||||
"bbb": {platforms.MustParse("linux/arm/v7")},
|
|
||||||
})
|
|
||||||
|
|
||||||
// v8 can't be built on v7 (so we should select the default)...
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v8")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.False(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, "aaa", res[0].Node().Builder)
|
|
||||||
|
|
||||||
// ...but v6 can be built on v8
|
|
||||||
res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v6")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, "bbb", res[0].Node().Builder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSelectNodePreferStart(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.MustParse("linux/amd64")},
|
|
||||||
"bbb": {platforms.MustParse("linux/riscv64")},
|
|
||||||
"ccc": {platforms.MustParse("linux/riscv64")},
|
|
||||||
})
|
|
||||||
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/riscv64")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, "bbb", res[0].Node().Builder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSelectNodePreferExact(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.MustParse("linux/arm/v8")},
|
|
||||||
"bbb": {platforms.MustParse("linux/arm/v7")},
|
|
||||||
})
|
|
||||||
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v7")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, "bbb", res[0].Node().Builder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSelectNodeNoPlatform(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.MustParse("linux/foobar")},
|
|
||||||
"bbb": {platforms.DefaultSpec()},
|
|
||||||
})
|
|
||||||
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, "aaa", res[0].Node().Builder)
|
|
||||||
require.Empty(t, res[0].platforms)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSelectNodeAdditionalPlatforms(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.MustParse("linux/amd64")},
|
|
||||||
"bbb": {platforms.MustParse("linux/arm/v8")},
|
|
||||||
})
|
|
||||||
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v7")}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, "bbb", res[0].Node().Builder)
|
|
||||||
|
|
||||||
res, perfect, err = r.resolve(context.TODO(), []specs.Platform{platforms.MustParse("linux/arm/v7")}, nil, platforms.Only, func(idx int, n builder.Node) []specs.Platform {
|
|
||||||
if n.Builder == "aaa" {
|
|
||||||
return []specs.Platform{platforms.MustParse("linux/arm/v7")}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, "aaa", res[0].Node().Builder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSplitNodeMultiPlatform(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.MustParse("linux/amd64"), platforms.MustParse("linux/arm64")},
|
|
||||||
"bbb": {platforms.MustParse("linux/riscv64")},
|
|
||||||
})
|
|
||||||
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{
|
|
||||||
platforms.MustParse("linux/amd64"),
|
|
||||||
platforms.MustParse("linux/arm64"),
|
|
||||||
}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 1)
|
|
||||||
require.Equal(t, "aaa", res[0].Node().Builder)
|
|
||||||
|
|
||||||
res, perfect, err = r.resolve(context.TODO(), []specs.Platform{
|
|
||||||
platforms.MustParse("linux/amd64"),
|
|
||||||
platforms.MustParse("linux/riscv64"),
|
|
||||||
}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 2)
|
|
||||||
require.Equal(t, "aaa", res[0].Node().Builder)
|
|
||||||
require.Equal(t, "bbb", res[1].Node().Builder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSplitNodeMultiPlatformNoUnify(t *testing.T) {
|
|
||||||
r := makeTestResolver(map[string][]specs.Platform{
|
|
||||||
"aaa": {platforms.MustParse("linux/amd64")},
|
|
||||||
"bbb": {platforms.MustParse("linux/amd64"), platforms.MustParse("linux/riscv64")},
|
|
||||||
})
|
|
||||||
|
|
||||||
// the "best" choice would be the node with both platforms, but we're using
|
|
||||||
// a naive algorithm that doesn't try to unify the platforms
|
|
||||||
res, perfect, err := r.resolve(context.TODO(), []specs.Platform{
|
|
||||||
platforms.MustParse("linux/amd64"),
|
|
||||||
platforms.MustParse("linux/riscv64"),
|
|
||||||
}, nil, platforms.Only, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, perfect)
|
|
||||||
require.Len(t, res, 2)
|
|
||||||
require.Equal(t, "aaa", res[0].Node().Builder)
|
|
||||||
require.Equal(t, "bbb", res[1].Node().Builder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func makeTestResolver(nodes map[string][]specs.Platform) *nodeResolver {
|
|
||||||
var ns []builder.Node
|
|
||||||
for name, platforms := range nodes {
|
|
||||||
ns = append(ns, builder.Node{
|
|
||||||
Builder: name,
|
|
||||||
Platforms: platforms,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
sort.Slice(ns, func(i, j int) bool {
|
|
||||||
return ns[i].Builder < ns[j].Builder
|
|
||||||
})
|
|
||||||
return newDriverResolver(ns)
|
|
||||||
}
|
|
||||||
137
build/git.go
137
build/git.go
@@ -1,137 +0,0 @@
|
|||||||
package build
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"os"
|
|
||||||
"path"
|
|
||||||
"path/filepath"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/docker/buildx/util/gitutil"
|
|
||||||
"github.com/docker/buildx/util/osutil"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
specs "github.com/opencontainers/image-spec/specs-go/v1"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
const DockerfileLabel = "com.docker.image.source.entrypoint"
|
|
||||||
|
|
||||||
func getGitAttributes(ctx context.Context, contextPath string, dockerfilePath string) (map[string]string, func(*client.SolveOpt), error) {
|
|
||||||
res := make(map[string]string)
|
|
||||||
if contextPath == "" {
|
|
||||||
return nil, nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
setGitLabels := false
|
|
||||||
if v, ok := os.LookupEnv("BUILDX_GIT_LABELS"); ok {
|
|
||||||
if v == "full" { // backward compatibility with old "full" mode
|
|
||||||
setGitLabels = true
|
|
||||||
} else if v, err := strconv.ParseBool(v); err == nil {
|
|
||||||
setGitLabels = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
setGitInfo := true
|
|
||||||
if v, ok := os.LookupEnv("BUILDX_GIT_INFO"); ok {
|
|
||||||
if v, err := strconv.ParseBool(v); err == nil {
|
|
||||||
setGitInfo = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !setGitLabels && !setGitInfo {
|
|
||||||
return nil, nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// figure out in which directory the git command needs to run in
|
|
||||||
var wd string
|
|
||||||
if filepath.IsAbs(contextPath) {
|
|
||||||
wd = contextPath
|
|
||||||
} else {
|
|
||||||
wd, _ = filepath.Abs(filepath.Join(osutil.GetWd(), contextPath))
|
|
||||||
}
|
|
||||||
wd = osutil.SanitizePath(wd)
|
|
||||||
|
|
||||||
gitc, err := gitutil.New(gitutil.WithContext(ctx), gitutil.WithWorkingDir(wd))
|
|
||||||
if err != nil {
|
|
||||||
if st, err1 := os.Stat(path.Join(wd, ".git")); err1 == nil && st.IsDir() {
|
|
||||||
return res, nil, errors.Wrap(err, "git was not found in the system")
|
|
||||||
}
|
|
||||||
return nil, nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if !gitc.IsInsideWorkTree() {
|
|
||||||
if st, err := os.Stat(path.Join(wd, ".git")); err == nil && st.IsDir() {
|
|
||||||
return res, nil, errors.New("failed to read current commit information with git rev-parse --is-inside-work-tree")
|
|
||||||
}
|
|
||||||
return nil, nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
root, err := gitc.RootDir()
|
|
||||||
if err != nil {
|
|
||||||
return res, nil, errors.Wrap(err, "failed to get git root dir")
|
|
||||||
}
|
|
||||||
|
|
||||||
if sha, err := gitc.FullCommit(); err != nil && !gitutil.IsUnknownRevision(err) {
|
|
||||||
return res, nil, errors.Wrap(err, "failed to get git commit")
|
|
||||||
} else if sha != "" {
|
|
||||||
checkDirty := false
|
|
||||||
if v, ok := os.LookupEnv("BUILDX_GIT_CHECK_DIRTY"); ok {
|
|
||||||
if v, err := strconv.ParseBool(v); err == nil {
|
|
||||||
checkDirty = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if checkDirty && gitc.IsDirty() {
|
|
||||||
sha += "-dirty"
|
|
||||||
}
|
|
||||||
if setGitLabels {
|
|
||||||
res["label:"+specs.AnnotationRevision] = sha
|
|
||||||
}
|
|
||||||
if setGitInfo {
|
|
||||||
res["vcs:revision"] = sha
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if rurl, err := gitc.RemoteURL(); err == nil && rurl != "" {
|
|
||||||
if setGitLabels {
|
|
||||||
res["label:"+specs.AnnotationSource] = rurl
|
|
||||||
}
|
|
||||||
if setGitInfo {
|
|
||||||
res["vcs:source"] = rurl
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if setGitLabels && root != "" {
|
|
||||||
if dockerfilePath == "" {
|
|
||||||
dockerfilePath = filepath.Join(wd, "Dockerfile")
|
|
||||||
}
|
|
||||||
if !filepath.IsAbs(dockerfilePath) {
|
|
||||||
dockerfilePath = filepath.Join(osutil.GetWd(), dockerfilePath)
|
|
||||||
}
|
|
||||||
if r, err := filepath.Rel(root, dockerfilePath); err == nil && !strings.HasPrefix(r, "..") {
|
|
||||||
res["label:"+DockerfileLabel] = r
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return res, func(so *client.SolveOpt) {
|
|
||||||
if !setGitInfo || root == "" {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for k, dir := range so.LocalDirs {
|
|
||||||
dir, err = filepath.EvalSymlinks(dir)
|
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
dir, err = filepath.Abs(dir)
|
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if lp, err := osutil.GetLongPathName(dir); err == nil {
|
|
||||||
dir = lp
|
|
||||||
}
|
|
||||||
dir = osutil.SanitizePath(dir)
|
|
||||||
if r, err := filepath.Rel(root, dir); err == nil && !strings.HasPrefix(r, "..") {
|
|
||||||
so.FrontendAttrs["vcs:localdir:"+k] = r
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
@@ -1,213 +0,0 @@
|
|||||||
package build
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"os"
|
|
||||||
"path"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/docker/buildx/util/gitutil"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
specs "github.com/opencontainers/image-spec/specs-go/v1"
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
func setupTest(tb testing.TB) {
|
|
||||||
gitutil.Mktmp(tb)
|
|
||||||
|
|
||||||
c, err := gitutil.New()
|
|
||||||
require.NoError(tb, err)
|
|
||||||
gitutil.GitInit(c, tb)
|
|
||||||
|
|
||||||
df := []byte("FROM alpine:latest\n")
|
|
||||||
assert.NoError(tb, os.WriteFile("Dockerfile", df, 0644))
|
|
||||||
|
|
||||||
gitutil.GitAdd(c, tb, "Dockerfile")
|
|
||||||
gitutil.GitCommit(c, tb, "initial commit")
|
|
||||||
gitutil.GitSetRemote(c, tb, "origin", "git@github.com:docker/buildx.git")
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetGitAttributesNotGitRepo(t *testing.T) {
|
|
||||||
_, _, err := getGitAttributes(context.Background(), t.TempDir(), "Dockerfile")
|
|
||||||
assert.NoError(t, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetGitAttributesBadGitRepo(t *testing.T) {
|
|
||||||
tmp := t.TempDir()
|
|
||||||
require.NoError(t, os.MkdirAll(path.Join(tmp, ".git"), 0755))
|
|
||||||
|
|
||||||
_, _, err := getGitAttributes(context.Background(), tmp, "Dockerfile")
|
|
||||||
assert.Error(t, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetGitAttributesNoContext(t *testing.T) {
|
|
||||||
setupTest(t)
|
|
||||||
|
|
||||||
gitattrs, _, err := getGitAttributes(context.Background(), "", "Dockerfile")
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Empty(t, gitattrs)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetGitAttributes(t *testing.T) {
|
|
||||||
cases := []struct {
|
|
||||||
name string
|
|
||||||
envGitLabels string
|
|
||||||
envGitInfo string
|
|
||||||
expected []string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "default",
|
|
||||||
envGitLabels: "",
|
|
||||||
envGitInfo: "",
|
|
||||||
expected: []string{
|
|
||||||
"vcs:revision",
|
|
||||||
"vcs:source",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "none",
|
|
||||||
envGitLabels: "false",
|
|
||||||
envGitInfo: "false",
|
|
||||||
expected: []string{},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "gitinfo",
|
|
||||||
envGitLabels: "false",
|
|
||||||
envGitInfo: "true",
|
|
||||||
expected: []string{
|
|
||||||
"vcs:revision",
|
|
||||||
"vcs:source",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "gitlabels",
|
|
||||||
envGitLabels: "true",
|
|
||||||
envGitInfo: "false",
|
|
||||||
expected: []string{
|
|
||||||
"label:" + DockerfileLabel,
|
|
||||||
"label:" + specs.AnnotationRevision,
|
|
||||||
"label:" + specs.AnnotationSource,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "both",
|
|
||||||
envGitLabels: "true",
|
|
||||||
envGitInfo: "",
|
|
||||||
expected: []string{
|
|
||||||
"label:" + DockerfileLabel,
|
|
||||||
"label:" + specs.AnnotationRevision,
|
|
||||||
"label:" + specs.AnnotationSource,
|
|
||||||
"vcs:revision",
|
|
||||||
"vcs:source",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
for _, tt := range cases {
|
|
||||||
tt := tt
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
setupTest(t)
|
|
||||||
if tt.envGitLabels != "" {
|
|
||||||
t.Setenv("BUILDX_GIT_LABELS", tt.envGitLabels)
|
|
||||||
}
|
|
||||||
if tt.envGitInfo != "" {
|
|
||||||
t.Setenv("BUILDX_GIT_INFO", tt.envGitInfo)
|
|
||||||
}
|
|
||||||
gitattrs, _, err := getGitAttributes(context.Background(), ".", "Dockerfile")
|
|
||||||
require.NoError(t, err)
|
|
||||||
for _, e := range tt.expected {
|
|
||||||
assert.Contains(t, gitattrs, e)
|
|
||||||
assert.NotEmpty(t, gitattrs[e])
|
|
||||||
if e == "label:"+DockerfileLabel {
|
|
||||||
assert.Equal(t, "Dockerfile", gitattrs[e])
|
|
||||||
} else if e == "label:"+specs.AnnotationSource || e == "vcs:source" {
|
|
||||||
assert.Equal(t, "git@github.com:docker/buildx.git", gitattrs[e])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetGitAttributesDirty(t *testing.T) {
|
|
||||||
setupTest(t)
|
|
||||||
t.Setenv("BUILDX_GIT_CHECK_DIRTY", "true")
|
|
||||||
|
|
||||||
// make a change to test dirty flag
|
|
||||||
df := []byte("FROM alpine:edge\n")
|
|
||||||
require.NoError(t, os.Mkdir("dir", 0755))
|
|
||||||
require.NoError(t, os.WriteFile(filepath.Join("dir", "Dockerfile"), df, 0644))
|
|
||||||
|
|
||||||
t.Setenv("BUILDX_GIT_LABELS", "true")
|
|
||||||
gitattrs, _, _ := getGitAttributes(context.Background(), ".", "Dockerfile")
|
|
||||||
assert.Equal(t, 5, len(gitattrs))
|
|
||||||
|
|
||||||
assert.Contains(t, gitattrs, "label:"+DockerfileLabel)
|
|
||||||
assert.Equal(t, "Dockerfile", gitattrs["label:"+DockerfileLabel])
|
|
||||||
assert.Contains(t, gitattrs, "label:"+specs.AnnotationSource)
|
|
||||||
assert.Equal(t, "git@github.com:docker/buildx.git", gitattrs["label:"+specs.AnnotationSource])
|
|
||||||
assert.Contains(t, gitattrs, "label:"+specs.AnnotationRevision)
|
|
||||||
assert.True(t, strings.HasSuffix(gitattrs["label:"+specs.AnnotationRevision], "-dirty"))
|
|
||||||
|
|
||||||
assert.Contains(t, gitattrs, "vcs:source")
|
|
||||||
assert.Equal(t, "git@github.com:docker/buildx.git", gitattrs["vcs:source"])
|
|
||||||
assert.Contains(t, gitattrs, "vcs:revision")
|
|
||||||
assert.True(t, strings.HasSuffix(gitattrs["vcs:revision"], "-dirty"))
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLocalDirs(t *testing.T) {
|
|
||||||
setupTest(t)
|
|
||||||
|
|
||||||
so := &client.SolveOpt{
|
|
||||||
FrontendAttrs: map[string]string{},
|
|
||||||
LocalDirs: map[string]string{
|
|
||||||
"context": ".",
|
|
||||||
"dockerfile": ".",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
_, addVCSLocalDir, err := getGitAttributes(context.Background(), ".", "Dockerfile")
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.NotNil(t, addVCSLocalDir)
|
|
||||||
|
|
||||||
addVCSLocalDir(so)
|
|
||||||
require.Contains(t, so.FrontendAttrs, "vcs:localdir:context")
|
|
||||||
assert.Equal(t, ".", so.FrontendAttrs["vcs:localdir:context"])
|
|
||||||
require.Contains(t, so.FrontendAttrs, "vcs:localdir:dockerfile")
|
|
||||||
assert.Equal(t, ".", so.FrontendAttrs["vcs:localdir:dockerfile"])
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLocalDirsSub(t *testing.T) {
|
|
||||||
gitutil.Mktmp(t)
|
|
||||||
|
|
||||||
c, err := gitutil.New()
|
|
||||||
require.NoError(t, err)
|
|
||||||
gitutil.GitInit(c, t)
|
|
||||||
|
|
||||||
df := []byte("FROM alpine:latest\n")
|
|
||||||
assert.NoError(t, os.MkdirAll("app", 0755))
|
|
||||||
assert.NoError(t, os.WriteFile("app/Dockerfile", df, 0644))
|
|
||||||
|
|
||||||
gitutil.GitAdd(c, t, "app/Dockerfile")
|
|
||||||
gitutil.GitCommit(c, t, "initial commit")
|
|
||||||
gitutil.GitSetRemote(c, t, "origin", "git@github.com:docker/buildx.git")
|
|
||||||
|
|
||||||
so := &client.SolveOpt{
|
|
||||||
FrontendAttrs: map[string]string{},
|
|
||||||
LocalDirs: map[string]string{
|
|
||||||
"context": ".",
|
|
||||||
"dockerfile": "app",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
_, addVCSLocalDir, err := getGitAttributes(context.Background(), ".", "app/Dockerfile")
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.NotNil(t, addVCSLocalDir)
|
|
||||||
|
|
||||||
addVCSLocalDir(so)
|
|
||||||
require.Contains(t, so.FrontendAttrs, "vcs:localdir:context")
|
|
||||||
assert.Equal(t, ".", so.FrontendAttrs["vcs:localdir:context"])
|
|
||||||
require.Contains(t, so.FrontendAttrs, "vcs:localdir:dockerfile")
|
|
||||||
assert.Equal(t, "app", so.FrontendAttrs["vcs:localdir:dockerfile"])
|
|
||||||
}
|
|
||||||
138
build/invoke.go
138
build/invoke.go
@@ -1,138 +0,0 @@
|
|||||||
package build
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
_ "crypto/sha256" // ensure digests can be computed
|
|
||||||
"io"
|
|
||||||
"sync"
|
|
||||||
"sync/atomic"
|
|
||||||
"syscall"
|
|
||||||
|
|
||||||
controllerapi "github.com/docker/buildx/controller/pb"
|
|
||||||
gateway "github.com/moby/buildkit/frontend/gateway/client"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Container struct {
|
|
||||||
cancelOnce sync.Once
|
|
||||||
containerCancel func()
|
|
||||||
isUnavailable atomic.Bool
|
|
||||||
initStarted atomic.Bool
|
|
||||||
container gateway.Container
|
|
||||||
releaseCh chan struct{}
|
|
||||||
resultCtx *ResultHandle
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewContainer(ctx context.Context, resultCtx *ResultHandle, cfg *controllerapi.InvokeConfig) (*Container, error) {
|
|
||||||
mainCtx := ctx
|
|
||||||
|
|
||||||
ctrCh := make(chan *Container)
|
|
||||||
errCh := make(chan error)
|
|
||||||
go func() {
|
|
||||||
err := resultCtx.build(func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
|
|
||||||
ctx, cancel := context.WithCancel(ctx)
|
|
||||||
go func() {
|
|
||||||
<-mainCtx.Done()
|
|
||||||
cancel()
|
|
||||||
}()
|
|
||||||
|
|
||||||
containerCfg, err := resultCtx.getContainerConfig(ctx, c, cfg)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
containerCtx, containerCancel := context.WithCancel(ctx)
|
|
||||||
defer containerCancel()
|
|
||||||
bkContainer, err := c.NewContainer(containerCtx, containerCfg)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
releaseCh := make(chan struct{})
|
|
||||||
container := &Container{
|
|
||||||
containerCancel: containerCancel,
|
|
||||||
container: bkContainer,
|
|
||||||
releaseCh: releaseCh,
|
|
||||||
resultCtx: resultCtx,
|
|
||||||
}
|
|
||||||
doneCh := make(chan struct{})
|
|
||||||
defer close(doneCh)
|
|
||||||
resultCtx.registerCleanup(func() {
|
|
||||||
container.Cancel()
|
|
||||||
<-doneCh
|
|
||||||
})
|
|
||||||
ctrCh <- container
|
|
||||||
<-container.releaseCh
|
|
||||||
|
|
||||||
return nil, bkContainer.Release(ctx)
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
errCh <- err
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
select {
|
|
||||||
case ctr := <-ctrCh:
|
|
||||||
return ctr, nil
|
|
||||||
case err := <-errCh:
|
|
||||||
return nil, err
|
|
||||||
case <-mainCtx.Done():
|
|
||||||
return nil, mainCtx.Err()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Container) Cancel() {
|
|
||||||
c.markUnavailable()
|
|
||||||
c.cancelOnce.Do(func() {
|
|
||||||
if c.containerCancel != nil {
|
|
||||||
c.containerCancel()
|
|
||||||
}
|
|
||||||
close(c.releaseCh)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Container) IsUnavailable() bool {
|
|
||||||
return c.isUnavailable.Load()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Container) markUnavailable() {
|
|
||||||
c.isUnavailable.Store(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Container) Exec(ctx context.Context, cfg *controllerapi.InvokeConfig, stdin io.ReadCloser, stdout io.WriteCloser, stderr io.WriteCloser) error {
|
|
||||||
if isInit := c.initStarted.CompareAndSwap(false, true); isInit {
|
|
||||||
defer func() {
|
|
||||||
// container can't be used after init exits
|
|
||||||
c.markUnavailable()
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
err := exec(ctx, c.resultCtx, cfg, c.container, stdin, stdout, stderr)
|
|
||||||
if err != nil {
|
|
||||||
// Container becomes unavailable if one of the processes fails in it.
|
|
||||||
c.markUnavailable()
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
func exec(ctx context.Context, resultCtx *ResultHandle, cfg *controllerapi.InvokeConfig, ctr gateway.Container, stdin io.ReadCloser, stdout io.WriteCloser, stderr io.WriteCloser) error {
|
|
||||||
processCfg, err := resultCtx.getProcessConfig(cfg, stdin, stdout, stderr)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
proc, err := ctr.Start(ctx, processCfg)
|
|
||||||
if err != nil {
|
|
||||||
return errors.Errorf("failed to start container: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
doneCh := make(chan struct{})
|
|
||||||
defer close(doneCh)
|
|
||||||
go func() {
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
if err := proc.Signal(ctx, syscall.SIGKILL); err != nil {
|
|
||||||
logrus.Warnf("failed to kill process: %v", err)
|
|
||||||
}
|
|
||||||
case <-doneCh:
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
return proc.Wait()
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
package build
|
|
||||||
|
|
||||||
import (
|
|
||||||
"path/filepath"
|
|
||||||
|
|
||||||
"github.com/docker/buildx/builder"
|
|
||||||
"github.com/docker/buildx/localstate"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
)
|
|
||||||
|
|
||||||
func saveLocalState(so *client.SolveOpt, target string, opts Options, node builder.Node, configDir string) error {
|
|
||||||
var err error
|
|
||||||
if so.Ref == "" {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
lp := opts.Inputs.ContextPath
|
|
||||||
dp := opts.Inputs.DockerfilePath
|
|
||||||
if lp != "" || dp != "" {
|
|
||||||
if lp != "" {
|
|
||||||
lp, err = filepath.Abs(lp)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if dp != "" {
|
|
||||||
dp, err = filepath.Abs(dp)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
l, err := localstate.New(configDir)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return l.SaveRef(node.Builder, node.Name, so.Ref, localstate.State{
|
|
||||||
Target: target,
|
|
||||||
LocalPath: lp,
|
|
||||||
DockerfilePath: dp,
|
|
||||||
GroupRef: opts.GroupRef,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
495
build/result.go
495
build/result.go
@@ -1,495 +0,0 @@
|
|||||||
package build
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
_ "crypto/sha256" // ensure digests can be computed
|
|
||||||
"encoding/json"
|
|
||||||
"io"
|
|
||||||
"sync"
|
|
||||||
|
|
||||||
controllerapi "github.com/docker/buildx/controller/pb"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
"github.com/moby/buildkit/exporter/containerimage/exptypes"
|
|
||||||
gateway "github.com/moby/buildkit/frontend/gateway/client"
|
|
||||||
"github.com/moby/buildkit/solver/errdefs"
|
|
||||||
"github.com/moby/buildkit/solver/pb"
|
|
||||||
"github.com/moby/buildkit/solver/result"
|
|
||||||
specs "github.com/opencontainers/image-spec/specs-go/v1"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"golang.org/x/sync/errgroup"
|
|
||||||
)
|
|
||||||
|
|
||||||
// NewResultHandle makes a call to client.Build, additionally returning a
|
|
||||||
// opaque ResultHandle alongside the standard response and error.
|
|
||||||
//
|
|
||||||
// This ResultHandle can be used to execute additional build steps in the same
|
|
||||||
// context as the build occurred, which can allow easy debugging of build
|
|
||||||
// failures and successes.
|
|
||||||
//
|
|
||||||
// If the returned ResultHandle is not nil, the caller must call Done() on it.
|
|
||||||
func NewResultHandle(ctx context.Context, cc *client.Client, opt client.SolveOpt, product string, buildFunc gateway.BuildFunc, ch chan *client.SolveStatus) (*ResultHandle, *client.SolveResponse, error) {
|
|
||||||
// Create a new context to wrap the original, and cancel it when the
|
|
||||||
// caller-provided context is cancelled.
|
|
||||||
//
|
|
||||||
// We derive the context from the background context so that we can forbid
|
|
||||||
// cancellation of the build request after <-done is closed (which we do
|
|
||||||
// before returning the ResultHandle).
|
|
||||||
baseCtx := ctx
|
|
||||||
ctx, cancel := context.WithCancelCause(context.Background())
|
|
||||||
done := make(chan struct{})
|
|
||||||
go func() {
|
|
||||||
select {
|
|
||||||
case <-baseCtx.Done():
|
|
||||||
cancel(baseCtx.Err())
|
|
||||||
case <-done:
|
|
||||||
// Once done is closed, we've recorded a ResultHandle, so we
|
|
||||||
// shouldn't allow cancelling the underlying build request anymore.
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
// Create a new channel to forward status messages to the original.
|
|
||||||
//
|
|
||||||
// We do this so that we can discard status messages after the main portion
|
|
||||||
// of the build is complete. This is necessary for the solve error case,
|
|
||||||
// where the original gateway is kept open until the ResultHandle is
|
|
||||||
// closed - we don't want progress messages from operations in that
|
|
||||||
// ResultHandle to display after this function exits.
|
|
||||||
//
|
|
||||||
// Additionally, callers should wait for the progress channel to be closed.
|
|
||||||
// If we keep the session open and never close the progress channel, the
|
|
||||||
// caller will likely hang.
|
|
||||||
baseCh := ch
|
|
||||||
ch = make(chan *client.SolveStatus)
|
|
||||||
go func() {
|
|
||||||
for {
|
|
||||||
s, ok := <-ch
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
select {
|
|
||||||
case <-baseCh:
|
|
||||||
// base channel is closed, discard status messages
|
|
||||||
default:
|
|
||||||
baseCh <- s
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
defer close(baseCh)
|
|
||||||
|
|
||||||
var resp *client.SolveResponse
|
|
||||||
var respErr error
|
|
||||||
var respHandle *ResultHandle
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
defer cancel(context.Canceled) // ensure no dangling processes
|
|
||||||
|
|
||||||
var res *gateway.Result
|
|
||||||
var err error
|
|
||||||
resp, err = cc.Build(ctx, opt, product, func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
|
|
||||||
var err error
|
|
||||||
res, err = buildFunc(ctx, c)
|
|
||||||
|
|
||||||
if res != nil && err == nil {
|
|
||||||
// Force evaluation of the build result (otherwise, we likely
|
|
||||||
// won't get a solve error)
|
|
||||||
def, err2 := getDefinition(ctx, res)
|
|
||||||
if err2 != nil {
|
|
||||||
return nil, err2
|
|
||||||
}
|
|
||||||
res, err = evalDefinition(ctx, c, def)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
// Scenario 1: we failed to evaluate a node somewhere in the
|
|
||||||
// build graph.
|
|
||||||
//
|
|
||||||
// In this case, we construct a ResultHandle from this
|
|
||||||
// original Build session, and return it alongside the original
|
|
||||||
// build error. We then need to keep the gateway session open
|
|
||||||
// until the caller explicitly closes the ResultHandle.
|
|
||||||
|
|
||||||
var se *errdefs.SolveError
|
|
||||||
if errors.As(err, &se) {
|
|
||||||
respHandle = &ResultHandle{
|
|
||||||
done: make(chan struct{}),
|
|
||||||
solveErr: se,
|
|
||||||
gwClient: c,
|
|
||||||
gwCtx: ctx,
|
|
||||||
}
|
|
||||||
respErr = err // return original error to preserve stacktrace
|
|
||||||
close(done)
|
|
||||||
|
|
||||||
// Block until the caller closes the ResultHandle.
|
|
||||||
select {
|
|
||||||
case <-respHandle.done:
|
|
||||||
case <-ctx.Done():
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return res, err
|
|
||||||
}, ch)
|
|
||||||
if respHandle != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
// Something unexpected failed during the build, we didn't succeed,
|
|
||||||
// but we also didn't make it far enough to create a ResultHandle.
|
|
||||||
respErr = err
|
|
||||||
close(done)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Scenario 2: we successfully built the image with no errors.
|
|
||||||
//
|
|
||||||
// In this case, the original gateway session has now been closed
|
|
||||||
// since the Build has been completed. So, we need to create a new
|
|
||||||
// gateway session to populate the ResultHandle. To do this, we
|
|
||||||
// need to re-evaluate the target result, in this new session. This
|
|
||||||
// should be instantaneous since the result should be cached.
|
|
||||||
|
|
||||||
def, err := getDefinition(ctx, res)
|
|
||||||
if err != nil {
|
|
||||||
respErr = err
|
|
||||||
close(done)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// NOTE: ideally this second connection should be lazily opened
|
|
||||||
opt := opt
|
|
||||||
opt.Ref = ""
|
|
||||||
opt.Exports = nil
|
|
||||||
opt.CacheExports = nil
|
|
||||||
opt.Internal = true
|
|
||||||
_, respErr = cc.Build(ctx, opt, "buildx", func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
|
|
||||||
res, err := evalDefinition(ctx, c, def)
|
|
||||||
if err != nil {
|
|
||||||
// This should probably not happen, since we've previously
|
|
||||||
// successfully evaluated the same result with no issues.
|
|
||||||
return nil, errors.Wrap(err, "inconsistent solve result")
|
|
||||||
}
|
|
||||||
respHandle = &ResultHandle{
|
|
||||||
done: make(chan struct{}),
|
|
||||||
res: res,
|
|
||||||
gwClient: c,
|
|
||||||
gwCtx: ctx,
|
|
||||||
}
|
|
||||||
close(done)
|
|
||||||
|
|
||||||
// Block until the caller closes the ResultHandle.
|
|
||||||
select {
|
|
||||||
case <-respHandle.done:
|
|
||||||
case <-ctx.Done():
|
|
||||||
}
|
|
||||||
return nil, ctx.Err()
|
|
||||||
}, nil)
|
|
||||||
if respHandle != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
close(done)
|
|
||||||
}()
|
|
||||||
|
|
||||||
// Block until the other thread signals that it's completed the build.
|
|
||||||
select {
|
|
||||||
case <-done:
|
|
||||||
case <-baseCtx.Done():
|
|
||||||
if respErr == nil {
|
|
||||||
respErr = baseCtx.Err()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return respHandle, resp, respErr
|
|
||||||
}
|
|
||||||
|
|
||||||
// getDefinition converts a gateway result into a collection of definitions for
|
|
||||||
// each ref in the result.
|
|
||||||
func getDefinition(ctx context.Context, res *gateway.Result) (*result.Result[*pb.Definition], error) {
|
|
||||||
return result.ConvertResult(res, func(ref gateway.Reference) (*pb.Definition, error) {
|
|
||||||
st, err := ref.ToState()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
def, err := st.Marshal(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return def.ToPB(), nil
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// evalDefinition performs the reverse of getDefinition, converting a
|
|
||||||
// collection of definitions into a gateway result.
|
|
||||||
func evalDefinition(ctx context.Context, c gateway.Client, defs *result.Result[*pb.Definition]) (*gateway.Result, error) {
|
|
||||||
// force evaluation of all targets in parallel
|
|
||||||
results := make(map[*pb.Definition]*gateway.Result)
|
|
||||||
resultsMu := sync.Mutex{}
|
|
||||||
eg, egCtx := errgroup.WithContext(ctx)
|
|
||||||
defs.EachRef(func(def *pb.Definition) error {
|
|
||||||
eg.Go(func() error {
|
|
||||||
res, err := c.Solve(egCtx, gateway.SolveRequest{
|
|
||||||
Evaluate: true,
|
|
||||||
Definition: def,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
resultsMu.Lock()
|
|
||||||
results[def] = res
|
|
||||||
resultsMu.Unlock()
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
if err := eg.Wait(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
res, _ := result.ConvertResult(defs, func(def *pb.Definition) (gateway.Reference, error) {
|
|
||||||
if res, ok := results[def]; ok {
|
|
||||||
return res.Ref, nil
|
|
||||||
}
|
|
||||||
return nil, nil
|
|
||||||
})
|
|
||||||
return res, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ResultHandle is a build result with the client that built it.
|
|
||||||
type ResultHandle struct {
|
|
||||||
res *gateway.Result
|
|
||||||
solveErr *errdefs.SolveError
|
|
||||||
|
|
||||||
done chan struct{}
|
|
||||||
doneOnce sync.Once
|
|
||||||
|
|
||||||
gwClient gateway.Client
|
|
||||||
gwCtx context.Context
|
|
||||||
|
|
||||||
cleanups []func()
|
|
||||||
cleanupsMu sync.Mutex
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ResultHandle) Done() {
|
|
||||||
r.doneOnce.Do(func() {
|
|
||||||
r.cleanupsMu.Lock()
|
|
||||||
cleanups := r.cleanups
|
|
||||||
r.cleanups = nil
|
|
||||||
r.cleanupsMu.Unlock()
|
|
||||||
for _, f := range cleanups {
|
|
||||||
f()
|
|
||||||
}
|
|
||||||
|
|
||||||
close(r.done)
|
|
||||||
<-r.gwCtx.Done()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ResultHandle) registerCleanup(f func()) {
|
|
||||||
r.cleanupsMu.Lock()
|
|
||||||
r.cleanups = append(r.cleanups, f)
|
|
||||||
r.cleanupsMu.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ResultHandle) build(buildFunc gateway.BuildFunc) (err error) {
|
|
||||||
_, err = buildFunc(r.gwCtx, r.gwClient)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ResultHandle) getContainerConfig(ctx context.Context, c gateway.Client, cfg *controllerapi.InvokeConfig) (containerCfg gateway.NewContainerRequest, _ error) {
|
|
||||||
if r.res != nil && r.solveErr == nil {
|
|
||||||
logrus.Debugf("creating container from successful build")
|
|
||||||
ccfg, err := containerConfigFromResult(ctx, r.res, c, *cfg)
|
|
||||||
if err != nil {
|
|
||||||
return containerCfg, err
|
|
||||||
}
|
|
||||||
containerCfg = *ccfg
|
|
||||||
} else {
|
|
||||||
logrus.Debugf("creating container from failed build %+v", cfg)
|
|
||||||
ccfg, err := containerConfigFromError(r.solveErr, *cfg)
|
|
||||||
if err != nil {
|
|
||||||
return containerCfg, errors.Wrapf(err, "no result nor error is available")
|
|
||||||
}
|
|
||||||
containerCfg = *ccfg
|
|
||||||
}
|
|
||||||
return containerCfg, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ResultHandle) getProcessConfig(cfg *controllerapi.InvokeConfig, stdin io.ReadCloser, stdout io.WriteCloser, stderr io.WriteCloser) (_ gateway.StartRequest, err error) {
|
|
||||||
processCfg := newStartRequest(stdin, stdout, stderr)
|
|
||||||
if r.res != nil && r.solveErr == nil {
|
|
||||||
logrus.Debugf("creating container from successful build")
|
|
||||||
if err := populateProcessConfigFromResult(&processCfg, r.res, *cfg); err != nil {
|
|
||||||
return processCfg, err
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
logrus.Debugf("creating container from failed build %+v", cfg)
|
|
||||||
if err := populateProcessConfigFromError(&processCfg, r.solveErr, *cfg); err != nil {
|
|
||||||
return processCfg, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return processCfg, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func containerConfigFromResult(ctx context.Context, res *gateway.Result, c gateway.Client, cfg controllerapi.InvokeConfig) (*gateway.NewContainerRequest, error) {
|
|
||||||
if cfg.Initial {
|
|
||||||
return nil, errors.Errorf("starting from the container from the initial state of the step is supported only on the failed steps")
|
|
||||||
}
|
|
||||||
|
|
||||||
ps, err := exptypes.ParsePlatforms(res.Metadata)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
ref, ok := res.FindRef(ps.Platforms[0].ID)
|
|
||||||
if !ok {
|
|
||||||
return nil, errors.Errorf("no reference found")
|
|
||||||
}
|
|
||||||
|
|
||||||
return &gateway.NewContainerRequest{
|
|
||||||
Mounts: []gateway.Mount{
|
|
||||||
{
|
|
||||||
Dest: "/",
|
|
||||||
MountType: pb.MountType_BIND,
|
|
||||||
Ref: ref,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func populateProcessConfigFromResult(req *gateway.StartRequest, res *gateway.Result, cfg controllerapi.InvokeConfig) error {
|
|
||||||
imgData := res.Metadata[exptypes.ExporterImageConfigKey]
|
|
||||||
var img *specs.Image
|
|
||||||
if len(imgData) > 0 {
|
|
||||||
img = &specs.Image{}
|
|
||||||
if err := json.Unmarshal(imgData, img); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
user := ""
|
|
||||||
if !cfg.NoUser {
|
|
||||||
user = cfg.User
|
|
||||||
} else if img != nil {
|
|
||||||
user = img.Config.User
|
|
||||||
}
|
|
||||||
|
|
||||||
cwd := ""
|
|
||||||
if !cfg.NoCwd {
|
|
||||||
cwd = cfg.Cwd
|
|
||||||
} else if img != nil {
|
|
||||||
cwd = img.Config.WorkingDir
|
|
||||||
}
|
|
||||||
|
|
||||||
env := []string{}
|
|
||||||
if img != nil {
|
|
||||||
env = append(env, img.Config.Env...)
|
|
||||||
}
|
|
||||||
env = append(env, cfg.Env...)
|
|
||||||
|
|
||||||
args := []string{}
|
|
||||||
if cfg.Entrypoint != nil {
|
|
||||||
args = append(args, cfg.Entrypoint...)
|
|
||||||
} else if img != nil {
|
|
||||||
args = append(args, img.Config.Entrypoint...)
|
|
||||||
}
|
|
||||||
if !cfg.NoCmd {
|
|
||||||
args = append(args, cfg.Cmd...)
|
|
||||||
} else if img != nil {
|
|
||||||
args = append(args, img.Config.Cmd...)
|
|
||||||
}
|
|
||||||
|
|
||||||
req.Args = args
|
|
||||||
req.Env = env
|
|
||||||
req.User = user
|
|
||||||
req.Cwd = cwd
|
|
||||||
req.Tty = cfg.Tty
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func containerConfigFromError(solveErr *errdefs.SolveError, cfg controllerapi.InvokeConfig) (*gateway.NewContainerRequest, error) {
|
|
||||||
exec, err := execOpFromError(solveErr)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var mounts []gateway.Mount
|
|
||||||
for i, mnt := range exec.Mounts {
|
|
||||||
rid := solveErr.Solve.MountIDs[i]
|
|
||||||
if cfg.Initial {
|
|
||||||
rid = solveErr.Solve.InputIDs[i]
|
|
||||||
}
|
|
||||||
mounts = append(mounts, gateway.Mount{
|
|
||||||
Selector: mnt.Selector,
|
|
||||||
Dest: mnt.Dest,
|
|
||||||
ResultID: rid,
|
|
||||||
Readonly: mnt.Readonly,
|
|
||||||
MountType: mnt.MountType,
|
|
||||||
CacheOpt: mnt.CacheOpt,
|
|
||||||
SecretOpt: mnt.SecretOpt,
|
|
||||||
SSHOpt: mnt.SSHOpt,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return &gateway.NewContainerRequest{
|
|
||||||
Mounts: mounts,
|
|
||||||
NetMode: exec.Network,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func populateProcessConfigFromError(req *gateway.StartRequest, solveErr *errdefs.SolveError, cfg controllerapi.InvokeConfig) error {
|
|
||||||
exec, err := execOpFromError(solveErr)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
meta := exec.Meta
|
|
||||||
user := ""
|
|
||||||
if !cfg.NoUser {
|
|
||||||
user = cfg.User
|
|
||||||
} else {
|
|
||||||
user = meta.User
|
|
||||||
}
|
|
||||||
|
|
||||||
cwd := ""
|
|
||||||
if !cfg.NoCwd {
|
|
||||||
cwd = cfg.Cwd
|
|
||||||
} else {
|
|
||||||
cwd = meta.Cwd
|
|
||||||
}
|
|
||||||
|
|
||||||
env := append(meta.Env, cfg.Env...)
|
|
||||||
|
|
||||||
args := []string{}
|
|
||||||
if cfg.Entrypoint != nil {
|
|
||||||
args = append(args, cfg.Entrypoint...)
|
|
||||||
}
|
|
||||||
if cfg.Cmd != nil {
|
|
||||||
args = append(args, cfg.Cmd...)
|
|
||||||
}
|
|
||||||
if len(args) == 0 {
|
|
||||||
args = meta.Args
|
|
||||||
}
|
|
||||||
|
|
||||||
req.Args = args
|
|
||||||
req.Env = env
|
|
||||||
req.User = user
|
|
||||||
req.Cwd = cwd
|
|
||||||
req.Tty = cfg.Tty
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func execOpFromError(solveErr *errdefs.SolveError) (*pb.ExecOp, error) {
|
|
||||||
if solveErr == nil {
|
|
||||||
return nil, errors.Errorf("no error is available")
|
|
||||||
}
|
|
||||||
switch op := solveErr.Solve.Op.GetOp().(type) {
|
|
||||||
case *pb.Op_Exec:
|
|
||||||
return op.Exec, nil
|
|
||||||
default:
|
|
||||||
return nil, errors.Errorf("invoke: unsupported error type")
|
|
||||||
}
|
|
||||||
// TODO: support other ops
|
|
||||||
}
|
|
||||||
|
|
||||||
func newStartRequest(stdin io.ReadCloser, stdout io.WriteCloser, stderr io.WriteCloser) gateway.StartRequest {
|
|
||||||
return gateway.StartRequest{
|
|
||||||
Stdin: stdin,
|
|
||||||
Stdout: stdout,
|
|
||||||
Stderr: stderr,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
10
build/url.go
10
build/url.go
@@ -2,7 +2,7 @@ package build
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"os"
|
"io/ioutil"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"github.com/docker/buildx/driver"
|
"github.com/docker/buildx/driver"
|
||||||
@@ -13,7 +13,7 @@ import (
|
|||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
func createTempDockerfileFromURL(ctx context.Context, d *driver.DriverHandle, url string, pw progress.Writer) (string, error) {
|
func createTempDockerfileFromURL(ctx context.Context, d driver.Driver, url string, pw progress.Writer) (string, error) {
|
||||||
c, err := driver.Boot(ctx, ctx, d, pw)
|
c, err := driver.Boot(ctx, ctx, d, pw)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
@@ -21,7 +21,7 @@ func createTempDockerfileFromURL(ctx context.Context, d *driver.DriverHandle, ur
|
|||||||
var out string
|
var out string
|
||||||
ch, done := progress.NewChannel(pw)
|
ch, done := progress.NewChannel(pw)
|
||||||
defer func() { <-done }()
|
defer func() { <-done }()
|
||||||
_, err = c.Build(ctx, client.SolveOpt{Internal: true}, "buildx", func(ctx context.Context, c gwclient.Client) (*gwclient.Result, error) {
|
_, err = c.Build(ctx, client.SolveOpt{}, "buildx", func(ctx context.Context, c gwclient.Client) (*gwclient.Result, error) {
|
||||||
def, err := llb.HTTP(url, llb.Filename("Dockerfile"), llb.WithCustomNamef("[internal] load %s", url)).Marshal(ctx)
|
def, err := llb.HTTP(url, llb.Filename("Dockerfile"), llb.WithCustomNamef("[internal] load %s", url)).Marshal(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -53,11 +53,11 @@ func createTempDockerfileFromURL(ctx context.Context, d *driver.DriverHandle, ur
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
dir, err := os.MkdirTemp("", "buildx")
|
dir, err := ioutil.TempDir("", "buildx")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if err := os.WriteFile(filepath.Join(dir, "Dockerfile"), dt, 0600); err != nil {
|
if err := ioutil.WriteFile(filepath.Join(dir, "Dockerfile"), dt, 0600); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
out = dir
|
out = dir
|
||||||
|
|||||||
@@ -3,34 +3,20 @@ package build
|
|||||||
import (
|
import (
|
||||||
"archive/tar"
|
"archive/tar"
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
|
||||||
"net"
|
"net"
|
||||||
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/docker/buildx/driver"
|
|
||||||
"github.com/docker/cli/opts"
|
"github.com/docker/cli/opts"
|
||||||
"github.com/docker/docker/builder/remotecontext/urlutil"
|
|
||||||
"github.com/moby/buildkit/util/gitutil"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
// archiveHeaderSize is the number of bytes in an archive header
|
||||||
// archiveHeaderSize is the number of bytes in an archive header
|
const archiveHeaderSize = 512
|
||||||
archiveHeaderSize = 512
|
|
||||||
// mobyHostGatewayName defines a special string which users can append to
|
|
||||||
// --add-host to add an extra entry in /etc/hosts that maps
|
|
||||||
// host.docker.internal to the host IP
|
|
||||||
mobyHostGatewayName = "host-gateway"
|
|
||||||
)
|
|
||||||
|
|
||||||
func IsRemoteURL(c string) bool {
|
func isLocalDir(c string) bool {
|
||||||
if urlutil.IsURL(c) {
|
st, err := os.Stat(c)
|
||||||
return true
|
return err == nil && st.IsDir()
|
||||||
}
|
|
||||||
if _, err := gitutil.ParseGitRef(c); err == nil {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func isArchive(header []byte) bool {
|
func isArchive(header []byte) bool {
|
||||||
@@ -53,39 +39,18 @@ func isArchive(header []byte) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// toBuildkitExtraHosts converts hosts from docker key:value format to buildkit's csv format
|
// toBuildkitExtraHosts converts hosts from docker key:value format to buildkit's csv format
|
||||||
func toBuildkitExtraHosts(ctx context.Context, inp []string, nodeDriver *driver.DriverHandle) (string, error) {
|
func toBuildkitExtraHosts(inp []string) (string, error) {
|
||||||
if len(inp) == 0 {
|
if len(inp) == 0 {
|
||||||
return "", nil
|
return "", nil
|
||||||
}
|
}
|
||||||
hosts := make([]string, 0, len(inp))
|
hosts := make([]string, 0, len(inp))
|
||||||
for _, h := range inp {
|
for _, h := range inp {
|
||||||
host, ip, ok := strings.Cut(h, "=")
|
parts := strings.Split(h, ":")
|
||||||
if !ok {
|
|
||||||
host, ip, ok = strings.Cut(h, ":")
|
if len(parts) != 2 || parts[0] == "" || net.ParseIP(parts[1]) == nil {
|
||||||
}
|
|
||||||
if !ok || host == "" || ip == "" {
|
|
||||||
return "", errors.Errorf("invalid host %s", h)
|
return "", errors.Errorf("invalid host %s", h)
|
||||||
}
|
}
|
||||||
// If the IP Address is a "host-gateway", replace this value with the
|
hosts = append(hosts, parts[0]+"="+parts[1])
|
||||||
// IP address provided by the worker's label.
|
|
||||||
if ip == mobyHostGatewayName {
|
|
||||||
hgip, err := nodeDriver.HostGatewayIP(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return "", errors.Wrap(err, "unable to derive the IP value for host-gateway")
|
|
||||||
}
|
|
||||||
ip = hgip.String()
|
|
||||||
} else {
|
|
||||||
// If the address is enclosed in square brackets, extract it (for IPv6, but
|
|
||||||
// permit it for IPv4 as well; we don't know the address family here, but it's
|
|
||||||
// unambiguous).
|
|
||||||
if len(ip) > 2 && ip[0] == '[' && ip[len(ip)-1] == ']' {
|
|
||||||
ip = ip[1 : len(ip)-1]
|
|
||||||
}
|
|
||||||
if net.ParseIP(ip) == nil {
|
|
||||||
return "", errors.Errorf("invalid host %s", h)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
hosts = append(hosts, host+"="+ip)
|
|
||||||
}
|
}
|
||||||
return strings.Join(hosts, ","), nil
|
return strings.Join(hosts, ","), nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,148 +0,0 @@
|
|||||||
package build
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestToBuildkitExtraHosts(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
doc string
|
|
||||||
input []string
|
|
||||||
expectedOut string // Expect output==input if not set.
|
|
||||||
expectedErr string // Expect success if not set.
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
doc: "IPv4, colon sep",
|
|
||||||
input: []string{`myhost:192.168.0.1`},
|
|
||||||
expectedOut: `myhost=192.168.0.1`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "IPv4, eq sep",
|
|
||||||
input: []string{`myhost=192.168.0.1`},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "Weird but permitted, IPv4 with brackets",
|
|
||||||
input: []string{`myhost=[192.168.0.1]`},
|
|
||||||
expectedOut: `myhost=192.168.0.1`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "Host and domain",
|
|
||||||
input: []string{`host.and.domain.invalid:10.0.2.1`},
|
|
||||||
expectedOut: `host.and.domain.invalid=10.0.2.1`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "IPv6, colon sep",
|
|
||||||
input: []string{`anipv6host:2003:ab34:e::1`},
|
|
||||||
expectedOut: `anipv6host=2003:ab34:e::1`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "IPv6, colon sep, brackets",
|
|
||||||
input: []string{`anipv6host:[2003:ab34:e::1]`},
|
|
||||||
expectedOut: `anipv6host=2003:ab34:e::1`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "IPv6, eq sep, brackets",
|
|
||||||
input: []string{`anipv6host=[2003:ab34:e::1]`},
|
|
||||||
expectedOut: `anipv6host=2003:ab34:e::1`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "IPv6 localhost, colon sep",
|
|
||||||
input: []string{`ipv6local:::1`},
|
|
||||||
expectedOut: `ipv6local=::1`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "IPv6 localhost, eq sep",
|
|
||||||
input: []string{`ipv6local=::1`},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "IPv6 localhost, eq sep, brackets",
|
|
||||||
input: []string{`ipv6local=[::1]`},
|
|
||||||
expectedOut: `ipv6local=::1`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "IPv6 localhost, non-canonical, colon sep",
|
|
||||||
input: []string{`ipv6local:0:0:0:0:0:0:0:1`},
|
|
||||||
expectedOut: `ipv6local=0:0:0:0:0:0:0:1`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "IPv6 localhost, non-canonical, eq sep",
|
|
||||||
input: []string{`ipv6local=0:0:0:0:0:0:0:1`},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "IPv6 localhost, non-canonical, eq sep, brackets",
|
|
||||||
input: []string{`ipv6local=[0:0:0:0:0:0:0:1]`},
|
|
||||||
expectedOut: `ipv6local=0:0:0:0:0:0:0:1`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "Bad address, colon sep",
|
|
||||||
input: []string{`myhost:192.notanipaddress.1`},
|
|
||||||
expectedErr: `invalid IP address in add-host: "192.notanipaddress.1"`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "Bad address, eq sep",
|
|
||||||
input: []string{`myhost=192.notanipaddress.1`},
|
|
||||||
expectedErr: `invalid IP address in add-host: "192.notanipaddress.1"`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "No sep",
|
|
||||||
input: []string{`thathost-nosemicolon10.0.0.1`},
|
|
||||||
expectedErr: `bad format for add-host: "thathost-nosemicolon10.0.0.1"`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "Bad IPv6",
|
|
||||||
input: []string{`anipv6host:::::1`},
|
|
||||||
expectedErr: `invalid IP address in add-host: "::::1"`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "Bad IPv6, trailing colons",
|
|
||||||
input: []string{`ipv6local:::0::`},
|
|
||||||
expectedErr: `invalid IP address in add-host: "::0::"`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "Bad IPv6, missing close bracket",
|
|
||||||
input: []string{`ipv6addr=[::1`},
|
|
||||||
expectedErr: `invalid IP address in add-host: "[::1"`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "Bad IPv6, missing open bracket",
|
|
||||||
input: []string{`ipv6addr=::1]`},
|
|
||||||
expectedErr: `invalid IP address in add-host: "::1]"`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "Missing address, colon sep",
|
|
||||||
input: []string{`myhost.invalid:`},
|
|
||||||
expectedErr: `invalid IP address in add-host: ""`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "Missing address, eq sep",
|
|
||||||
input: []string{`myhost.invalid=`},
|
|
||||||
expectedErr: `invalid IP address in add-host: ""`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
doc: "No input",
|
|
||||||
input: []string{``},
|
|
||||||
expectedErr: `bad format for add-host: ""`,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range tests {
|
|
||||||
tc := tc
|
|
||||||
if tc.expectedOut == "" {
|
|
||||||
tc.expectedOut = strings.Join(tc.input, ",")
|
|
||||||
}
|
|
||||||
t.Run(tc.doc, func(t *testing.T) {
|
|
||||||
actualOut, actualErr := toBuildkitExtraHosts(context.TODO(), tc.input, nil)
|
|
||||||
if tc.expectedErr == "" {
|
|
||||||
require.Equal(t, tc.expectedOut, actualOut)
|
|
||||||
require.Nil(t, actualErr)
|
|
||||||
} else {
|
|
||||||
require.Zero(t, actualOut)
|
|
||||||
require.Error(t, actualErr, tc.expectedErr)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,677 +0,0 @@
|
|||||||
package builder
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/csv"
|
|
||||||
"encoding/json"
|
|
||||||
"net/url"
|
|
||||||
"os"
|
|
||||||
"sort"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/docker/buildx/driver"
|
|
||||||
k8sutil "github.com/docker/buildx/driver/kubernetes/util"
|
|
||||||
remoteutil "github.com/docker/buildx/driver/remote/util"
|
|
||||||
"github.com/docker/buildx/localstate"
|
|
||||||
"github.com/docker/buildx/store"
|
|
||||||
"github.com/docker/buildx/store/storeutil"
|
|
||||||
"github.com/docker/buildx/util/confutil"
|
|
||||||
"github.com/docker/buildx/util/dockerutil"
|
|
||||||
"github.com/docker/buildx/util/imagetools"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/docker/cli/cli/command"
|
|
||||||
dopts "github.com/docker/cli/opts"
|
|
||||||
"github.com/google/shlex"
|
|
||||||
"github.com/moby/buildkit/util/progress/progressui"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/spf13/pflag"
|
|
||||||
"golang.org/x/sync/errgroup"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Builder represents an active builder object
|
|
||||||
type Builder struct {
|
|
||||||
*store.NodeGroup
|
|
||||||
driverFactory driverFactory
|
|
||||||
nodes []Node
|
|
||||||
opts builderOpts
|
|
||||||
err error
|
|
||||||
}
|
|
||||||
|
|
||||||
type builderOpts struct {
|
|
||||||
dockerCli command.Cli
|
|
||||||
name string
|
|
||||||
txn *store.Txn
|
|
||||||
contextPathHash string
|
|
||||||
validate bool
|
|
||||||
}
|
|
||||||
|
|
||||||
// Option provides a variadic option for configuring the builder.
|
|
||||||
type Option func(b *Builder)
|
|
||||||
|
|
||||||
// WithName sets builder name.
|
|
||||||
func WithName(name string) Option {
|
|
||||||
return func(b *Builder) {
|
|
||||||
b.opts.name = name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithStore sets a store instance used at init.
|
|
||||||
func WithStore(txn *store.Txn) Option {
|
|
||||||
return func(b *Builder) {
|
|
||||||
b.opts.txn = txn
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithContextPathHash is used for determining pods in k8s driver instance.
|
|
||||||
func WithContextPathHash(contextPathHash string) Option {
|
|
||||||
return func(b *Builder) {
|
|
||||||
b.opts.contextPathHash = contextPathHash
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithSkippedValidation skips builder context validation.
|
|
||||||
func WithSkippedValidation() Option {
|
|
||||||
return func(b *Builder) {
|
|
||||||
b.opts.validate = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// New initializes a new builder client
|
|
||||||
func New(dockerCli command.Cli, opts ...Option) (_ *Builder, err error) {
|
|
||||||
b := &Builder{
|
|
||||||
opts: builderOpts{
|
|
||||||
dockerCli: dockerCli,
|
|
||||||
validate: true,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
for _, opt := range opts {
|
|
||||||
opt(b)
|
|
||||||
}
|
|
||||||
|
|
||||||
if b.opts.txn == nil {
|
|
||||||
// if store instance is nil we create a short-lived one using the
|
|
||||||
// default store and ensure we release it on completion
|
|
||||||
var release func()
|
|
||||||
b.opts.txn, release, err = storeutil.GetStore(dockerCli)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer release()
|
|
||||||
}
|
|
||||||
|
|
||||||
if b.opts.name != "" {
|
|
||||||
if b.NodeGroup, err = storeutil.GetNodeGroup(b.opts.txn, dockerCli, b.opts.name); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if b.NodeGroup, err = storeutil.GetCurrentInstance(b.opts.txn, dockerCli); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if b.opts.validate {
|
|
||||||
if err = b.Validate(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return b, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Validate validates builder context
|
|
||||||
func (b *Builder) Validate() error {
|
|
||||||
if b.NodeGroup != nil && b.NodeGroup.DockerContext {
|
|
||||||
list, err := b.opts.dockerCli.ContextStore().List()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
currentContext := b.opts.dockerCli.CurrentContext()
|
|
||||||
for _, l := range list {
|
|
||||||
if l.Name == b.Name && l.Name != currentContext {
|
|
||||||
return errors.Errorf("use `docker --context=%s buildx` to switch to context %q", l.Name, l.Name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ContextName returns builder context name if available.
|
|
||||||
func (b *Builder) ContextName() string {
|
|
||||||
ctxbuilders, err := b.opts.dockerCli.ContextStore().List()
|
|
||||||
if err != nil {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
for _, cb := range ctxbuilders {
|
|
||||||
if b.NodeGroup.Driver == "docker" && len(b.NodeGroup.Nodes) == 1 && b.NodeGroup.Nodes[0].Endpoint == cb.Name {
|
|
||||||
return cb.Name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// ImageOpt returns registry auth configuration
|
|
||||||
func (b *Builder) ImageOpt() (imagetools.Opt, error) {
|
|
||||||
return storeutil.GetImageConfig(b.opts.dockerCli, b.NodeGroup)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Boot bootstrap a builder
|
|
||||||
func (b *Builder) Boot(ctx context.Context) (bool, error) {
|
|
||||||
toBoot := make([]int, 0, len(b.nodes))
|
|
||||||
for idx, d := range b.nodes {
|
|
||||||
if d.Err != nil || d.Driver == nil || d.DriverInfo == nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if d.DriverInfo.Status != driver.Running {
|
|
||||||
toBoot = append(toBoot, idx)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if len(toBoot) == 0 {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
printer, err := progress.NewPrinter(context.TODO(), os.Stderr, progressui.AutoMode)
|
|
||||||
if err != nil {
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
|
|
||||||
baseCtx := ctx
|
|
||||||
eg, _ := errgroup.WithContext(ctx)
|
|
||||||
errCh := make(chan error, len(toBoot))
|
|
||||||
for _, idx := range toBoot {
|
|
||||||
func(idx int) {
|
|
||||||
eg.Go(func() error {
|
|
||||||
pw := progress.WithPrefix(printer, b.NodeGroup.Nodes[idx].Name, len(toBoot) > 1)
|
|
||||||
_, err := driver.Boot(ctx, baseCtx, b.nodes[idx].Driver, pw)
|
|
||||||
if err != nil {
|
|
||||||
b.nodes[idx].Err = err
|
|
||||||
errCh <- err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
}(idx)
|
|
||||||
}
|
|
||||||
|
|
||||||
err = eg.Wait()
|
|
||||||
close(errCh)
|
|
||||||
err1 := printer.Wait()
|
|
||||||
if err == nil {
|
|
||||||
err = err1
|
|
||||||
}
|
|
||||||
|
|
||||||
if err == nil && len(errCh) == len(toBoot) {
|
|
||||||
return false, <-errCh
|
|
||||||
}
|
|
||||||
return true, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Inactive checks if all nodes are inactive for this builder.
|
|
||||||
func (b *Builder) Inactive() bool {
|
|
||||||
for _, d := range b.nodes {
|
|
||||||
if d.DriverInfo != nil && d.DriverInfo.Status == driver.Running {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// Err returns error if any.
|
|
||||||
func (b *Builder) Err() error {
|
|
||||||
return b.err
|
|
||||||
}
|
|
||||||
|
|
||||||
type driverFactory struct {
|
|
||||||
driver.Factory
|
|
||||||
once sync.Once
|
|
||||||
}
|
|
||||||
|
|
||||||
// Factory returns the driver factory.
|
|
||||||
func (b *Builder) Factory(ctx context.Context, dialMeta map[string][]string) (_ driver.Factory, err error) {
|
|
||||||
b.driverFactory.once.Do(func() {
|
|
||||||
if b.Driver != "" {
|
|
||||||
b.driverFactory.Factory, err = driver.GetFactory(b.Driver, true)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// empty driver means nodegroup was implicitly created as a default
|
|
||||||
// driver for a docker context and allows falling back to a
|
|
||||||
// docker-container driver for older daemon that doesn't support
|
|
||||||
// buildkit (< 18.06).
|
|
||||||
ep := b.NodeGroup.Nodes[0].Endpoint
|
|
||||||
var dockerapi *dockerutil.ClientAPI
|
|
||||||
dockerapi, err = dockerutil.NewClientAPI(b.opts.dockerCli, b.NodeGroup.Nodes[0].Endpoint)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// check if endpoint is healthy is needed to determine the driver type.
|
|
||||||
// if this fails then can't continue with driver selection.
|
|
||||||
if _, err = dockerapi.Ping(ctx); err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
b.driverFactory.Factory, err = driver.GetDefaultFactory(ctx, ep, dockerapi, false, dialMeta)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
b.Driver = b.driverFactory.Factory.Name()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
return b.driverFactory.Factory, err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Builder) MarshalJSON() ([]byte, error) {
|
|
||||||
var berr string
|
|
||||||
if b.err != nil {
|
|
||||||
berr = strings.TrimSpace(b.err.Error())
|
|
||||||
}
|
|
||||||
return json.Marshal(struct {
|
|
||||||
Name string
|
|
||||||
Driver string
|
|
||||||
LastActivity time.Time `json:",omitempty"`
|
|
||||||
Dynamic bool
|
|
||||||
Nodes []Node
|
|
||||||
Err string `json:",omitempty"`
|
|
||||||
}{
|
|
||||||
Name: b.Name,
|
|
||||||
Driver: b.Driver,
|
|
||||||
LastActivity: b.LastActivity,
|
|
||||||
Dynamic: b.Dynamic,
|
|
||||||
Nodes: b.nodes,
|
|
||||||
Err: berr,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetBuilders returns all builders
|
|
||||||
func GetBuilders(dockerCli command.Cli, txn *store.Txn) ([]*Builder, error) {
|
|
||||||
storeng, err := txn.List()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
builders := make([]*Builder, len(storeng))
|
|
||||||
seen := make(map[string]struct{})
|
|
||||||
for i, ng := range storeng {
|
|
||||||
b, err := New(dockerCli,
|
|
||||||
WithName(ng.Name),
|
|
||||||
WithStore(txn),
|
|
||||||
WithSkippedValidation(),
|
|
||||||
)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
builders[i] = b
|
|
||||||
seen[b.NodeGroup.Name] = struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
contexts, err := dockerCli.ContextStore().List()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
sort.Slice(contexts, func(i, j int) bool {
|
|
||||||
return contexts[i].Name < contexts[j].Name
|
|
||||||
})
|
|
||||||
|
|
||||||
for _, c := range contexts {
|
|
||||||
// if a context has the same name as an instance from the store, do not
|
|
||||||
// add it to the builders list. An instance from the store takes
|
|
||||||
// precedence over context builders.
|
|
||||||
if _, ok := seen[c.Name]; ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
b, err := New(dockerCli,
|
|
||||||
WithName(c.Name),
|
|
||||||
WithStore(txn),
|
|
||||||
WithSkippedValidation(),
|
|
||||||
)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
builders = append(builders, b)
|
|
||||||
}
|
|
||||||
|
|
||||||
return builders, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type CreateOpts struct {
|
|
||||||
Name string
|
|
||||||
Driver string
|
|
||||||
NodeName string
|
|
||||||
Platforms []string
|
|
||||||
BuildkitdFlags string
|
|
||||||
BuildkitdConfigFile string
|
|
||||||
DriverOpts []string
|
|
||||||
Use bool
|
|
||||||
Endpoint string
|
|
||||||
Append bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func Create(ctx context.Context, txn *store.Txn, dockerCli command.Cli, opts CreateOpts) (*Builder, error) {
|
|
||||||
var err error
|
|
||||||
|
|
||||||
if opts.Name == "default" {
|
|
||||||
return nil, errors.Errorf("default is a reserved name and cannot be used to identify builder instance")
|
|
||||||
} else if opts.Append && opts.Name == "" {
|
|
||||||
return nil, errors.Errorf("append requires a builder name")
|
|
||||||
}
|
|
||||||
|
|
||||||
name := opts.Name
|
|
||||||
if name == "" {
|
|
||||||
name, err = store.GenerateName(txn)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !opts.Append {
|
|
||||||
contexts, err := dockerCli.ContextStore().List()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
for _, c := range contexts {
|
|
||||||
if c.Name == name {
|
|
||||||
return nil, errors.Errorf("instance name %q already exists as context builder", name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ng, err := txn.NodeGroupByName(name)
|
|
||||||
if err != nil {
|
|
||||||
if os.IsNotExist(errors.Cause(err)) {
|
|
||||||
if opts.Append && opts.Name != "" {
|
|
||||||
return nil, errors.Errorf("failed to find instance %q for append", opts.Name)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
buildkitHost := os.Getenv("BUILDKIT_HOST")
|
|
||||||
|
|
||||||
driverName := opts.Driver
|
|
||||||
if driverName == "" {
|
|
||||||
if ng != nil {
|
|
||||||
driverName = ng.Driver
|
|
||||||
} else if opts.Endpoint == "" && buildkitHost != "" {
|
|
||||||
driverName = "remote"
|
|
||||||
} else {
|
|
||||||
f, err := driver.GetDefaultFactory(ctx, opts.Endpoint, dockerCli.Client(), true, nil)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if f == nil {
|
|
||||||
return nil, errors.Errorf("no valid drivers found")
|
|
||||||
}
|
|
||||||
driverName = f.Name()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ng != nil {
|
|
||||||
if opts.NodeName == "" && !opts.Append {
|
|
||||||
return nil, errors.Errorf("existing instance for %q but no append mode, specify the node name to make changes for existing instances", name)
|
|
||||||
}
|
|
||||||
if driverName != ng.Driver {
|
|
||||||
return nil, errors.Errorf("existing instance for %q but has mismatched driver %q", name, ng.Driver)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := driver.GetFactory(driverName, true); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOriginal := ng
|
|
||||||
if ngOriginal != nil {
|
|
||||||
ngOriginal = ngOriginal.Copy()
|
|
||||||
}
|
|
||||||
|
|
||||||
if ng == nil {
|
|
||||||
ng = &store.NodeGroup{
|
|
||||||
Name: name,
|
|
||||||
Driver: driverName,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
driverOpts, err := csvToMap(opts.DriverOpts)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
buildkitdFlags, err := parseBuildkitdFlags(opts.BuildkitdFlags, driverName, driverOpts)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var ep string
|
|
||||||
var setEp bool
|
|
||||||
switch {
|
|
||||||
case driverName == "kubernetes":
|
|
||||||
if opts.Endpoint != "" {
|
|
||||||
return nil, errors.Errorf("kubernetes driver does not support endpoint args %q", opts.Endpoint)
|
|
||||||
}
|
|
||||||
// generate node name if not provided to avoid duplicated endpoint
|
|
||||||
// error: https://github.com/docker/setup-buildx-action/issues/215
|
|
||||||
nodeName := opts.NodeName
|
|
||||||
if nodeName == "" {
|
|
||||||
nodeName, err = k8sutil.GenerateNodeName(name, txn)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// naming endpoint to make append works
|
|
||||||
ep = (&url.URL{
|
|
||||||
Scheme: driverName,
|
|
||||||
Path: "/" + name,
|
|
||||||
RawQuery: (&url.Values{
|
|
||||||
"deployment": {nodeName},
|
|
||||||
"kubeconfig": {os.Getenv("KUBECONFIG")},
|
|
||||||
}).Encode(),
|
|
||||||
}).String()
|
|
||||||
setEp = false
|
|
||||||
case driverName == "remote":
|
|
||||||
if opts.Endpoint != "" {
|
|
||||||
ep = opts.Endpoint
|
|
||||||
} else if buildkitHost != "" {
|
|
||||||
ep = buildkitHost
|
|
||||||
} else {
|
|
||||||
return nil, errors.Errorf("no remote endpoint provided")
|
|
||||||
}
|
|
||||||
ep, err = validateBuildkitEndpoint(ep)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
setEp = true
|
|
||||||
case opts.Endpoint != "":
|
|
||||||
ep, err = validateEndpoint(dockerCli, opts.Endpoint)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
setEp = true
|
|
||||||
default:
|
|
||||||
if dockerCli.CurrentContext() == "default" && dockerCli.DockerEndpoint().TLSData != nil {
|
|
||||||
return nil, errors.Errorf("could not create a builder instance with TLS data loaded from environment. Please use `docker context create <context-name>` to create a context for current environment and then create a builder instance with context set to <context-name>")
|
|
||||||
}
|
|
||||||
ep, err = dockerutil.GetCurrentEndpoint(dockerCli)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
setEp = false
|
|
||||||
}
|
|
||||||
|
|
||||||
buildkitdConfigFile := opts.BuildkitdConfigFile
|
|
||||||
if buildkitdConfigFile == "" {
|
|
||||||
// if buildkit daemon config is not provided, check if the default one
|
|
||||||
// is available and use it
|
|
||||||
if f, ok := confutil.DefaultConfigFile(dockerCli); ok {
|
|
||||||
buildkitdConfigFile = f
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := ng.Update(opts.NodeName, ep, opts.Platforms, setEp, opts.Append, buildkitdFlags, buildkitdConfigFile, driverOpts); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := txn.Save(ng); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
b, err := New(dockerCli,
|
|
||||||
WithName(ng.Name),
|
|
||||||
WithStore(txn),
|
|
||||||
WithSkippedValidation(),
|
|
||||||
)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
nodes, err := b.LoadNodes(timeoutCtx, WithData())
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, node := range nodes {
|
|
||||||
if err := node.Err; err != nil {
|
|
||||||
err := errors.Errorf("failed to initialize builder %s (%s): %s", ng.Name, node.Name, err)
|
|
||||||
var err2 error
|
|
||||||
if ngOriginal == nil {
|
|
||||||
err2 = txn.Remove(ng.Name)
|
|
||||||
} else {
|
|
||||||
err2 = txn.Save(ngOriginal)
|
|
||||||
}
|
|
||||||
if err2 != nil {
|
|
||||||
return nil, errors.Errorf("could not rollback to previous state: %s", err2)
|
|
||||||
}
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if opts.Use && ep != "" {
|
|
||||||
current, err := dockerutil.GetCurrentEndpoint(dockerCli)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err := txn.SetCurrent(current, ng.Name, false, false); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return b, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type LeaveOpts struct {
|
|
||||||
Name string
|
|
||||||
NodeName string
|
|
||||||
}
|
|
||||||
|
|
||||||
func Leave(ctx context.Context, txn *store.Txn, dockerCli command.Cli, opts LeaveOpts) error {
|
|
||||||
if opts.Name == "" {
|
|
||||||
return errors.Errorf("leave requires instance name")
|
|
||||||
}
|
|
||||||
if opts.NodeName == "" {
|
|
||||||
return errors.Errorf("leave requires node name")
|
|
||||||
}
|
|
||||||
|
|
||||||
ng, err := txn.NodeGroupByName(opts.Name)
|
|
||||||
if err != nil {
|
|
||||||
if os.IsNotExist(errors.Cause(err)) {
|
|
||||||
return errors.Errorf("failed to find instance %q for leave", opts.Name)
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := ng.Leave(opts.NodeName); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
ls, err := localstate.New(confutil.ConfigDir(dockerCli))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err := ls.RemoveBuilderNode(ng.Name, opts.NodeName); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return txn.Save(ng)
|
|
||||||
}
|
|
||||||
|
|
||||||
func csvToMap(in []string) (map[string]string, error) {
|
|
||||||
if len(in) == 0 {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
m := make(map[string]string, len(in))
|
|
||||||
for _, s := range in {
|
|
||||||
csvReader := csv.NewReader(strings.NewReader(s))
|
|
||||||
fields, err := csvReader.Read()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
for _, v := range fields {
|
|
||||||
p := strings.SplitN(v, "=", 2)
|
|
||||||
if len(p) != 2 {
|
|
||||||
return nil, errors.Errorf("invalid value %q, expecting k=v", v)
|
|
||||||
}
|
|
||||||
m[p[0]] = p[1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return m, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// validateEndpoint validates that endpoint is either a context or a docker host
|
|
||||||
func validateEndpoint(dockerCli command.Cli, ep string) (string, error) {
|
|
||||||
dem, err := dockerutil.GetDockerEndpoint(dockerCli, ep)
|
|
||||||
if err == nil && dem != nil {
|
|
||||||
if ep == "default" {
|
|
||||||
return dem.Host, nil
|
|
||||||
}
|
|
||||||
return ep, nil
|
|
||||||
}
|
|
||||||
h, err := dopts.ParseHost(true, ep)
|
|
||||||
if err != nil {
|
|
||||||
return "", errors.Wrapf(err, "failed to parse endpoint %s", ep)
|
|
||||||
}
|
|
||||||
return h, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// validateBuildkitEndpoint validates that endpoint is a valid buildkit host
|
|
||||||
func validateBuildkitEndpoint(ep string) (string, error) {
|
|
||||||
if err := remoteutil.IsValidEndpoint(ep); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return ep, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// parseBuildkitdFlags parses buildkit flags
|
|
||||||
func parseBuildkitdFlags(inp string, driver string, driverOpts map[string]string) (res []string, err error) {
|
|
||||||
if inp != "" {
|
|
||||||
res, err = shlex.Split(inp)
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrap(err, "failed to parse buildkit flags")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var allowInsecureEntitlements []string
|
|
||||||
flags := pflag.NewFlagSet("buildkitd", pflag.ContinueOnError)
|
|
||||||
flags.Usage = func() {}
|
|
||||||
flags.StringArrayVar(&allowInsecureEntitlements, "allow-insecure-entitlement", nil, "")
|
|
||||||
_ = flags.Parse(res)
|
|
||||||
|
|
||||||
var hasNetworkHostEntitlement bool
|
|
||||||
for _, e := range allowInsecureEntitlements {
|
|
||||||
if e == "network.host" {
|
|
||||||
hasNetworkHostEntitlement = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if v, ok := driverOpts["network"]; ok && v == "host" && !hasNetworkHostEntitlement && driver == "docker-container" {
|
|
||||||
// always set network.host entitlement if user has set network=host
|
|
||||||
res = append(res, "--allow-insecure-entitlement=network.host")
|
|
||||||
} else if len(allowInsecureEntitlements) == 0 && (driver == "kubernetes" || driver == "docker-container") {
|
|
||||||
// set network.host entitlement if user does not provide any as
|
|
||||||
// network is isolated for container drivers.
|
|
||||||
res = append(res, "--allow-insecure-entitlement=network.host")
|
|
||||||
}
|
|
||||||
|
|
||||||
return res, nil
|
|
||||||
}
|
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
package builder
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestCsvToMap(t *testing.T) {
|
|
||||||
d := []string{
|
|
||||||
"\"tolerations=key=foo,value=bar;key=foo2,value=bar2\",replicas=1",
|
|
||||||
"namespace=default",
|
|
||||||
}
|
|
||||||
r, err := csvToMap(d)
|
|
||||||
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
require.Contains(t, r, "tolerations")
|
|
||||||
require.Equal(t, r["tolerations"], "key=foo,value=bar;key=foo2,value=bar2")
|
|
||||||
|
|
||||||
require.Contains(t, r, "replicas")
|
|
||||||
require.Equal(t, r["replicas"], "1")
|
|
||||||
|
|
||||||
require.Contains(t, r, "namespace")
|
|
||||||
require.Equal(t, r["namespace"], "default")
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestParseBuildkitdFlags(t *testing.T) {
|
|
||||||
testCases := []struct {
|
|
||||||
name string
|
|
||||||
flags string
|
|
||||||
driver string
|
|
||||||
driverOpts map[string]string
|
|
||||||
expected []string
|
|
||||||
wantErr bool
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
"docker-container no flags",
|
|
||||||
"",
|
|
||||||
"docker-container",
|
|
||||||
nil,
|
|
||||||
[]string{
|
|
||||||
"--allow-insecure-entitlement=network.host",
|
|
||||||
},
|
|
||||||
false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"kubernetes no flags",
|
|
||||||
"",
|
|
||||||
"kubernetes",
|
|
||||||
nil,
|
|
||||||
[]string{
|
|
||||||
"--allow-insecure-entitlement=network.host",
|
|
||||||
},
|
|
||||||
false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"remote no flags",
|
|
||||||
"",
|
|
||||||
"remote",
|
|
||||||
nil,
|
|
||||||
nil,
|
|
||||||
false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"docker-container with insecure flag",
|
|
||||||
"--allow-insecure-entitlement=security.insecure",
|
|
||||||
"docker-container",
|
|
||||||
nil,
|
|
||||||
[]string{
|
|
||||||
"--allow-insecure-entitlement=security.insecure",
|
|
||||||
},
|
|
||||||
false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"docker-container with insecure and host flag",
|
|
||||||
"--allow-insecure-entitlement=network.host --allow-insecure-entitlement=security.insecure",
|
|
||||||
"docker-container",
|
|
||||||
nil,
|
|
||||||
[]string{
|
|
||||||
"--allow-insecure-entitlement=network.host",
|
|
||||||
"--allow-insecure-entitlement=security.insecure",
|
|
||||||
},
|
|
||||||
false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"docker-container with network host opt",
|
|
||||||
"",
|
|
||||||
"docker-container",
|
|
||||||
map[string]string{"network": "host"},
|
|
||||||
[]string{
|
|
||||||
"--allow-insecure-entitlement=network.host",
|
|
||||||
},
|
|
||||||
false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"docker-container with host flag and network host opt",
|
|
||||||
"--allow-insecure-entitlement=network.host",
|
|
||||||
"docker-container",
|
|
||||||
map[string]string{"network": "host"},
|
|
||||||
[]string{
|
|
||||||
"--allow-insecure-entitlement=network.host",
|
|
||||||
},
|
|
||||||
false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"docker-container with insecure, host flag and network host opt",
|
|
||||||
"--allow-insecure-entitlement=network.host --allow-insecure-entitlement=security.insecure",
|
|
||||||
"docker-container",
|
|
||||||
map[string]string{"network": "host"},
|
|
||||||
[]string{
|
|
||||||
"--allow-insecure-entitlement=network.host",
|
|
||||||
"--allow-insecure-entitlement=security.insecure",
|
|
||||||
},
|
|
||||||
false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"error parsing flags",
|
|
||||||
"foo'",
|
|
||||||
"docker-container",
|
|
||||||
nil,
|
|
||||||
nil,
|
|
||||||
true,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
for _, tt := range testCases {
|
|
||||||
tt := tt
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
flags, err := parseBuildkitdFlags(tt.flags, tt.driver, tt.driverOpts)
|
|
||||||
if tt.wantErr {
|
|
||||||
require.Error(t, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
require.NoError(t, err)
|
|
||||||
assert.Equal(t, tt.expected, flags)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
291
builder/node.go
291
builder/node.go
@@ -1,291 +0,0 @@
|
|||||||
package builder
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"sort"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/platforms"
|
|
||||||
"github.com/docker/buildx/driver"
|
|
||||||
ctxkube "github.com/docker/buildx/driver/kubernetes/context"
|
|
||||||
"github.com/docker/buildx/store"
|
|
||||||
"github.com/docker/buildx/store/storeutil"
|
|
||||||
"github.com/docker/buildx/util/dockerutil"
|
|
||||||
"github.com/docker/buildx/util/imagetools"
|
|
||||||
"github.com/docker/buildx/util/platformutil"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
"github.com/moby/buildkit/util/grpcerrors"
|
|
||||||
ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"golang.org/x/sync/errgroup"
|
|
||||||
"google.golang.org/grpc/codes"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Node struct {
|
|
||||||
store.Node
|
|
||||||
Builder string
|
|
||||||
Driver *driver.DriverHandle
|
|
||||||
DriverInfo *driver.Info
|
|
||||||
ImageOpt imagetools.Opt
|
|
||||||
ProxyConfig map[string]string
|
|
||||||
Version string
|
|
||||||
Err error
|
|
||||||
|
|
||||||
// worker settings
|
|
||||||
IDs []string
|
|
||||||
Platforms []ocispecs.Platform
|
|
||||||
GCPolicy []client.PruneInfo
|
|
||||||
Labels map[string]string
|
|
||||||
}
|
|
||||||
|
|
||||||
// Nodes returns nodes for this builder.
|
|
||||||
func (b *Builder) Nodes() []Node {
|
|
||||||
return b.nodes
|
|
||||||
}
|
|
||||||
|
|
||||||
type LoadNodesOption func(*loadNodesOptions)
|
|
||||||
|
|
||||||
type loadNodesOptions struct {
|
|
||||||
data bool
|
|
||||||
dialMeta map[string][]string
|
|
||||||
}
|
|
||||||
|
|
||||||
func WithData() LoadNodesOption {
|
|
||||||
return func(o *loadNodesOptions) {
|
|
||||||
o.data = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func WithDialMeta(dialMeta map[string][]string) LoadNodesOption {
|
|
||||||
return func(o *loadNodesOptions) {
|
|
||||||
o.dialMeta = dialMeta
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// LoadNodes loads and returns nodes for this builder.
|
|
||||||
// TODO: this should be a method on a Node object and lazy load data for each driver.
|
|
||||||
func (b *Builder) LoadNodes(ctx context.Context, opts ...LoadNodesOption) (_ []Node, err error) {
|
|
||||||
lno := loadNodesOptions{
|
|
||||||
data: false,
|
|
||||||
}
|
|
||||||
for _, opt := range opts {
|
|
||||||
opt(&lno)
|
|
||||||
}
|
|
||||||
|
|
||||||
eg, _ := errgroup.WithContext(ctx)
|
|
||||||
b.nodes = make([]Node, len(b.NodeGroup.Nodes))
|
|
||||||
|
|
||||||
defer func() {
|
|
||||||
if b.err == nil && err != nil {
|
|
||||||
b.err = err
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
factory, err := b.Factory(ctx, lno.dialMeta)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
imageopt, err := b.ImageOpt()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
for i, n := range b.NodeGroup.Nodes {
|
|
||||||
func(i int, n store.Node) {
|
|
||||||
eg.Go(func() error {
|
|
||||||
node := Node{
|
|
||||||
Node: n,
|
|
||||||
ProxyConfig: storeutil.GetProxyConfig(b.opts.dockerCli),
|
|
||||||
Platforms: n.Platforms,
|
|
||||||
Builder: b.Name,
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
b.nodes[i] = node
|
|
||||||
}()
|
|
||||||
|
|
||||||
dockerapi, err := dockerutil.NewClientAPI(b.opts.dockerCli, n.Endpoint)
|
|
||||||
if err != nil {
|
|
||||||
node.Err = err
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
contextStore := b.opts.dockerCli.ContextStore()
|
|
||||||
|
|
||||||
var kcc driver.KubeClientConfig
|
|
||||||
kcc, err = ctxkube.ConfigFromEndpoint(n.Endpoint, contextStore)
|
|
||||||
if err != nil {
|
|
||||||
// err is returned if n.Endpoint is non-context name like "unix:///var/run/docker.sock".
|
|
||||||
// try again with name="default".
|
|
||||||
// FIXME(@AkihiroSuda): n should retain real context name.
|
|
||||||
kcc, err = ctxkube.ConfigFromEndpoint("default", contextStore)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Error(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tryToUseKubeConfigInCluster := false
|
|
||||||
if kcc == nil {
|
|
||||||
tryToUseKubeConfigInCluster = true
|
|
||||||
} else {
|
|
||||||
if _, err := kcc.ClientConfig(); err != nil {
|
|
||||||
tryToUseKubeConfigInCluster = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if tryToUseKubeConfigInCluster {
|
|
||||||
kccInCluster := driver.KubeClientConfigInCluster{}
|
|
||||||
if _, err := kccInCluster.ClientConfig(); err == nil {
|
|
||||||
logrus.Debug("using kube config in cluster")
|
|
||||||
kcc = kccInCluster
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
d, err := driver.GetDriver(ctx, "buildx_buildkit_"+n.Name, factory, n.Endpoint, dockerapi, imageopt.Auth, kcc, n.BuildkitdFlags, n.Files, n.DriverOpts, n.Platforms, b.opts.contextPathHash, lno.dialMeta)
|
|
||||||
if err != nil {
|
|
||||||
node.Err = err
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
node.Driver = d
|
|
||||||
node.ImageOpt = imageopt
|
|
||||||
|
|
||||||
if lno.data {
|
|
||||||
if err := node.loadData(ctx); err != nil {
|
|
||||||
node.Err = err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
}(i, n)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := eg.Wait(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: This should be done in the routine loading driver data
|
|
||||||
if lno.data {
|
|
||||||
kubernetesDriverCount := 0
|
|
||||||
for _, d := range b.nodes {
|
|
||||||
if d.DriverInfo != nil && len(d.DriverInfo.DynamicNodes) > 0 {
|
|
||||||
kubernetesDriverCount++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
isAllKubernetesDrivers := len(b.nodes) == kubernetesDriverCount
|
|
||||||
if isAllKubernetesDrivers {
|
|
||||||
var nodes []Node
|
|
||||||
var dynamicNodes []store.Node
|
|
||||||
for _, di := range b.nodes {
|
|
||||||
// dynamic nodes are used in Kubernetes driver.
|
|
||||||
// Kubernetes' pods are dynamically mapped to BuildKit Nodes.
|
|
||||||
if di.DriverInfo != nil && len(di.DriverInfo.DynamicNodes) > 0 {
|
|
||||||
for i := 0; i < len(di.DriverInfo.DynamicNodes); i++ {
|
|
||||||
diClone := di
|
|
||||||
if pl := di.DriverInfo.DynamicNodes[i].Platforms; len(pl) > 0 {
|
|
||||||
diClone.Platforms = pl
|
|
||||||
}
|
|
||||||
nodes = append(nodes, di)
|
|
||||||
}
|
|
||||||
dynamicNodes = append(dynamicNodes, di.DriverInfo.DynamicNodes...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// not append (remove the static nodes in the store)
|
|
||||||
b.NodeGroup.Nodes = dynamicNodes
|
|
||||||
b.nodes = nodes
|
|
||||||
b.NodeGroup.Dynamic = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return b.nodes, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *Node) MarshalJSON() ([]byte, error) {
|
|
||||||
var status string
|
|
||||||
if n.DriverInfo != nil {
|
|
||||||
status = n.DriverInfo.Status.String()
|
|
||||||
}
|
|
||||||
var nerr string
|
|
||||||
if n.Err != nil {
|
|
||||||
status = "error"
|
|
||||||
nerr = strings.TrimSpace(n.Err.Error())
|
|
||||||
}
|
|
||||||
var pp []string
|
|
||||||
for _, p := range n.Platforms {
|
|
||||||
pp = append(pp, platforms.Format(p))
|
|
||||||
}
|
|
||||||
return json.Marshal(struct {
|
|
||||||
Name string
|
|
||||||
Endpoint string
|
|
||||||
BuildkitdFlags []string `json:"Flags,omitempty"`
|
|
||||||
DriverOpts map[string]string `json:",omitempty"`
|
|
||||||
Files map[string][]byte `json:",omitempty"`
|
|
||||||
Status string `json:",omitempty"`
|
|
||||||
ProxyConfig map[string]string `json:",omitempty"`
|
|
||||||
Version string `json:",omitempty"`
|
|
||||||
Err string `json:",omitempty"`
|
|
||||||
IDs []string `json:",omitempty"`
|
|
||||||
Platforms []string `json:",omitempty"`
|
|
||||||
GCPolicy []client.PruneInfo `json:",omitempty"`
|
|
||||||
Labels map[string]string `json:",omitempty"`
|
|
||||||
}{
|
|
||||||
Name: n.Name,
|
|
||||||
Endpoint: n.Endpoint,
|
|
||||||
BuildkitdFlags: n.BuildkitdFlags,
|
|
||||||
DriverOpts: n.DriverOpts,
|
|
||||||
Files: n.Files,
|
|
||||||
Status: status,
|
|
||||||
ProxyConfig: n.ProxyConfig,
|
|
||||||
Version: n.Version,
|
|
||||||
Err: nerr,
|
|
||||||
IDs: n.IDs,
|
|
||||||
Platforms: pp,
|
|
||||||
GCPolicy: n.GCPolicy,
|
|
||||||
Labels: n.Labels,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n *Node) loadData(ctx context.Context) error {
|
|
||||||
if n.Driver == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
info, err := n.Driver.Info(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
n.DriverInfo = info
|
|
||||||
if n.DriverInfo.Status == driver.Running {
|
|
||||||
driverClient, err := n.Driver.Client(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
workers, err := driverClient.ListWorkers(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return errors.Wrap(err, "listing workers")
|
|
||||||
}
|
|
||||||
for idx, w := range workers {
|
|
||||||
n.IDs = append(n.IDs, w.ID)
|
|
||||||
n.Platforms = append(n.Platforms, w.Platforms...)
|
|
||||||
if idx == 0 {
|
|
||||||
n.GCPolicy = w.GCPolicy
|
|
||||||
n.Labels = w.Labels
|
|
||||||
}
|
|
||||||
}
|
|
||||||
sort.Strings(n.IDs)
|
|
||||||
n.Platforms = platformutil.Dedupe(n.Platforms)
|
|
||||||
inf, err := driverClient.Info(ctx)
|
|
||||||
if err != nil {
|
|
||||||
if st, ok := grpcerrors.AsGRPCStatus(err); ok && st.Code() == codes.Unimplemented {
|
|
||||||
n.Version, err = n.Driver.Version(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return errors.Wrap(err, "getting version")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
n.Version = inf.BuildkitVersion.Version
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
@@ -4,8 +4,8 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
|
"github.com/containerd/containerd/pkg/seed"
|
||||||
"github.com/docker/buildx/commands"
|
"github.com/docker/buildx/commands"
|
||||||
"github.com/docker/buildx/util/desktop"
|
|
||||||
"github.com/docker/buildx/version"
|
"github.com/docker/buildx/version"
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli-plugins/manager"
|
"github.com/docker/cli/cli-plugins/manager"
|
||||||
@@ -15,61 +15,67 @@ import (
|
|||||||
cliflags "github.com/docker/cli/cli/flags"
|
cliflags "github.com/docker/cli/cli/flags"
|
||||||
"github.com/moby/buildkit/solver/errdefs"
|
"github.com/moby/buildkit/solver/errdefs"
|
||||||
"github.com/moby/buildkit/util/stack"
|
"github.com/moby/buildkit/util/stack"
|
||||||
|
"github.com/moby/buildkit/util/tracing/detect"
|
||||||
|
"go.opentelemetry.io/otel"
|
||||||
|
|
||||||
//nolint:staticcheck // vendored dependencies may still use this
|
_ "github.com/moby/buildkit/util/tracing/detect/delegated"
|
||||||
"github.com/containerd/containerd/pkg/seed"
|
_ "github.com/moby/buildkit/util/tracing/env"
|
||||||
|
|
||||||
|
// FIXME: "k8s.io/client-go/plugin/pkg/client/auth/azure" is excluded because of compilation error
|
||||||
|
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
|
||||||
_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
|
_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
|
||||||
|
_ "k8s.io/client-go/plugin/pkg/client/auth/openstack"
|
||||||
|
|
||||||
_ "github.com/docker/buildx/driver/docker"
|
_ "github.com/docker/buildx/driver/docker"
|
||||||
_ "github.com/docker/buildx/driver/docker-container"
|
_ "github.com/docker/buildx/driver/docker-container"
|
||||||
_ "github.com/docker/buildx/driver/kubernetes"
|
_ "github.com/docker/buildx/driver/kubernetes"
|
||||||
_ "github.com/docker/buildx/driver/remote"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var experimental string
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
//nolint:staticcheck
|
|
||||||
seed.WithTimeAndRand()
|
seed.WithTimeAndRand()
|
||||||
|
|
||||||
stack.SetVersionInfo(version.Version, version.Revision)
|
stack.SetVersionInfo(version.Version, version.Revision)
|
||||||
}
|
|
||||||
|
|
||||||
func runStandalone(cmd *command.DockerCli) error {
|
detect.ServiceName = "buildx"
|
||||||
if err := cmd.Initialize(cliflags.NewClientOptions()); err != nil {
|
// do not log tracing errors to stdio
|
||||||
return err
|
otel.SetErrorHandler(skipErrors{})
|
||||||
}
|
|
||||||
rootCmd := commands.NewRootCmd(os.Args[0], false, cmd)
|
|
||||||
return rootCmd.Execute()
|
|
||||||
}
|
|
||||||
|
|
||||||
func runPlugin(cmd *command.DockerCli) error {
|
|
||||||
rootCmd := commands.NewRootCmd("buildx", true, cmd)
|
|
||||||
return plugin.RunPlugin(cmd, rootCmd, manager.Metadata{
|
|
||||||
SchemaVersion: "0.1.0",
|
|
||||||
Vendor: "Docker Inc.",
|
|
||||||
Version: version.Version,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
cmd, err := command.NewDockerCli()
|
if plugin.RunningStandalone() {
|
||||||
|
dockerCli, err := command.NewDockerCli()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintln(os.Stderr, err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
opts := cliflags.NewClientOptions()
|
||||||
|
dockerCli.Initialize(opts)
|
||||||
|
rootCmd := commands.NewRootCmd(os.Args[0], false, dockerCli)
|
||||||
|
if err := rootCmd.Execute(); err != nil {
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
os.Exit(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
dockerCli, err := command.NewDockerCli()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintln(os.Stderr, err)
|
fmt.Fprintln(os.Stderr, err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
if plugin.RunningStandalone() {
|
p := commands.NewRootCmd("buildx", true, dockerCli)
|
||||||
err = runStandalone(cmd)
|
meta := manager.Metadata{
|
||||||
} else {
|
SchemaVersion: "0.1.0",
|
||||||
err = runPlugin(cmd)
|
Vendor: "Docker Inc.",
|
||||||
}
|
Version: version.Version,
|
||||||
if err == nil {
|
Experimental: experimental != "",
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := plugin.RunPlugin(dockerCli, p, meta); err != nil {
|
||||||
if sterr, ok := err.(cli.StatusError); ok {
|
if sterr, ok := err.(cli.StatusError); ok {
|
||||||
if sterr.Status != "" {
|
if sterr.Status != "" {
|
||||||
fmt.Fprintln(cmd.Err(), sterr.Status)
|
fmt.Fprintln(dockerCli.Err(), sterr.Status)
|
||||||
}
|
}
|
||||||
// StatusError should only be used for errors, and all errors should
|
// StatusError should only be used for errors, and all errors should
|
||||||
// have a non-zero exit status, so never exit with 0
|
// have a non-zero exit status, so never exit with 0
|
||||||
@@ -78,18 +84,20 @@ func main() {
|
|||||||
}
|
}
|
||||||
os.Exit(sterr.StatusCode)
|
os.Exit(sterr.StatusCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, s := range errdefs.Sources(err) {
|
for _, s := range errdefs.Sources(err) {
|
||||||
s.Print(cmd.Err())
|
s.Print(dockerCli.Err())
|
||||||
}
|
}
|
||||||
|
|
||||||
if debug.IsEnabled() {
|
if debug.IsEnabled() {
|
||||||
fmt.Fprintf(cmd.Err(), "ERROR: %+v", stack.Formatter(err))
|
fmt.Fprintf(dockerCli.Err(), "error: %+v", stack.Formatter(err))
|
||||||
} else {
|
} else {
|
||||||
fmt.Fprintf(cmd.Err(), "ERROR: %v\n", err)
|
fmt.Fprintf(dockerCli.Err(), "error: %v\n", err)
|
||||||
}
|
|
||||||
if ebr, ok := err.(*desktop.ErrorWithBuildRef); ok {
|
|
||||||
ebr.Print(cmd.Err())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type skipErrors struct{}
|
||||||
|
|
||||||
|
func (skipErrors) Handle(err error) {}
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/moby/buildkit/util/tracing/detect"
|
|
||||||
"go.opentelemetry.io/otel"
|
|
||||||
|
|
||||||
_ "github.com/moby/buildkit/util/tracing/detect/delegated"
|
|
||||||
_ "github.com/moby/buildkit/util/tracing/env"
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
detect.ServiceName = "buildx"
|
|
||||||
// do not log tracing errors to stdio
|
|
||||||
otel.SetErrorHandler(skipErrors{})
|
|
||||||
}
|
|
||||||
|
|
||||||
type skipErrors struct{}
|
|
||||||
|
|
||||||
func (skipErrors) Handle(err error) {}
|
|
||||||
222
commands/bake.go
222
commands/bake.go
@@ -4,26 +4,16 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/containerd/console"
|
|
||||||
"github.com/containerd/containerd/platforms"
|
"github.com/containerd/containerd/platforms"
|
||||||
"github.com/docker/buildx/bake"
|
"github.com/docker/buildx/bake"
|
||||||
"github.com/docker/buildx/build"
|
"github.com/docker/buildx/build"
|
||||||
"github.com/docker/buildx/builder"
|
|
||||||
"github.com/docker/buildx/localstate"
|
|
||||||
"github.com/docker/buildx/util/buildflags"
|
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/buildx/util/confutil"
|
"github.com/docker/buildx/util/confutil"
|
||||||
"github.com/docker/buildx/util/desktop"
|
|
||||||
"github.com/docker/buildx/util/dockerutil"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
"github.com/docker/buildx/util/progress"
|
||||||
"github.com/docker/buildx/util/tracing"
|
"github.com/docker/buildx/util/tracing"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/moby/buildkit/identity"
|
"github.com/moby/buildkit/util/appcontext"
|
||||||
"github.com/moby/buildkit/util/progress/progressui"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
@@ -32,16 +22,12 @@ type bakeOptions struct {
|
|||||||
files []string
|
files []string
|
||||||
overrides []string
|
overrides []string
|
||||||
printOnly bool
|
printOnly bool
|
||||||
sbom string
|
commonOptions
|
||||||
provenance string
|
|
||||||
|
|
||||||
builder string
|
|
||||||
metadataFile string
|
|
||||||
exportPush bool
|
|
||||||
exportLoad bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in bakeOptions, cFlags commonFlags) (err error) {
|
func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error) {
|
||||||
|
ctx := appcontext.Context()
|
||||||
|
|
||||||
ctx, end, err := tracing.TraceCurrentCommand(ctx, "bake")
|
ctx, end, err := tracing.TraceCurrentCommand(ctx, "bake")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -54,11 +40,11 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba
|
|||||||
cmdContext := "cwd://"
|
cmdContext := "cwd://"
|
||||||
|
|
||||||
if len(targets) > 0 {
|
if len(targets) > 0 {
|
||||||
if build.IsRemoteURL(targets[0]) {
|
if bake.IsRemoteURL(targets[0]) {
|
||||||
url = targets[0]
|
url = targets[0]
|
||||||
targets = targets[1:]
|
targets = targets[1:]
|
||||||
if len(targets) > 0 {
|
if len(targets) > 0 {
|
||||||
if build.IsRemoteURL(targets[0]) {
|
if bake.IsRemoteURL(targets[0]) {
|
||||||
cmdContext = targets[0]
|
cmdContext = targets[0]
|
||||||
targets = targets[1:]
|
targets = targets[1:]
|
||||||
}
|
}
|
||||||
@@ -79,58 +65,17 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba
|
|||||||
} else if in.exportLoad {
|
} else if in.exportLoad {
|
||||||
overrides = append(overrides, "*.output=type=docker")
|
overrides = append(overrides, "*.output=type=docker")
|
||||||
}
|
}
|
||||||
if cFlags.noCache != nil {
|
if in.noCache != nil {
|
||||||
overrides = append(overrides, fmt.Sprintf("*.no-cache=%t", *cFlags.noCache))
|
overrides = append(overrides, fmt.Sprintf("*.no-cache=%t", *in.noCache))
|
||||||
}
|
}
|
||||||
if cFlags.pull != nil {
|
if in.pull != nil {
|
||||||
overrides = append(overrides, fmt.Sprintf("*.pull=%t", *cFlags.pull))
|
overrides = append(overrides, fmt.Sprintf("*.pull=%t", *in.pull))
|
||||||
}
|
|
||||||
if in.sbom != "" {
|
|
||||||
overrides = append(overrides, fmt.Sprintf("*.attest=%s", buildflags.CanonicalizeAttest("sbom", in.sbom)))
|
|
||||||
}
|
|
||||||
if in.provenance != "" {
|
|
||||||
overrides = append(overrides, fmt.Sprintf("*.attest=%s", buildflags.CanonicalizeAttest("provenance", in.provenance)))
|
|
||||||
}
|
}
|
||||||
contextPathHash, _ := os.Getwd()
|
contextPathHash, _ := os.Getwd()
|
||||||
|
|
||||||
ctx2, cancel := context.WithCancel(context.TODO())
|
ctx2, cancel := context.WithCancel(context.TODO())
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
printer := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, in.progress)
|
||||||
var nodes []builder.Node
|
|
||||||
var progressConsoleDesc, progressTextDesc string
|
|
||||||
|
|
||||||
// instance only needed for reading remote bake files or building
|
|
||||||
if url != "" || !in.printOnly {
|
|
||||||
b, err := builder.New(dockerCli,
|
|
||||||
builder.WithName(in.builder),
|
|
||||||
builder.WithContextPathHash(contextPathHash),
|
|
||||||
)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err = updateLastActivity(dockerCli, b.NodeGroup); err != nil {
|
|
||||||
return errors.Wrapf(err, "failed to update builder last activity time")
|
|
||||||
}
|
|
||||||
nodes, err = b.LoadNodes(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
progressConsoleDesc = fmt.Sprintf("%s:%s", b.Driver, b.Name)
|
|
||||||
progressTextDesc = fmt.Sprintf("building with %q instance using %s driver", b.Name, b.Driver)
|
|
||||||
}
|
|
||||||
|
|
||||||
var term bool
|
|
||||||
if _, err := console.ConsoleFromFile(os.Stderr); err == nil {
|
|
||||||
term = true
|
|
||||||
}
|
|
||||||
|
|
||||||
progressMode := progressui.DisplayMode(cFlags.progress)
|
|
||||||
printer, err := progress.NewPrinter(ctx2, os.Stderr, progressMode,
|
|
||||||
progress.WithDesc(progressTextDesc, progressConsoleDesc),
|
|
||||||
)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
defer func() {
|
defer func() {
|
||||||
if printer != nil {
|
if printer != nil {
|
||||||
@@ -138,24 +83,29 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba
|
|||||||
if err == nil {
|
if err == nil {
|
||||||
err = err1
|
err = err1
|
||||||
}
|
}
|
||||||
if err == nil && progressMode != progressui.QuietMode && progressMode != progressui.RawJSONMode {
|
|
||||||
desktop.PrintBuildDetails(os.Stderr, printer.BuildRefs(), term)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
files, inp, err := readBakeFiles(ctx, nodes, url, in.files, dockerCli.In(), printer)
|
dis, err := getInstanceOrDefault(ctx, dockerCli, in.builder, contextPathHash)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(files) == 0 {
|
var files []bake.File
|
||||||
return errors.New("couldn't find a bake definition")
|
var inp *bake.Input
|
||||||
|
|
||||||
|
if url != "" {
|
||||||
|
files, inp, err = bake.ReadRemoteFiles(ctx, dis, url, in.files, printer)
|
||||||
|
} else {
|
||||||
|
files, err = bake.ReadLocalFiles(in.files)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
tgts, grps, err := bake.ReadTargets(ctx, files, targets, overrides, map[string]string{
|
tgts, grps, err := bake.ReadTargets(ctx, files, targets, overrides, map[string]string{
|
||||||
// don't forget to update documentation if you add a new
|
// Don't forget to update documentation if you add a new
|
||||||
// built-in variable: docs/bake-reference.md#built-in-variables
|
// built-in variable: docs/reference/buildx_bake.md#built-in-variables
|
||||||
"BAKE_CMD_CONTEXT": cmdContext,
|
"BAKE_CMD_CONTEXT": cmdContext,
|
||||||
"BAKE_LOCAL_PLATFORM": platforms.DefaultString(),
|
"BAKE_LOCAL_PLATFORM": platforms.DefaultString(),
|
||||||
})
|
})
|
||||||
@@ -163,35 +113,26 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if v := os.Getenv("SOURCE_DATE_EPOCH"); v != "" {
|
|
||||||
// TODO: extract env var parsing to a method easily usable by library consumers
|
|
||||||
for _, t := range tgts {
|
|
||||||
if _, ok := t.Args["SOURCE_DATE_EPOCH"]; ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if t.Args == nil {
|
|
||||||
t.Args = map[string]*string{}
|
|
||||||
}
|
|
||||||
t.Args["SOURCE_DATE_EPOCH"] = &v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// this function can update target context string from the input so call before printOnly check
|
// this function can update target context string from the input so call before printOnly check
|
||||||
bo, err := bake.TargetsToBuildOpt(tgts, inp)
|
bo, err := bake.TargetsToBuildOpt(tgts, inp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
def := struct {
|
if in.printOnly {
|
||||||
|
var defg map[string]*bake.Group
|
||||||
|
if len(grps) == 1 {
|
||||||
|
defg = map[string]*bake.Group{
|
||||||
|
"default": grps[0],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dt, err := json.MarshalIndent(struct {
|
||||||
Group map[string]*bake.Group `json:"group,omitempty"`
|
Group map[string]*bake.Group `json:"group,omitempty"`
|
||||||
Target map[string]*bake.Target `json:"target"`
|
Target map[string]*bake.Target `json:"target"`
|
||||||
}{
|
}{
|
||||||
Group: grps,
|
defg,
|
||||||
Target: tgts,
|
tgts,
|
||||||
}
|
}, "", " ")
|
||||||
|
|
||||||
if in.printOnly {
|
|
||||||
dt, err := json.MarshalIndent(def, "", " ")
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -204,29 +145,7 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// local state group
|
resp, err := build.Build(ctx, dis, bo, dockerAPI(dockerCli), confutil.ConfigDir(dockerCli), printer)
|
||||||
groupRef := identity.NewID()
|
|
||||||
var refs []string
|
|
||||||
for k, b := range bo {
|
|
||||||
b.Ref = identity.NewID()
|
|
||||||
b.GroupRef = groupRef
|
|
||||||
refs = append(refs, b.Ref)
|
|
||||||
bo[k] = b
|
|
||||||
}
|
|
||||||
dt, err := json.Marshal(def)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err := saveLocalStateGroup(dockerCli, groupRef, localstate.StateGroup{
|
|
||||||
Definition: dt,
|
|
||||||
Targets: targets,
|
|
||||||
Inputs: overrides,
|
|
||||||
Refs: refs,
|
|
||||||
}); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
resp, err := build.Build(ctx, nodes, bo, dockerutil.NewClient(dockerCli), confutil.ConfigDir(dockerCli), printer)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return wrapBuildError(err, true)
|
return wrapBuildError(err, true)
|
||||||
}
|
}
|
||||||
@@ -246,7 +165,6 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba
|
|||||||
|
|
||||||
func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
||||||
var options bakeOptions
|
var options bakeOptions
|
||||||
var cFlags commonFlags
|
|
||||||
|
|
||||||
cmd := &cobra.Command{
|
cmd := &cobra.Command{
|
||||||
Use: "bake [OPTIONS] [TARGET...]",
|
Use: "bake [OPTIONS] [TARGET...]",
|
||||||
@@ -255,17 +173,14 @@ func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
|||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
// reset to nil to avoid override is unset
|
// reset to nil to avoid override is unset
|
||||||
if !cmd.Flags().Lookup("no-cache").Changed {
|
if !cmd.Flags().Lookup("no-cache").Changed {
|
||||||
cFlags.noCache = nil
|
options.noCache = nil
|
||||||
}
|
}
|
||||||
if !cmd.Flags().Lookup("pull").Changed {
|
if !cmd.Flags().Lookup("pull").Changed {
|
||||||
cFlags.pull = nil
|
options.pull = nil
|
||||||
}
|
}
|
||||||
options.builder = rootOpts.builder
|
options.commonOptions.builder = rootOpts.builder
|
||||||
options.metadataFile = cFlags.metadataFile
|
return runBake(dockerCli, args, options)
|
||||||
// Other common flags (noCache, pull and progress) are processed in runBake function.
|
|
||||||
return runBake(cmd.Context(), dockerCli, args, options, cFlags)
|
|
||||||
},
|
},
|
||||||
ValidArgsFunction: completion.BakeTargets(options.files),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
flags := cmd.Flags()
|
flags := cmd.Flags()
|
||||||
@@ -274,62 +189,9 @@ func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
|||||||
flags.BoolVar(&options.exportLoad, "load", false, `Shorthand for "--set=*.output=type=docker"`)
|
flags.BoolVar(&options.exportLoad, "load", false, `Shorthand for "--set=*.output=type=docker"`)
|
||||||
flags.BoolVar(&options.printOnly, "print", false, "Print the options without building")
|
flags.BoolVar(&options.printOnly, "print", false, "Print the options without building")
|
||||||
flags.BoolVar(&options.exportPush, "push", false, `Shorthand for "--set=*.output=type=registry"`)
|
flags.BoolVar(&options.exportPush, "push", false, `Shorthand for "--set=*.output=type=registry"`)
|
||||||
flags.StringVar(&options.sbom, "sbom", "", `Shorthand for "--set=*.attest=type=sbom"`)
|
|
||||||
flags.StringVar(&options.provenance, "provenance", "", `Shorthand for "--set=*.attest=type=provenance"`)
|
|
||||||
flags.StringArrayVar(&options.overrides, "set", nil, `Override target value (e.g., "targetpattern.key=value")`)
|
flags.StringArrayVar(&options.overrides, "set", nil, `Override target value (e.g., "targetpattern.key=value")`)
|
||||||
|
|
||||||
commonBuildFlags(&cFlags, flags)
|
commonBuildFlags(&options.commonOptions, flags)
|
||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
func saveLocalStateGroup(dockerCli command.Cli, ref string, lsg localstate.StateGroup) error {
|
|
||||||
l, err := localstate.New(confutil.ConfigDir(dockerCli))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return l.SaveGroup(ref, lsg)
|
|
||||||
}
|
|
||||||
|
|
||||||
func readBakeFiles(ctx context.Context, nodes []builder.Node, url string, names []string, stdin io.Reader, pw progress.Writer) (files []bake.File, inp *bake.Input, err error) {
|
|
||||||
var lnames []string // local
|
|
||||||
var rnames []string // remote
|
|
||||||
var anames []string // both
|
|
||||||
for _, v := range names {
|
|
||||||
if strings.HasPrefix(v, "cwd://") {
|
|
||||||
tname := strings.TrimPrefix(v, "cwd://")
|
|
||||||
lnames = append(lnames, tname)
|
|
||||||
anames = append(anames, tname)
|
|
||||||
} else {
|
|
||||||
rnames = append(rnames, v)
|
|
||||||
anames = append(anames, v)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if url != "" {
|
|
||||||
var rfiles []bake.File
|
|
||||||
rfiles, inp, err = bake.ReadRemoteFiles(ctx, nodes, url, rnames, pw)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
files = append(files, rfiles...)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(lnames) > 0 || url == "" {
|
|
||||||
var lfiles []bake.File
|
|
||||||
progress.Wrap("[internal] load local bake definitions", pw.Write, func(sub progress.SubLogger) error {
|
|
||||||
if url != "" {
|
|
||||||
lfiles, err = bake.ReadLocalFiles(lnames, stdin, sub)
|
|
||||||
} else {
|
|
||||||
lfiles, err = bake.ReadLocalFiles(anames, stdin, sub)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
files = append(files, lfiles...)
|
|
||||||
}
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|||||||
1011
commands/build.go
1011
commands/build.go
File diff suppressed because it is too large
Load Diff
@@ -3,15 +3,23 @@ package commands
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/csv"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net/url"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/docker/buildx/builder"
|
|
||||||
"github.com/docker/buildx/driver"
|
"github.com/docker/buildx/driver"
|
||||||
|
"github.com/docker/buildx/store"
|
||||||
"github.com/docker/buildx/store/storeutil"
|
"github.com/docker/buildx/store/storeutil"
|
||||||
"github.com/docker/buildx/util/cobrautil"
|
"github.com/docker/buildx/util/cobrautil"
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
|
"github.com/google/shlex"
|
||||||
|
"github.com/moby/buildkit/util/appcontext"
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -23,60 +31,176 @@ type createOptions struct {
|
|||||||
actionAppend bool
|
actionAppend bool
|
||||||
actionLeave bool
|
actionLeave bool
|
||||||
use bool
|
use bool
|
||||||
|
flags string
|
||||||
|
configFile string
|
||||||
driverOpts []string
|
driverOpts []string
|
||||||
buildkitdFlags string
|
|
||||||
buildkitdConfigFile string
|
|
||||||
bootstrap bool
|
bootstrap bool
|
||||||
// upgrade bool // perform upgrade of the driver
|
// upgrade bool // perform upgrade of the driver
|
||||||
}
|
}
|
||||||
|
|
||||||
func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, args []string) error {
|
func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
|
||||||
|
ctx := appcontext.Context()
|
||||||
|
|
||||||
|
if in.name == "default" {
|
||||||
|
return errors.Errorf("default is a reserved name and cannot be used to identify builder instance")
|
||||||
|
}
|
||||||
|
|
||||||
|
if in.actionLeave {
|
||||||
|
if in.name == "" {
|
||||||
|
return errors.Errorf("leave requires instance name")
|
||||||
|
}
|
||||||
|
if in.nodeName == "" {
|
||||||
|
return errors.Errorf("leave requires node name but --node not set")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if in.actionAppend {
|
||||||
|
if in.name == "" {
|
||||||
|
logrus.Warnf("append used without name, creating a new instance instead")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
driverName := in.driver
|
||||||
|
if driverName == "" {
|
||||||
|
f, err := driver.GetDefaultFactory(ctx, dockerCli.Client(), true)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if f == nil {
|
||||||
|
return errors.Errorf("no valid drivers found")
|
||||||
|
}
|
||||||
|
driverName = f.Name()
|
||||||
|
}
|
||||||
|
|
||||||
|
if driver.GetFactory(driverName, true) == nil {
|
||||||
|
return errors.Errorf("failed to find driver %q", in.driver)
|
||||||
|
}
|
||||||
|
|
||||||
txn, release, err := storeutil.GetStore(dockerCli)
|
txn, release, err := storeutil.GetStore(dockerCli)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// Ensure the file lock gets released no matter what happens.
|
|
||||||
defer release()
|
defer release()
|
||||||
|
|
||||||
if in.actionLeave {
|
name := in.name
|
||||||
return builder.Leave(ctx, txn, dockerCli, builder.LeaveOpts{
|
if name == "" {
|
||||||
Name: in.name,
|
name, err = store.GenerateName(txn)
|
||||||
NodeName: in.nodeName,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
var ep string
|
|
||||||
if len(args) > 0 {
|
|
||||||
ep = args[0]
|
|
||||||
}
|
|
||||||
|
|
||||||
b, err := builder.Create(ctx, txn, dockerCli, builder.CreateOpts{
|
|
||||||
Name: in.name,
|
|
||||||
Driver: in.driver,
|
|
||||||
NodeName: in.nodeName,
|
|
||||||
Platforms: in.platform,
|
|
||||||
DriverOpts: in.driverOpts,
|
|
||||||
BuildkitdFlags: in.buildkitdFlags,
|
|
||||||
BuildkitdConfigFile: in.buildkitdConfigFile,
|
|
||||||
Use: in.use,
|
|
||||||
Endpoint: ep,
|
|
||||||
Append: in.actionAppend,
|
|
||||||
})
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// The store is no longer used from this point.
|
ng, err := txn.NodeGroupByName(name)
|
||||||
// Release it so we aren't holding the file lock during the boot.
|
if err != nil {
|
||||||
release()
|
if os.IsNotExist(errors.Cause(err)) {
|
||||||
|
if in.actionAppend && in.name != "" {
|
||||||
if in.bootstrap {
|
logrus.Warnf("failed to find %q for append, creating a new instance instead", in.name)
|
||||||
if _, err = b.Boot(ctx); err != nil {
|
}
|
||||||
|
if in.actionLeave {
|
||||||
|
return errors.Errorf("failed to find instance %q for leave", name)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("%s\n", b.Name)
|
if ng != nil {
|
||||||
|
if in.nodeName == "" && !in.actionAppend {
|
||||||
|
return errors.Errorf("existing instance for %s but no append mode, specify --node to make changes for existing instances", name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ng == nil {
|
||||||
|
ng = &store.NodeGroup{
|
||||||
|
Name: name,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ng.Driver == "" || in.driver != "" {
|
||||||
|
ng.Driver = driverName
|
||||||
|
}
|
||||||
|
|
||||||
|
var flags []string
|
||||||
|
if in.flags != "" {
|
||||||
|
flags, err = shlex.Split(in.flags)
|
||||||
|
if err != nil {
|
||||||
|
return errors.Wrap(err, "failed to parse buildkit flags")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var ep string
|
||||||
|
if in.actionLeave {
|
||||||
|
if err := ng.Leave(in.nodeName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if len(args) > 0 {
|
||||||
|
ep, err = validateEndpoint(dockerCli, args[0])
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if dockerCli.CurrentContext() == "default" && dockerCli.DockerEndpoint().TLSData != nil {
|
||||||
|
return errors.Errorf("could not create a builder instance with TLS data loaded from environment. Please use `docker context create <context-name>` to create a context for current environment and then create a builder instance with `docker buildx create <context-name>`")
|
||||||
|
}
|
||||||
|
|
||||||
|
ep, err = storeutil.GetCurrentEndpoint(dockerCli)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if in.driver == "kubernetes" {
|
||||||
|
// naming endpoint to make --append works
|
||||||
|
ep = (&url.URL{
|
||||||
|
Scheme: in.driver,
|
||||||
|
Path: "/" + in.name,
|
||||||
|
RawQuery: (&url.Values{
|
||||||
|
"deployment": {in.nodeName},
|
||||||
|
"kubeconfig": {os.Getenv("KUBECONFIG")},
|
||||||
|
}).Encode(),
|
||||||
|
}).String()
|
||||||
|
}
|
||||||
|
|
||||||
|
m, err := csvToMap(in.driverOpts)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := ng.Update(in.nodeName, ep, in.platform, len(args) > 0, in.actionAppend, flags, in.configFile, m); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := txn.Save(ng); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if in.use && ep != "" {
|
||||||
|
current, err := storeutil.GetCurrentEndpoint(dockerCli)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := txn.SetCurrent(current, ng.Name, false, false); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ngi := &nginfo{ng: ng}
|
||||||
|
|
||||||
|
timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
if err = loadNodeGroupData(timeoutCtx, dockerCli, ngi); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if in.bootstrap {
|
||||||
|
if _, err = boot(ctx, ngi); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Printf("%s\n", ng.Name)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -84,7 +208,7 @@ func createCmd(dockerCli command.Cli) *cobra.Command {
|
|||||||
var options createOptions
|
var options createOptions
|
||||||
|
|
||||||
var drivers bytes.Buffer
|
var drivers bytes.Buffer
|
||||||
for _, d := range driver.GetFactories(true) {
|
for _, d := range driver.GetFactories() {
|
||||||
if len(drivers.String()) > 0 {
|
if len(drivers.String()) > 0 {
|
||||||
drivers.WriteString(", ")
|
drivers.WriteString(", ")
|
||||||
}
|
}
|
||||||
@@ -96,9 +220,8 @@ func createCmd(dockerCli command.Cli) *cobra.Command {
|
|||||||
Short: "Create a new builder instance",
|
Short: "Create a new builder instance",
|
||||||
Args: cli.RequiresMaxArgs(1),
|
Args: cli.RequiresMaxArgs(1),
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
return runCreate(cmd.Context(), dockerCli, options, args)
|
return runCreate(dockerCli, options, args)
|
||||||
},
|
},
|
||||||
ValidArgsFunction: completion.Disable,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
flags := cmd.Flags()
|
flags := cmd.Flags()
|
||||||
@@ -106,16 +229,12 @@ func createCmd(dockerCli command.Cli) *cobra.Command {
|
|||||||
flags.StringVar(&options.name, "name", "", "Builder instance name")
|
flags.StringVar(&options.name, "name", "", "Builder instance name")
|
||||||
flags.StringVar(&options.driver, "driver", "", fmt.Sprintf("Driver to use (available: %s)", drivers.String()))
|
flags.StringVar(&options.driver, "driver", "", fmt.Sprintf("Driver to use (available: %s)", drivers.String()))
|
||||||
flags.StringVar(&options.nodeName, "node", "", "Create/modify node with given name")
|
flags.StringVar(&options.nodeName, "node", "", "Create/modify node with given name")
|
||||||
|
flags.StringVar(&options.flags, "buildkitd-flags", "", "Flags for buildkitd daemon")
|
||||||
|
flags.StringVar(&options.configFile, "config", "", "BuildKit config file")
|
||||||
flags.StringArrayVar(&options.platform, "platform", []string{}, "Fixed platforms for current node")
|
flags.StringArrayVar(&options.platform, "platform", []string{}, "Fixed platforms for current node")
|
||||||
flags.StringArrayVar(&options.driverOpts, "driver-opt", []string{}, "Options for the driver")
|
flags.StringArrayVar(&options.driverOpts, "driver-opt", []string{}, "Options for the driver")
|
||||||
flags.StringVar(&options.buildkitdFlags, "buildkitd-flags", "", "BuildKit daemon flags")
|
|
||||||
|
|
||||||
// we allow for both "--config" and "--buildkitd-config", although the latter is the recommended way to avoid ambiguity.
|
|
||||||
flags.StringVar(&options.buildkitdConfigFile, "buildkitd-config", "", "BuildKit daemon config file")
|
|
||||||
flags.StringVar(&options.buildkitdConfigFile, "config", "", "BuildKit daemon config file")
|
|
||||||
flags.MarkHidden("config")
|
|
||||||
|
|
||||||
flags.BoolVar(&options.bootstrap, "bootstrap", false, "Boot builder after creation")
|
flags.BoolVar(&options.bootstrap, "bootstrap", false, "Boot builder after creation")
|
||||||
|
|
||||||
flags.BoolVar(&options.actionAppend, "append", false, "Append a node to builder instead of changing it")
|
flags.BoolVar(&options.actionAppend, "append", false, "Append a node to builder instead of changing it")
|
||||||
flags.BoolVar(&options.actionLeave, "leave", false, "Remove a node from builder instead of changing it")
|
flags.BoolVar(&options.actionLeave, "leave", false, "Remove a node from builder instead of changing it")
|
||||||
flags.BoolVar(&options.use, "use", false, "Set the current builder instance")
|
flags.BoolVar(&options.use, "use", false, "Set the current builder instance")
|
||||||
@@ -125,3 +244,22 @@ func createCmd(dockerCli command.Cli) *cobra.Command {
|
|||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func csvToMap(in []string) (map[string]string, error) {
|
||||||
|
m := make(map[string]string, len(in))
|
||||||
|
for _, s := range in {
|
||||||
|
csvReader := csv.NewReader(strings.NewReader(s))
|
||||||
|
fields, err := csvReader.Read()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for _, v := range fields {
|
||||||
|
p := strings.SplitN(v, "=", 2)
|
||||||
|
if len(p) != 2 {
|
||||||
|
return nil, errors.Errorf("invalid value %q, expecting k=v", v)
|
||||||
|
}
|
||||||
|
m[p[0]] = p[1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return m, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,92 +0,0 @@
|
|||||||
package debug
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"os"
|
|
||||||
"runtime"
|
|
||||||
|
|
||||||
"github.com/containerd/console"
|
|
||||||
"github.com/docker/buildx/controller"
|
|
||||||
"github.com/docker/buildx/controller/control"
|
|
||||||
controllerapi "github.com/docker/buildx/controller/pb"
|
|
||||||
"github.com/docker/buildx/monitor"
|
|
||||||
"github.com/docker/buildx/util/cobrautil"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/docker/cli/cli/command"
|
|
||||||
"github.com/moby/buildkit/util/progress/progressui"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
// DebugConfig is a user-specified configuration for the debugger.
|
|
||||||
type DebugConfig struct {
|
|
||||||
// InvokeFlag is a flag to configure the launched debugger and the commaned executed on the debugger.
|
|
||||||
InvokeFlag string
|
|
||||||
|
|
||||||
// OnFlag is a flag to configure the timing of launching the debugger.
|
|
||||||
OnFlag string
|
|
||||||
}
|
|
||||||
|
|
||||||
// DebuggableCmd is a command that supports debugger with recognizing the user-specified DebugConfig.
|
|
||||||
type DebuggableCmd interface {
|
|
||||||
// NewDebugger returns the new *cobra.Command with support for the debugger with recognizing DebugConfig.
|
|
||||||
NewDebugger(*DebugConfig) *cobra.Command
|
|
||||||
}
|
|
||||||
|
|
||||||
func RootCmd(dockerCli command.Cli, children ...DebuggableCmd) *cobra.Command {
|
|
||||||
var controlOptions control.ControlOptions
|
|
||||||
var progressMode string
|
|
||||||
var options DebugConfig
|
|
||||||
|
|
||||||
cmd := &cobra.Command{
|
|
||||||
Use: "debug",
|
|
||||||
Short: "Start debugger",
|
|
||||||
Args: cobra.NoArgs,
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
printer, err := progress.NewPrinter(context.TODO(), os.Stderr, progressui.DisplayMode(progressMode))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := context.TODO()
|
|
||||||
c, err := controller.NewController(ctx, controlOptions, dockerCli, printer)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
if err := c.Close(); err != nil {
|
|
||||||
logrus.Warnf("failed to close server connection %v", err)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
con := console.Current()
|
|
||||||
if err := con.SetRaw(); err != nil {
|
|
||||||
return errors.Errorf("failed to configure terminal: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err = monitor.RunMonitor(ctx, "", nil, controllerapi.InvokeConfig{
|
|
||||||
Tty: true,
|
|
||||||
}, c, dockerCli.In(), os.Stdout, os.Stderr, printer)
|
|
||||||
con.Reset()
|
|
||||||
return err
|
|
||||||
},
|
|
||||||
}
|
|
||||||
cobrautil.MarkCommandExperimental(cmd)
|
|
||||||
|
|
||||||
flags := cmd.Flags()
|
|
||||||
flags.StringVar(&options.InvokeFlag, "invoke", "", "Launch a monitor with executing specified command")
|
|
||||||
flags.StringVar(&options.OnFlag, "on", "error", "When to launch the monitor ([always, error])")
|
|
||||||
|
|
||||||
flags.StringVar(&controlOptions.Root, "root", "", "Specify root directory of server to connect for the monitor")
|
|
||||||
flags.BoolVar(&controlOptions.Detach, "detach", runtime.GOOS == "linux", "Detach buildx server for the monitor (supported only on linux)")
|
|
||||||
flags.StringVar(&controlOptions.ServerConfig, "server-config", "", "Specify buildx server config file for the monitor (used only when launching new server)")
|
|
||||||
flags.StringVar(&progressMode, "progress", "auto", `Set type of progress output ("auto", "plain", "tty") for the monitor. Use plain to show container output`)
|
|
||||||
|
|
||||||
cobrautil.MarkFlagsExperimental(flags, "invoke", "on", "root", "detach", "server-config")
|
|
||||||
|
|
||||||
for _, c := range children {
|
|
||||||
cmd.AddCommand(c.NewDebugger(&options))
|
|
||||||
}
|
|
||||||
|
|
||||||
return cmd
|
|
||||||
}
|
|
||||||
@@ -1,132 +0,0 @@
|
|||||||
package commands
|
|
||||||
|
|
||||||
import (
|
|
||||||
"io"
|
|
||||||
"net"
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/platforms"
|
|
||||||
"github.com/docker/buildx/build"
|
|
||||||
"github.com/docker/buildx/builder"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/docker/cli/cli/command"
|
|
||||||
"github.com/moby/buildkit/util/appcontext"
|
|
||||||
"github.com/moby/buildkit/util/progress/progressui"
|
|
||||||
v1 "github.com/opencontainers/image-spec/specs-go/v1"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
"golang.org/x/sync/errgroup"
|
|
||||||
)
|
|
||||||
|
|
||||||
type stdioOptions struct {
|
|
||||||
builder string
|
|
||||||
platform string
|
|
||||||
progress string
|
|
||||||
}
|
|
||||||
|
|
||||||
func runDialStdio(dockerCli command.Cli, opts stdioOptions) error {
|
|
||||||
ctx := appcontext.Context()
|
|
||||||
|
|
||||||
contextPathHash, _ := os.Getwd()
|
|
||||||
b, err := builder.New(dockerCli,
|
|
||||||
builder.WithName(opts.builder),
|
|
||||||
builder.WithContextPathHash(contextPathHash),
|
|
||||||
)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err = updateLastActivity(dockerCli, b.NodeGroup); err != nil {
|
|
||||||
return errors.Wrapf(err, "failed to update builder last activity time")
|
|
||||||
}
|
|
||||||
nodes, err := b.LoadNodes(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
printer, err := progress.NewPrinter(ctx, os.Stderr, progressui.DisplayMode(opts.progress), progress.WithPhase("dial-stdio"), progress.WithDesc("builder: "+b.Name, "builder:"+b.Name))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
var p *v1.Platform
|
|
||||||
if opts.platform != "" {
|
|
||||||
pp, err := platforms.Parse(opts.platform)
|
|
||||||
if err != nil {
|
|
||||||
return errors.Wrapf(err, "invalid platform %q", opts.platform)
|
|
||||||
}
|
|
||||||
p = &pp
|
|
||||||
}
|
|
||||||
|
|
||||||
defer printer.Wait()
|
|
||||||
|
|
||||||
return progress.Wrap("Proxying to builder", printer.Write, func(sub progress.SubLogger) error {
|
|
||||||
var conn net.Conn
|
|
||||||
|
|
||||||
err := sub.Wrap("Dialing builder", func() error {
|
|
||||||
conn, err = build.Dial(ctx, nodes, printer, p)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
defer conn.Close()
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
<-ctx.Done()
|
|
||||||
closeWrite(conn)
|
|
||||||
}()
|
|
||||||
|
|
||||||
var eg errgroup.Group
|
|
||||||
|
|
||||||
eg.Go(func() error {
|
|
||||||
_, err := io.Copy(conn, os.Stdin)
|
|
||||||
closeWrite(conn)
|
|
||||||
return err
|
|
||||||
})
|
|
||||||
eg.Go(func() error {
|
|
||||||
_, err := io.Copy(os.Stdout, conn)
|
|
||||||
closeRead(conn)
|
|
||||||
return err
|
|
||||||
})
|
|
||||||
return eg.Wait()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func closeRead(conn net.Conn) error {
|
|
||||||
if c, ok := conn.(interface{ CloseRead() error }); ok {
|
|
||||||
return c.CloseRead()
|
|
||||||
}
|
|
||||||
return conn.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
func closeWrite(conn net.Conn) error {
|
|
||||||
if c, ok := conn.(interface{ CloseWrite() error }); ok {
|
|
||||||
return c.CloseWrite()
|
|
||||||
}
|
|
||||||
return conn.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
func dialStdioCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
|
||||||
opts := stdioOptions{}
|
|
||||||
|
|
||||||
cmd := &cobra.Command{
|
|
||||||
Use: "dial-stdio",
|
|
||||||
Short: "Proxy current stdio streams to builder instance",
|
|
||||||
Args: cobra.NoArgs,
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
opts.builder = rootOpts.builder
|
|
||||||
return runDialStdio(dockerCli, opts)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
flags := cmd.Flags()
|
|
||||||
cmd.Flags()
|
|
||||||
flags.StringVar(&opts.platform, "platform", os.Getenv("DOCKER_DEFAULT_PLATFORM"), "Target platform: this is used for node selection")
|
|
||||||
flags.StringVar(&opts.progress, "progress", "quiet", "Set type of progress output (auto, plain, tty).")
|
|
||||||
return cmd
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
package commands
|
package commands
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
@@ -9,13 +8,13 @@ import (
|
|||||||
"text/tabwriter"
|
"text/tabwriter"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/buildx/builder"
|
"github.com/docker/buildx/build"
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/opts"
|
"github.com/docker/cli/opts"
|
||||||
"github.com/docker/go-units"
|
"github.com/docker/go-units"
|
||||||
"github.com/moby/buildkit/client"
|
"github.com/moby/buildkit/client"
|
||||||
|
"github.com/moby/buildkit/util/appcontext"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
||||||
)
|
)
|
||||||
@@ -26,35 +25,33 @@ type duOptions struct {
|
|||||||
verbose bool
|
verbose bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func runDiskUsage(ctx context.Context, dockerCli command.Cli, opts duOptions) error {
|
func runDiskUsage(dockerCli command.Cli, opts duOptions) error {
|
||||||
|
ctx := appcontext.Context()
|
||||||
|
|
||||||
pi, err := toBuildkitPruneInfo(opts.filter.Value())
|
pi, err := toBuildkitPruneInfo(opts.filter.Value())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
b, err := builder.New(dockerCli, builder.WithName(opts.builder))
|
dis, err := getInstanceOrDefault(ctx, dockerCli, opts.builder, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
nodes, err := b.LoadNodes(ctx)
|
for _, di := range dis {
|
||||||
if err != nil {
|
if di.Err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
for _, node := range nodes {
|
|
||||||
if node.Err != nil {
|
|
||||||
return node.Err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
out := make([][]*client.UsageInfo, len(nodes))
|
out := make([][]*client.UsageInfo, len(dis))
|
||||||
|
|
||||||
eg, ctx := errgroup.WithContext(ctx)
|
eg, ctx := errgroup.WithContext(ctx)
|
||||||
for i, node := range nodes {
|
for i, di := range dis {
|
||||||
func(i int, node builder.Node) {
|
func(i int, di build.DriverInfo) {
|
||||||
eg.Go(func() error {
|
eg.Go(func() error {
|
||||||
if node.Driver != nil {
|
if di.Driver != nil {
|
||||||
c, err := node.Driver.Client(ctx)
|
c, err := di.Driver.Client(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -67,7 +64,7 @@ func runDiskUsage(ctx context.Context, dockerCli command.Cli, opts duOptions) er
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
}(i, node)
|
}(i, di)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := eg.Wait(); err != nil {
|
if err := eg.Wait(); err != nil {
|
||||||
@@ -112,9 +109,8 @@ func duCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
|||||||
Args: cli.NoArgs,
|
Args: cli.NoArgs,
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
options.builder = rootOpts.builder
|
options.builder = rootOpts.builder
|
||||||
return runDiskUsage(cmd.Context(), dockerCli, options)
|
return runDiskUsage(dockerCli, options)
|
||||||
},
|
},
|
||||||
ValidArgsFunction: completion.Disable,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
flags := cmd.Flags()
|
flags := cmd.Flags()
|
||||||
|
|||||||
@@ -1,19 +1,17 @@
|
|||||||
package commands
|
package commands
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"io/ioutil"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/distribution/reference"
|
"github.com/docker/buildx/store"
|
||||||
"github.com/docker/buildx/builder"
|
"github.com/docker/buildx/store/storeutil"
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/buildx/util/imagetools"
|
"github.com/docker/buildx/util/imagetools"
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/moby/buildkit/util/progress/progressui"
|
"github.com/docker/distribution/reference"
|
||||||
|
"github.com/moby/buildkit/util/appcontext"
|
||||||
"github.com/opencontainers/go-digest"
|
"github.com/opencontainers/go-digest"
|
||||||
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
|
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
@@ -25,13 +23,11 @@ type createOptions struct {
|
|||||||
builder string
|
builder string
|
||||||
files []string
|
files []string
|
||||||
tags []string
|
tags []string
|
||||||
annotations []string
|
|
||||||
dryrun bool
|
dryrun bool
|
||||||
actionAppend bool
|
actionAppend bool
|
||||||
progress string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, args []string) error {
|
func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
|
||||||
if len(args) == 0 && len(in.files) == 0 {
|
if len(args) == 0 && len(in.files) == 0 {
|
||||||
return errors.Errorf("no sources specified")
|
return errors.Errorf("no sources specified")
|
||||||
}
|
}
|
||||||
@@ -42,7 +38,7 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
|
|||||||
|
|
||||||
fileArgs := make([]string, len(in.files))
|
fileArgs := make([]string, len(in.files))
|
||||||
for i, f := range in.files {
|
for i, f := range in.files {
|
||||||
dt, err := os.ReadFile(f)
|
dt, err := ioutil.ReadFile(f)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -82,41 +78,53 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
|
|||||||
if len(repos) == 0 {
|
if len(repos) == 0 {
|
||||||
return errors.Errorf("no repositories specified, please set a reference in tag or source")
|
return errors.Errorf("no repositories specified, please set a reference in tag or source")
|
||||||
}
|
}
|
||||||
|
if len(repos) > 1 {
|
||||||
var defaultRepo *string
|
return errors.Errorf("multiple repositories currently not supported, found %v", repos)
|
||||||
if len(repos) == 1 {
|
|
||||||
for repo := range repos {
|
|
||||||
defaultRepo = &repo
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var repo string
|
||||||
|
for r := range repos {
|
||||||
|
repo = r
|
||||||
}
|
}
|
||||||
|
|
||||||
for i, s := range srcs {
|
for i, s := range srcs {
|
||||||
if s.Ref == nil {
|
if s.Ref == nil && s.Desc.MediaType == "" && s.Desc.Digest != "" {
|
||||||
if defaultRepo == nil {
|
n, err := reference.ParseNormalizedNamed(repo)
|
||||||
return errors.Errorf("multiple repositories specified, cannot infer repository for %q", args[i])
|
|
||||||
}
|
|
||||||
n, err := reference.ParseNormalizedNamed(*defaultRepo)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if s.Desc.MediaType == "" && s.Desc.Digest != "" {
|
|
||||||
r, err := reference.WithDigest(n, s.Desc.Digest)
|
r, err := reference.WithDigest(n, s.Desc.Digest)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
srcs[i].Ref = r
|
srcs[i].Ref = r
|
||||||
sourceRefs = true
|
sourceRefs = true
|
||||||
} else {
|
|
||||||
srcs[i].Ref = reference.TagNameOnly(n)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
b, err := builder.New(dockerCli, builder.WithName(in.builder))
|
ctx := appcontext.Context()
|
||||||
|
|
||||||
|
txn, release, err := storeutil.GetStore(dockerCli)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
imageopt, err := b.ImageOpt()
|
defer release()
|
||||||
|
|
||||||
|
var ng *store.NodeGroup
|
||||||
|
|
||||||
|
if in.builder != "" {
|
||||||
|
ng, err = storeutil.GetNodeGroup(txn, dockerCli, in.builder)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ng, err = storeutil.GetCurrentInstance(txn, dockerCli)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
imageopt, err := storeutil.GetImageConfig(dockerCli, ng)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -135,6 +143,7 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
srcs[i].Ref = nil
|
||||||
if srcs[i].Desc.Digest == "" {
|
if srcs[i].Desc.Digest == "" {
|
||||||
srcs[i].Desc = desc
|
srcs[i].Desc = desc
|
||||||
} else {
|
} else {
|
||||||
@@ -153,7 +162,12 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dt, desc, err := r.Combine(ctx, srcs, in.annotations)
|
descs := make([]ocispec.Descriptor, len(srcs))
|
||||||
|
for i := range descs {
|
||||||
|
descs[i] = srcs[i].Desc
|
||||||
|
}
|
||||||
|
|
||||||
|
dt, desc, err := r.Combine(ctx, repo, descs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -166,52 +180,23 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
|
|||||||
// new resolver cause need new auth
|
// new resolver cause need new auth
|
||||||
r = imagetools.New(imageopt)
|
r = imagetools.New(imageopt)
|
||||||
|
|
||||||
ctx2, cancel := context.WithCancel(context.TODO())
|
|
||||||
defer cancel()
|
|
||||||
printer, err := progress.NewPrinter(ctx2, os.Stderr, progressui.DisplayMode(in.progress))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
eg, _ := errgroup.WithContext(ctx)
|
|
||||||
pw := progress.WithPrefix(printer, "internal", true)
|
|
||||||
|
|
||||||
for _, t := range tags {
|
for _, t := range tags {
|
||||||
t := t
|
if err := r.Push(ctx, t, desc, dt); err != nil {
|
||||||
eg.Go(func() error {
|
|
||||||
return progress.Wrap(fmt.Sprintf("pushing %s", t.String()), pw.Write, func(sub progress.SubLogger) error {
|
|
||||||
eg2, _ := errgroup.WithContext(ctx)
|
|
||||||
for _, s := range srcs {
|
|
||||||
if reference.Domain(s.Ref) == reference.Domain(t) && reference.Path(s.Ref) == reference.Path(t) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
s := s
|
|
||||||
eg2.Go(func() error {
|
|
||||||
sub.Log(1, []byte(fmt.Sprintf("copying %s from %s to %s\n", s.Desc.Digest.String(), s.Ref.String(), t.String())))
|
|
||||||
return r.Copy(ctx, s, t)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := eg2.Wait(); err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
sub.Log(1, []byte(fmt.Sprintf("pushing %s to %s\n", desc.Digest.String(), t.String())))
|
fmt.Println(t.String())
|
||||||
return r.Push(ctx, t, desc, dt)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
err = eg.Wait()
|
return nil
|
||||||
err1 := printer.Wait()
|
|
||||||
if err == nil {
|
|
||||||
err = err1
|
|
||||||
}
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseSources(in []string) ([]*imagetools.Source, error) {
|
type src struct {
|
||||||
out := make([]*imagetools.Source, len(in))
|
Desc ocispec.Descriptor
|
||||||
|
Ref reference.Named
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseSources(in []string) ([]*src, error) {
|
||||||
|
out := make([]*src, len(in))
|
||||||
for i, in := range in {
|
for i, in := range in {
|
||||||
s, err := parseSource(in)
|
s, err := parseSource(in)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -234,11 +219,11 @@ func parseRefs(in []string) ([]reference.Named, error) {
|
|||||||
return refs, nil
|
return refs, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseSource(in string) (*imagetools.Source, error) {
|
func parseSource(in string) (*src, error) {
|
||||||
// source can be a digest, reference or a descriptor JSON
|
// source can be a digest, reference or a descriptor JSON
|
||||||
dgst, err := digest.Parse(in)
|
dgst, err := digest.Parse(in)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return &imagetools.Source{
|
return &src{
|
||||||
Desc: ocispec.Descriptor{
|
Desc: ocispec.Descriptor{
|
||||||
Digest: dgst,
|
Digest: dgst,
|
||||||
},
|
},
|
||||||
@@ -249,14 +234,14 @@ func parseSource(in string) (*imagetools.Source, error) {
|
|||||||
|
|
||||||
ref, err := reference.ParseNormalizedNamed(in)
|
ref, err := reference.ParseNormalizedNamed(in)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return &imagetools.Source{
|
return &src{
|
||||||
Ref: ref,
|
Ref: ref,
|
||||||
}, nil
|
}, nil
|
||||||
} else if !strings.HasPrefix(in, "{") {
|
} else if !strings.HasPrefix(in, "{") {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
var s imagetools.Source
|
var s src
|
||||||
if err := json.Unmarshal([]byte(in), &s.Desc); err != nil {
|
if err := json.Unmarshal([]byte(in), &s.Desc); err != nil {
|
||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
}
|
}
|
||||||
@@ -270,10 +255,9 @@ func createCmd(dockerCli command.Cli, opts RootOptions) *cobra.Command {
|
|||||||
Use: "create [OPTIONS] [SOURCE] [SOURCE...]",
|
Use: "create [OPTIONS] [SOURCE] [SOURCE...]",
|
||||||
Short: "Create a new image based on source images",
|
Short: "Create a new image based on source images",
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
options.builder = *opts.Builder
|
options.builder = opts.Builder
|
||||||
return runCreate(cmd.Context(), dockerCli, options, args)
|
return runCreate(dockerCli, options, args)
|
||||||
},
|
},
|
||||||
ValidArgsFunction: completion.Disable,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
flags := cmd.Flags()
|
flags := cmd.Flags()
|
||||||
@@ -281,8 +265,6 @@ func createCmd(dockerCli command.Cli, opts RootOptions) *cobra.Command {
|
|||||||
flags.StringArrayVarP(&options.tags, "tag", "t", []string{}, "Set reference for new image")
|
flags.StringArrayVarP(&options.tags, "tag", "t", []string{}, "Set reference for new image")
|
||||||
flags.BoolVar(&options.dryrun, "dry-run", false, "Show final image instead of pushing")
|
flags.BoolVar(&options.dryrun, "dry-run", false, "Show final image instead of pushing")
|
||||||
flags.BoolVar(&options.actionAppend, "append", false, "Append to existing manifest")
|
flags.BoolVar(&options.actionAppend, "append", false, "Append to existing manifest")
|
||||||
flags.StringVar(&options.progress, "progress", "auto", `Set type of progress output ("auto", "plain", "tty"). Use plain to show container output`)
|
|
||||||
flags.StringArrayVarP(&options.annotations, "annotation", "", []string{}, "Add annotation to the image")
|
|
||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,13 @@
|
|||||||
package commands
|
package commands
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"github.com/docker/buildx/store"
|
||||||
|
"github.com/docker/buildx/store/storeutil"
|
||||||
"github.com/docker/buildx/builder"
|
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/buildx/util/imagetools"
|
"github.com/docker/buildx/util/imagetools"
|
||||||
"github.com/docker/cli-docs-tool/annotation"
|
"github.com/docker/cli-docs-tool/annotation"
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
|
"github.com/moby/buildkit/util/appcontext"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
@@ -19,16 +18,34 @@ type inspectOptions struct {
|
|||||||
raw bool
|
raw bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func runInspect(ctx context.Context, dockerCli command.Cli, in inspectOptions, name string) error {
|
func runInspect(dockerCli command.Cli, in inspectOptions, name string) error {
|
||||||
|
ctx := appcontext.Context()
|
||||||
|
|
||||||
if in.format != "" && in.raw {
|
if in.format != "" && in.raw {
|
||||||
return errors.Errorf("format and raw cannot be used together")
|
return errors.Errorf("format and raw cannot be used together")
|
||||||
}
|
}
|
||||||
|
|
||||||
b, err := builder.New(dockerCli, builder.WithName(in.builder))
|
txn, release, err := storeutil.GetStore(dockerCli)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
imageopt, err := b.ImageOpt()
|
defer release()
|
||||||
|
|
||||||
|
var ng *store.NodeGroup
|
||||||
|
|
||||||
|
if in.builder != "" {
|
||||||
|
ng, err = storeutil.GetNodeGroup(txn, dockerCli, in.builder)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ng, err = storeutil.GetCurrentInstance(txn, dockerCli)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
imageopt, err := storeutil.GetImageConfig(dockerCli, ng)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -49,10 +66,9 @@ func inspectCmd(dockerCli command.Cli, rootOpts RootOptions) *cobra.Command {
|
|||||||
Short: "Show details of an image in the registry",
|
Short: "Show details of an image in the registry",
|
||||||
Args: cli.ExactArgs(1),
|
Args: cli.ExactArgs(1),
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
options.builder = *rootOpts.Builder
|
options.builder = rootOpts.Builder
|
||||||
return runInspect(cmd.Context(), dockerCli, options, args[0])
|
return runInspect(dockerCli, options, args[0])
|
||||||
},
|
},
|
||||||
ValidArgsFunction: completion.Disable,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
flags := cmd.Flags()
|
flags := cmd.Flags()
|
||||||
|
|||||||
@@ -1,20 +1,18 @@
|
|||||||
package commands
|
package commands
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
type RootOptions struct {
|
type RootOptions struct {
|
||||||
Builder *string
|
Builder string
|
||||||
}
|
}
|
||||||
|
|
||||||
func RootCmd(dockerCli command.Cli, opts RootOptions) *cobra.Command {
|
func RootCmd(dockerCli command.Cli, opts RootOptions) *cobra.Command {
|
||||||
cmd := &cobra.Command{
|
cmd := &cobra.Command{
|
||||||
Use: "imagetools",
|
Use: "imagetools",
|
||||||
Short: "Commands to work on images in registry",
|
Short: "Commands to work on images in registry",
|
||||||
ValidArgsFunction: completion.Disable,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd.AddCommand(
|
cmd.AddCommand(
|
||||||
|
|||||||
@@ -4,19 +4,16 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"sort"
|
|
||||||
"strings"
|
"strings"
|
||||||
"text/tabwriter"
|
"text/tabwriter"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/buildx/builder"
|
"github.com/docker/buildx/store"
|
||||||
"github.com/docker/buildx/driver"
|
"github.com/docker/buildx/store/storeutil"
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/buildx/util/platformutil"
|
"github.com/docker/buildx/util/platformutil"
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/cli/debug"
|
"github.com/moby/buildkit/util/appcontext"
|
||||||
"github.com/docker/go-units"
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -25,107 +22,90 @@ type inspectOptions struct {
|
|||||||
builder string
|
builder string
|
||||||
}
|
}
|
||||||
|
|
||||||
func runInspect(ctx context.Context, dockerCli command.Cli, in inspectOptions) error {
|
func runInspect(dockerCli command.Cli, in inspectOptions) error {
|
||||||
b, err := builder.New(dockerCli,
|
ctx := appcontext.Context()
|
||||||
builder.WithName(in.builder),
|
|
||||||
builder.WithSkippedValidation(),
|
txn, release, err := storeutil.GetStore(dockerCli)
|
||||||
)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
defer release()
|
||||||
|
|
||||||
|
var ng *store.NodeGroup
|
||||||
|
|
||||||
|
if in.builder != "" {
|
||||||
|
ng, err = storeutil.GetNodeGroup(txn, dockerCli, in.builder)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ng, err = storeutil.GetCurrentInstance(txn, dockerCli)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ng == nil {
|
||||||
|
ng = &store.NodeGroup{
|
||||||
|
Name: "default",
|
||||||
|
Nodes: []store.Node{{
|
||||||
|
Name: "default",
|
||||||
|
Endpoint: "default",
|
||||||
|
}},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ngi := &nginfo{ng: ng}
|
||||||
|
|
||||||
timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
|
timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
nodes, err := b.LoadNodes(timeoutCtx, builder.WithData())
|
err = loadNodeGroupData(timeoutCtx, dockerCli, ngi)
|
||||||
|
|
||||||
|
var bootNgi *nginfo
|
||||||
if in.bootstrap {
|
if in.bootstrap {
|
||||||
var ok bool
|
var ok bool
|
||||||
ok, err = b.Boot(ctx)
|
ok, err = boot(ctx, ngi)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
bootNgi = ngi
|
||||||
if ok {
|
if ok {
|
||||||
nodes, err = b.LoadNodes(timeoutCtx, builder.WithData())
|
ngi = &nginfo{ng: ng}
|
||||||
|
err = loadNodeGroupData(ctx, dockerCli, ngi)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0)
|
w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0)
|
||||||
fmt.Fprintf(w, "Name:\t%s\n", b.Name)
|
fmt.Fprintf(w, "Name:\t%s\n", ngi.ng.Name)
|
||||||
fmt.Fprintf(w, "Driver:\t%s\n", b.Driver)
|
fmt.Fprintf(w, "Driver:\t%s\n", ngi.ng.Driver)
|
||||||
if !b.NodeGroup.LastActivity.IsZero() {
|
|
||||||
fmt.Fprintf(w, "Last Activity:\t%v\n", b.NodeGroup.LastActivity)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(w, "Error:\t%s\n", err.Error())
|
fmt.Fprintf(w, "Error:\t%s\n", err.Error())
|
||||||
} else if b.Err() != nil {
|
} else if ngi.err != nil {
|
||||||
fmt.Fprintf(w, "Error:\t%s\n", b.Err().Error())
|
fmt.Fprintf(w, "Error:\t%s\n", ngi.err.Error())
|
||||||
}
|
}
|
||||||
if err == nil {
|
if err == nil {
|
||||||
fmt.Fprintln(w, "")
|
fmt.Fprintln(w, "")
|
||||||
fmt.Fprintln(w, "Nodes:")
|
fmt.Fprintln(w, "Nodes:")
|
||||||
|
|
||||||
for i, n := range nodes {
|
for i, n := range ngi.ng.Nodes {
|
||||||
if i != 0 {
|
if i != 0 {
|
||||||
fmt.Fprintln(w, "")
|
fmt.Fprintln(w, "")
|
||||||
}
|
}
|
||||||
fmt.Fprintf(w, "Name:\t%s\n", n.Name)
|
fmt.Fprintf(w, "Name:\t%s\n", n.Name)
|
||||||
fmt.Fprintf(w, "Endpoint:\t%s\n", n.Endpoint)
|
fmt.Fprintf(w, "Endpoint:\t%s\n", n.Endpoint)
|
||||||
|
if err := ngi.drivers[i].di.Err; err != nil {
|
||||||
var driverOpts []string
|
|
||||||
for k, v := range n.DriverOpts {
|
|
||||||
driverOpts = append(driverOpts, fmt.Sprintf("%s=%q", k, v))
|
|
||||||
}
|
|
||||||
if len(driverOpts) > 0 {
|
|
||||||
fmt.Fprintf(w, "Driver Options:\t%s\n", strings.Join(driverOpts, " "))
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := n.Err; err != nil {
|
|
||||||
fmt.Fprintf(w, "Error:\t%s\n", err.Error())
|
fmt.Fprintf(w, "Error:\t%s\n", err.Error())
|
||||||
|
} else if err := ngi.drivers[i].err; err != nil {
|
||||||
|
fmt.Fprintf(w, "Error:\t%s\n", err.Error())
|
||||||
|
} else if bootNgi != nil && len(bootNgi.drivers) > i && bootNgi.drivers[i].err != nil {
|
||||||
|
fmt.Fprintf(w, "Error:\t%s\n", bootNgi.drivers[i].err.Error())
|
||||||
} else {
|
} else {
|
||||||
fmt.Fprintf(w, "Status:\t%s\n", nodes[i].DriverInfo.Status)
|
fmt.Fprintf(w, "Status:\t%s\n", ngi.drivers[i].info.Status)
|
||||||
if len(n.BuildkitdFlags) > 0 {
|
if len(n.Flags) > 0 {
|
||||||
fmt.Fprintf(w, "BuildKit daemon flags:\t%s\n", strings.Join(n.BuildkitdFlags, " "))
|
fmt.Fprintf(w, "Flags:\t%s\n", strings.Join(n.Flags, " "))
|
||||||
}
|
|
||||||
if nodes[i].Version != "" {
|
|
||||||
fmt.Fprintf(w, "BuildKit version:\t%s\n", nodes[i].Version)
|
|
||||||
}
|
|
||||||
platforms := platformutil.FormatInGroups(n.Node.Platforms, n.Platforms)
|
|
||||||
if len(platforms) > 0 {
|
|
||||||
fmt.Fprintf(w, "Platforms:\t%s\n", strings.Join(platforms, ", "))
|
|
||||||
}
|
|
||||||
if debug.IsEnabled() {
|
|
||||||
fmt.Fprintf(w, "Features:\n")
|
|
||||||
features := nodes[i].Driver.Features(ctx)
|
|
||||||
featKeys := make([]string, 0, len(features))
|
|
||||||
for k := range features {
|
|
||||||
featKeys = append(featKeys, string(k))
|
|
||||||
}
|
|
||||||
sort.Strings(featKeys)
|
|
||||||
for _, k := range featKeys {
|
|
||||||
fmt.Fprintf(w, "\t%s:\t%t\n", k, features[driver.Feature(k)])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if len(nodes[i].Labels) > 0 {
|
|
||||||
fmt.Fprintf(w, "Labels:\n")
|
|
||||||
for _, k := range sortedKeys(nodes[i].Labels) {
|
|
||||||
v := nodes[i].Labels[k]
|
|
||||||
fmt.Fprintf(w, "\t%s:\t%s\n", k, v)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for ri, rule := range nodes[i].GCPolicy {
|
|
||||||
fmt.Fprintf(w, "GC Policy rule#%d:\n", ri)
|
|
||||||
fmt.Fprintf(w, "\tAll:\t%v\n", rule.All)
|
|
||||||
if len(rule.Filter) > 0 {
|
|
||||||
fmt.Fprintf(w, "\tFilters:\t%s\n", strings.Join(rule.Filter, " "))
|
|
||||||
}
|
|
||||||
if rule.KeepDuration > 0 {
|
|
||||||
fmt.Fprintf(w, "\tKeep Duration:\t%v\n", rule.KeepDuration.String())
|
|
||||||
}
|
|
||||||
if rule.KeepBytes > 0 {
|
|
||||||
fmt.Fprintf(w, "\tKeep Bytes:\t%s\n", units.BytesSize(float64(rule.KeepBytes)))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
fmt.Fprintf(w, "Platforms:\t%s\n", strings.Join(platformutil.FormatInGroups(n.Platforms, ngi.drivers[i].platforms), ", "))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -147,9 +127,8 @@ func inspectCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
|||||||
if len(args) > 0 {
|
if len(args) > 0 {
|
||||||
options.builder = args[0]
|
options.builder = args[0]
|
||||||
}
|
}
|
||||||
return runInspect(cmd.Context(), dockerCli, options)
|
return runInspect(dockerCli, options)
|
||||||
},
|
},
|
||||||
ValidArgsFunction: completion.BuilderNames(dockerCli),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
flags := cmd.Flags()
|
flags := cmd.Flags()
|
||||||
@@ -157,14 +136,3 @@ func inspectCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
|||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
func sortedKeys(m map[string]string) []string {
|
|
||||||
s := make([]string, len(m))
|
|
||||||
i := 0
|
|
||||||
for k := range m {
|
|
||||||
s[i] = k
|
|
||||||
i++
|
|
||||||
}
|
|
||||||
sort.Strings(s)
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/docker/buildx/util/cobrautil"
|
"github.com/docker/buildx/util/cobrautil"
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/cli/config"
|
"github.com/docker/cli/cli/config"
|
||||||
@@ -48,7 +47,6 @@ func installCmd(dockerCli command.Cli) *cobra.Command {
|
|||||||
return runInstall(dockerCli, options)
|
return runInstall(dockerCli, options)
|
||||||
},
|
},
|
||||||
Hidden: true,
|
Hidden: true,
|
||||||
ValidArgsFunction: completion.Disable,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// hide builder persistent flag for this command
|
// hide builder persistent flag for this command
|
||||||
|
|||||||
302
commands/ls.go
302
commands/ls.go
@@ -2,67 +2,75 @@ package commands
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"sort"
|
"io"
|
||||||
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
"text/tabwriter"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/buildx/builder"
|
|
||||||
"github.com/docker/buildx/store"
|
"github.com/docker/buildx/store"
|
||||||
"github.com/docker/buildx/store/storeutil"
|
"github.com/docker/buildx/store/storeutil"
|
||||||
"github.com/docker/buildx/util/cobrautil"
|
"github.com/docker/buildx/util/cobrautil"
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/buildx/util/platformutil"
|
"github.com/docker/buildx/util/platformutil"
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/cli/command/formatter"
|
"github.com/moby/buildkit/util/appcontext"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
|
||||||
lsNameNodeHeader = "NAME/NODE"
|
|
||||||
lsDriverEndpointHeader = "DRIVER/ENDPOINT"
|
|
||||||
lsStatusHeader = "STATUS"
|
|
||||||
lsLastActivityHeader = "LAST ACTIVITY"
|
|
||||||
lsBuildkitHeader = "BUILDKIT"
|
|
||||||
lsPlatformsHeader = "PLATFORMS"
|
|
||||||
|
|
||||||
lsIndent = ` \_ `
|
|
||||||
|
|
||||||
lsDefaultTableFormat = "table {{.Name}}\t{{.DriverEndpoint}}\t{{.Status}}\t{{.Buildkit}}\t{{.Platforms}}"
|
|
||||||
)
|
|
||||||
|
|
||||||
type lsOptions struct {
|
type lsOptions struct {
|
||||||
format string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func runLs(ctx context.Context, dockerCli command.Cli, in lsOptions) error {
|
func runLs(dockerCli command.Cli, in lsOptions) error {
|
||||||
|
ctx := appcontext.Context()
|
||||||
|
|
||||||
txn, release, err := storeutil.GetStore(dockerCli)
|
txn, release, err := storeutil.GetStore(dockerCli)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer release()
|
defer release()
|
||||||
|
|
||||||
current, err := storeutil.GetCurrentInstance(txn, dockerCli)
|
ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
builders, err := builder.GetBuilders(dockerCli, txn)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
|
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
eg, _ := errgroup.WithContext(timeoutCtx)
|
ll, err := txn.List()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
builders := make([]*nginfo, len(ll))
|
||||||
|
for i, ng := range ll {
|
||||||
|
builders[i] = &nginfo{ng: ng}
|
||||||
|
}
|
||||||
|
|
||||||
|
list, err := dockerCli.ContextStore().List()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
ctxbuilders := make([]*nginfo, len(list))
|
||||||
|
for i, l := range list {
|
||||||
|
ctxbuilders[i] = &nginfo{ng: &store.NodeGroup{
|
||||||
|
Name: l.Name,
|
||||||
|
Nodes: []store.Node{{
|
||||||
|
Name: l.Name,
|
||||||
|
Endpoint: l.Name,
|
||||||
|
}},
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
|
||||||
|
builders = append(builders, ctxbuilders...)
|
||||||
|
|
||||||
|
eg, _ := errgroup.WithContext(ctx)
|
||||||
|
|
||||||
for _, b := range builders {
|
for _, b := range builders {
|
||||||
func(b *builder.Builder) {
|
func(b *nginfo) {
|
||||||
eg.Go(func() error {
|
eg.Go(func() error {
|
||||||
_, _ = b.LoadNodes(timeoutCtx, builder.WithData())
|
err = loadNodeGroupData(ctx, dockerCli, b)
|
||||||
|
if b.err == nil && err != nil {
|
||||||
|
b.err = err
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
}(b)
|
}(b)
|
||||||
@@ -72,26 +80,63 @@ func runLs(ctx context.Context, dockerCli command.Cli, in lsOptions) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if hasErrors, err := lsPrint(dockerCli, current, builders, in.format); err != nil {
|
currentName := "default"
|
||||||
|
current, err := storeutil.GetCurrentInstance(txn, dockerCli)
|
||||||
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
} else if hasErrors {
|
|
||||||
_, _ = fmt.Fprintf(dockerCli.Err(), "\n")
|
|
||||||
for _, b := range builders {
|
|
||||||
if b.Err() != nil {
|
|
||||||
_, _ = fmt.Fprintf(dockerCli.Err(), "Cannot load builder %s: %s\n", b.Name, strings.TrimSpace(b.Err().Error()))
|
|
||||||
} else {
|
|
||||||
for _, d := range b.Nodes() {
|
|
||||||
if d.Err != nil {
|
|
||||||
_, _ = fmt.Fprintf(dockerCli.Err(), "Failed to get status for %s (%s): %s\n", b.Name, d.Name, strings.TrimSpace(d.Err.Error()))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
if current != nil {
|
||||||
|
currentName = current.Name
|
||||||
|
if current.Name == "default" {
|
||||||
|
currentName = current.Nodes[0].Endpoint
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0)
|
||||||
|
fmt.Fprintf(w, "NAME/NODE\tDRIVER/ENDPOINT\tSTATUS\tPLATFORMS\n")
|
||||||
|
|
||||||
|
currentSet := false
|
||||||
|
for _, b := range builders {
|
||||||
|
if !currentSet && b.ng.Name == currentName {
|
||||||
|
b.ng.Name += " *"
|
||||||
|
currentSet = true
|
||||||
|
}
|
||||||
|
printngi(w, b)
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Flush()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func printngi(w io.Writer, ngi *nginfo) {
|
||||||
|
var err string
|
||||||
|
if ngi.err != nil {
|
||||||
|
err = ngi.err.Error()
|
||||||
|
}
|
||||||
|
fmt.Fprintf(w, "%s\t%s\t%s\t\n", ngi.ng.Name, ngi.ng.Driver, err)
|
||||||
|
if ngi.err == nil {
|
||||||
|
for idx, n := range ngi.ng.Nodes {
|
||||||
|
d := ngi.drivers[idx]
|
||||||
|
var err string
|
||||||
|
if d.err != nil {
|
||||||
|
err = d.err.Error()
|
||||||
|
} else if d.di.Err != nil {
|
||||||
|
err = d.di.Err.Error()
|
||||||
|
}
|
||||||
|
var status string
|
||||||
|
if d.info != nil {
|
||||||
|
status = d.info.Status.String()
|
||||||
|
}
|
||||||
|
if err != "" {
|
||||||
|
fmt.Fprintf(w, " %s\t%s\t%s\n", n.Name, n.Endpoint, err)
|
||||||
|
} else {
|
||||||
|
fmt.Fprintf(w, " %s\t%s\t%s\t%s\n", n.Name, n.Endpoint, status, strings.Join(platformutil.FormatInGroups(n.Platforms, d.platforms), ", "))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func lsCmd(dockerCli command.Cli) *cobra.Command {
|
func lsCmd(dockerCli command.Cli) *cobra.Command {
|
||||||
var options lsOptions
|
var options lsOptions
|
||||||
|
|
||||||
@@ -100,175 +145,12 @@ func lsCmd(dockerCli command.Cli) *cobra.Command {
|
|||||||
Short: "List builder instances",
|
Short: "List builder instances",
|
||||||
Args: cli.ExactArgs(0),
|
Args: cli.ExactArgs(0),
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
return runLs(cmd.Context(), dockerCli, options)
|
return runLs(dockerCli, options)
|
||||||
},
|
},
|
||||||
ValidArgsFunction: completion.Disable,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
flags := cmd.Flags()
|
|
||||||
flags.StringVar(&options.format, "format", formatter.TableFormatKey, "Format the output")
|
|
||||||
|
|
||||||
// hide builder persistent flag for this command
|
// hide builder persistent flag for this command
|
||||||
cobrautil.HideInheritedFlags(cmd, "builder")
|
cobrautil.HideInheritedFlags(cmd, "builder")
|
||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
func lsPrint(dockerCli command.Cli, current *store.NodeGroup, builders []*builder.Builder, format string) (hasErrors bool, _ error) {
|
|
||||||
if format == formatter.TableFormatKey {
|
|
||||||
format = lsDefaultTableFormat
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := formatter.Context{
|
|
||||||
Output: dockerCli.Out(),
|
|
||||||
Format: formatter.Format(format),
|
|
||||||
}
|
|
||||||
|
|
||||||
sort.SliceStable(builders, func(i, j int) bool {
|
|
||||||
ierr := builders[i].Err() != nil
|
|
||||||
jerr := builders[j].Err() != nil
|
|
||||||
if ierr && !jerr {
|
|
||||||
return false
|
|
||||||
} else if !ierr && jerr {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return i < j
|
|
||||||
})
|
|
||||||
|
|
||||||
render := func(format func(subContext formatter.SubContext) error) error {
|
|
||||||
for _, b := range builders {
|
|
||||||
if err := format(&lsContext{
|
|
||||||
Builder: &lsBuilder{
|
|
||||||
Builder: b,
|
|
||||||
Current: b.Name == current.Name,
|
|
||||||
},
|
|
||||||
format: ctx.Format,
|
|
||||||
}); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if b.Err() != nil {
|
|
||||||
if ctx.Format.IsTable() {
|
|
||||||
hasErrors = true
|
|
||||||
}
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
for _, n := range b.Nodes() {
|
|
||||||
if n.Err != nil {
|
|
||||||
if ctx.Format.IsTable() {
|
|
||||||
hasErrors = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if err := format(&lsContext{
|
|
||||||
format: ctx.Format,
|
|
||||||
Builder: &lsBuilder{
|
|
||||||
Builder: b,
|
|
||||||
Current: b.Name == current.Name,
|
|
||||||
},
|
|
||||||
node: n,
|
|
||||||
}); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
lsCtx := lsContext{}
|
|
||||||
lsCtx.Header = formatter.SubHeaderContext{
|
|
||||||
"Name": lsNameNodeHeader,
|
|
||||||
"DriverEndpoint": lsDriverEndpointHeader,
|
|
||||||
"LastActivity": lsLastActivityHeader,
|
|
||||||
"Status": lsStatusHeader,
|
|
||||||
"Buildkit": lsBuildkitHeader,
|
|
||||||
"Platforms": lsPlatformsHeader,
|
|
||||||
}
|
|
||||||
|
|
||||||
return hasErrors, ctx.Write(&lsCtx, render)
|
|
||||||
}
|
|
||||||
|
|
||||||
type lsBuilder struct {
|
|
||||||
*builder.Builder
|
|
||||||
Current bool
|
|
||||||
}
|
|
||||||
|
|
||||||
type lsContext struct {
|
|
||||||
formatter.HeaderContext
|
|
||||||
Builder *lsBuilder
|
|
||||||
|
|
||||||
format formatter.Format
|
|
||||||
node builder.Node
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *lsContext) MarshalJSON() ([]byte, error) {
|
|
||||||
return json.Marshal(c.Builder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *lsContext) Name() string {
|
|
||||||
if c.node.Name == "" {
|
|
||||||
name := c.Builder.Name
|
|
||||||
if c.Builder.Current && c.format.IsTable() {
|
|
||||||
name += "*"
|
|
||||||
}
|
|
||||||
return name
|
|
||||||
}
|
|
||||||
if c.format.IsTable() {
|
|
||||||
return lsIndent + c.node.Name
|
|
||||||
}
|
|
||||||
return c.node.Name
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *lsContext) DriverEndpoint() string {
|
|
||||||
if c.node.Name == "" {
|
|
||||||
return c.Builder.Driver
|
|
||||||
}
|
|
||||||
if c.format.IsTable() {
|
|
||||||
return lsIndent + c.node.Endpoint
|
|
||||||
}
|
|
||||||
return c.node.Endpoint
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *lsContext) LastActivity() string {
|
|
||||||
if c.node.Name != "" || c.Builder.LastActivity.IsZero() {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
return c.Builder.LastActivity.UTC().Format(time.RFC3339)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *lsContext) Status() string {
|
|
||||||
if c.node.Name == "" {
|
|
||||||
if c.Builder.Err() != nil {
|
|
||||||
return "error"
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
if c.node.Err != nil {
|
|
||||||
return "error"
|
|
||||||
}
|
|
||||||
if c.node.DriverInfo != nil {
|
|
||||||
return c.node.DriverInfo.Status.String()
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *lsContext) Buildkit() string {
|
|
||||||
if c.node.Name == "" {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
return c.node.Version
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *lsContext) Platforms() string {
|
|
||||||
if c.node.Name == "" {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
return strings.Join(platformutil.FormatInGroups(c.node.Node.Platforms, c.node.Platforms), ", ")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *lsContext) Error() string {
|
|
||||||
if c.node.Name != "" && c.node.Err != nil {
|
|
||||||
return c.node.Err.Error()
|
|
||||||
} else if err := c.Builder.Err(); err != nil {
|
|
||||||
return err.Error()
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,21 +1,20 @@
|
|||||||
package commands
|
package commands
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"text/tabwriter"
|
"text/tabwriter"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/buildx/builder"
|
"github.com/docker/buildx/build"
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/opts"
|
"github.com/docker/cli/opts"
|
||||||
"github.com/docker/docker/api/types/filters"
|
"github.com/docker/docker/api/types/filters"
|
||||||
"github.com/docker/go-units"
|
"github.com/docker/go-units"
|
||||||
"github.com/moby/buildkit/client"
|
"github.com/moby/buildkit/client"
|
||||||
|
"github.com/moby/buildkit/util/appcontext"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
||||||
@@ -35,7 +34,9 @@ const (
|
|||||||
allCacheWarning = `WARNING! This will remove all build cache. Are you sure you want to continue?`
|
allCacheWarning = `WARNING! This will remove all build cache. Are you sure you want to continue?`
|
||||||
)
|
)
|
||||||
|
|
||||||
func runPrune(ctx context.Context, dockerCli command.Cli, opts pruneOptions) error {
|
func runPrune(dockerCli command.Cli, opts pruneOptions) error {
|
||||||
|
ctx := appcontext.Context()
|
||||||
|
|
||||||
pruneFilters := opts.filter.Value()
|
pruneFilters := opts.filter.Value()
|
||||||
pruneFilters = command.PruneFilters(dockerCli, pruneFilters)
|
pruneFilters = command.PruneFilters(dockerCli, pruneFilters)
|
||||||
|
|
||||||
@@ -49,27 +50,19 @@ func runPrune(ctx context.Context, dockerCli command.Cli, opts pruneOptions) err
|
|||||||
warning = allCacheWarning
|
warning = allCacheWarning
|
||||||
}
|
}
|
||||||
|
|
||||||
if !opts.force {
|
if !opts.force && !command.PromptForConfirmation(dockerCli.In(), dockerCli.Out(), warning) {
|
||||||
if ok, err := prompt(ctx, dockerCli.In(), dockerCli.Out(), warning); err != nil {
|
|
||||||
return err
|
|
||||||
} else if !ok {
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
b, err := builder.New(dockerCli, builder.WithName(opts.builder))
|
dis, err := getInstanceOrDefault(ctx, dockerCli, opts.builder, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
nodes, err := b.LoadNodes(ctx)
|
for _, di := range dis {
|
||||||
if err != nil {
|
if di.Err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
for _, node := range nodes {
|
|
||||||
if node.Err != nil {
|
|
||||||
return node.Err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ch := make(chan client.UsageInfo)
|
ch := make(chan client.UsageInfo)
|
||||||
@@ -97,11 +90,11 @@ func runPrune(ctx context.Context, dockerCli command.Cli, opts pruneOptions) err
|
|||||||
}()
|
}()
|
||||||
|
|
||||||
eg, ctx := errgroup.WithContext(ctx)
|
eg, ctx := errgroup.WithContext(ctx)
|
||||||
for _, node := range nodes {
|
for _, di := range dis {
|
||||||
func(node builder.Node) {
|
func(di build.DriverInfo) {
|
||||||
eg.Go(func() error {
|
eg.Go(func() error {
|
||||||
if node.Driver != nil {
|
if di.Driver != nil {
|
||||||
c, err := node.Driver.Client(ctx)
|
c, err := di.Driver.Client(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -116,7 +109,7 @@ func runPrune(ctx context.Context, dockerCli command.Cli, opts pruneOptions) err
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
}(node)
|
}(di)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := eg.Wait(); err != nil {
|
if err := eg.Wait(); err != nil {
|
||||||
@@ -140,13 +133,12 @@ func pruneCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
|||||||
Args: cli.NoArgs,
|
Args: cli.NoArgs,
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
options.builder = rootOpts.builder
|
options.builder = rootOpts.builder
|
||||||
return runPrune(cmd.Context(), dockerCli, options)
|
return runPrune(dockerCli, options)
|
||||||
},
|
},
|
||||||
ValidArgsFunction: completion.Disable,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
flags := cmd.Flags()
|
flags := cmd.Flags()
|
||||||
flags.BoolVarP(&options.all, "all", "a", false, "Include internal/frontend images")
|
flags.BoolVarP(&options.all, "all", "a", false, "Remove all unused images, not just dangling ones")
|
||||||
flags.Var(&options.filter, "filter", `Provide filter values (e.g., "until=24h")`)
|
flags.Var(&options.filter, "filter", `Provide filter values (e.g., "until=24h")`)
|
||||||
flags.Var(&options.keepStorage, "keep-storage", "Amount of disk space to keep for cache")
|
flags.Var(&options.keepStorage, "keep-storage", "Amount of disk space to keep for cache")
|
||||||
flags.BoolVar(&options.verbose, "verbose", false, "Provide a more verbose output")
|
flags.BoolVar(&options.verbose, "verbose", false, "Provide a more verbose output")
|
||||||
@@ -163,9 +155,9 @@ func toBuildkitPruneInfo(f filters.Args) (*client.PruneInfo, error) {
|
|||||||
if len(untilValues) > 0 && len(unusedForValues) > 0 {
|
if len(untilValues) > 0 && len(unusedForValues) > 0 {
|
||||||
return nil, errors.Errorf("conflicting filters %q and %q", "until", "unused-for")
|
return nil, errors.Errorf("conflicting filters %q and %q", "until", "unused-for")
|
||||||
}
|
}
|
||||||
untilKey := "until"
|
filterKey := "until"
|
||||||
if len(unusedForValues) > 0 {
|
if len(unusedForValues) > 0 {
|
||||||
untilKey = "unused-for"
|
filterKey = "unused-for"
|
||||||
}
|
}
|
||||||
untilValues = append(untilValues, unusedForValues...)
|
untilValues = append(untilValues, unusedForValues...)
|
||||||
|
|
||||||
@@ -176,27 +168,23 @@ func toBuildkitPruneInfo(f filters.Args) (*client.PruneInfo, error) {
|
|||||||
var err error
|
var err error
|
||||||
until, err = time.ParseDuration(untilValues[0])
|
until, err = time.ParseDuration(untilValues[0])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrapf(err, "%q filter expects a duration (e.g., '24h')", untilKey)
|
return nil, errors.Wrapf(err, "%q filter expects a duration (e.g., '24h')", filterKey)
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
return nil, errors.Errorf("filters expect only one value")
|
return nil, errors.Errorf("filters expect only one value")
|
||||||
}
|
}
|
||||||
|
|
||||||
filters := make([]string, 0, f.Len())
|
bkFilter := make([]string, 0, f.Len())
|
||||||
for _, filterKey := range f.Keys() {
|
for _, field := range f.Keys() {
|
||||||
if filterKey == untilKey {
|
values := f.Get(field)
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
values := f.Get(filterKey)
|
|
||||||
switch len(values) {
|
switch len(values) {
|
||||||
case 0:
|
case 0:
|
||||||
filters = append(filters, filterKey)
|
bkFilter = append(bkFilter, field)
|
||||||
case 1:
|
case 1:
|
||||||
if filterKey == "id" {
|
if field == "id" {
|
||||||
filters = append(filters, filterKey+"~="+values[0])
|
bkFilter = append(bkFilter, field+"~="+values[0])
|
||||||
} else {
|
} else {
|
||||||
filters = append(filters, filterKey+"=="+values[0])
|
bkFilter = append(bkFilter, field+"=="+values[0])
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
return nil, errors.Errorf("filters expect only one value")
|
return nil, errors.Errorf("filters expect only one value")
|
||||||
@@ -204,6 +192,6 @@ func toBuildkitPruneInfo(f filters.Args) (*client.PruneInfo, error) {
|
|||||||
}
|
}
|
||||||
return &client.PruneInfo{
|
return &client.PruneInfo{
|
||||||
KeepDuration: until,
|
KeepDuration: until,
|
||||||
Filter: []string{strings.Join(filters, ",")},
|
Filter: []string{strings.Join(bkFilter, ",")},
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|||||||
142
commands/rm.go
142
commands/rm.go
@@ -2,21 +2,20 @@ package commands
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/buildx/builder"
|
|
||||||
"github.com/docker/buildx/store"
|
"github.com/docker/buildx/store"
|
||||||
"github.com/docker/buildx/store/storeutil"
|
"github.com/docker/buildx/store/storeutil"
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
|
"github.com/moby/buildkit/util/appcontext"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
||||||
)
|
)
|
||||||
|
|
||||||
type rmOptions struct {
|
type rmOptions struct {
|
||||||
builders []string
|
builder string
|
||||||
keepState bool
|
keepState bool
|
||||||
keepDaemon bool
|
keepDaemon bool
|
||||||
allInactive bool
|
allInactive bool
|
||||||
@@ -27,14 +26,12 @@ const (
|
|||||||
rmInactiveWarning = `WARNING! This will remove all builders that are not in running state. Are you sure you want to continue?`
|
rmInactiveWarning = `WARNING! This will remove all builders that are not in running state. Are you sure you want to continue?`
|
||||||
)
|
)
|
||||||
|
|
||||||
func runRm(ctx context.Context, dockerCli command.Cli, in rmOptions) error {
|
func runRm(dockerCli command.Cli, in rmOptions) error {
|
||||||
if in.allInactive && !in.force {
|
ctx := appcontext.Context()
|
||||||
if ok, err := prompt(ctx, dockerCli.In(), dockerCli.Out(), rmInactiveWarning); err != nil {
|
|
||||||
return err
|
if in.allInactive && !in.force && !command.PromptForConfirmation(dockerCli.In(), dockerCli.Out(), rmInactiveWarning) {
|
||||||
} else if !ok {
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
txn, release, err := storeutil.GetStore(dockerCli)
|
txn, release, err := storeutil.GetStore(dockerCli)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -46,52 +43,30 @@ func runRm(ctx context.Context, dockerCli command.Cli, in rmOptions) error {
|
|||||||
return rmAllInactive(ctx, txn, dockerCli, in)
|
return rmAllInactive(ctx, txn, dockerCli, in)
|
||||||
}
|
}
|
||||||
|
|
||||||
eg, _ := errgroup.WithContext(ctx)
|
if in.builder != "" {
|
||||||
for _, name := range in.builders {
|
ng, err := storeutil.GetNodeGroup(txn, dockerCli, in.builder)
|
||||||
func(name string) {
|
|
||||||
eg.Go(func() (err error) {
|
|
||||||
defer func() {
|
|
||||||
if err == nil {
|
|
||||||
_, _ = fmt.Fprintf(dockerCli.Err(), "%s removed\n", name)
|
|
||||||
} else {
|
|
||||||
_, _ = fmt.Fprintf(dockerCli.Err(), "failed to remove %s: %v\n", name, err)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
b, err := builder.New(dockerCli,
|
|
||||||
builder.WithName(name),
|
|
||||||
builder.WithStore(txn),
|
|
||||||
builder.WithSkippedValidation(),
|
|
||||||
)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
err1 := rm(ctx, dockerCli, in, ng)
|
||||||
nodes, err := b.LoadNodes(ctx)
|
if err := txn.Remove(ng.Name); err != nil {
|
||||||
if err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if cb := b.ContextName(); cb != "" {
|
|
||||||
return errors.Errorf("context builder cannot be removed, run `docker context rm %s` to remove this context", cb)
|
|
||||||
}
|
|
||||||
|
|
||||||
err1 := rm(ctx, nodes, in)
|
|
||||||
if err := txn.Remove(b.Name); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err1 != nil {
|
|
||||||
return err1
|
return err1
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
ng, err := storeutil.GetCurrentInstance(txn, dockerCli)
|
||||||
})
|
if err != nil {
|
||||||
}(name)
|
return err
|
||||||
|
}
|
||||||
|
if ng != nil {
|
||||||
|
err1 := rm(ctx, dockerCli, in, ng)
|
||||||
|
if err := txn.Remove(ng.Name); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return err1
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := eg.Wait(); err != nil {
|
|
||||||
return errors.New("failed to remove one or more builders")
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -99,77 +74,84 @@ func rmCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
|||||||
var options rmOptions
|
var options rmOptions
|
||||||
|
|
||||||
cmd := &cobra.Command{
|
cmd := &cobra.Command{
|
||||||
Use: "rm [OPTIONS] [NAME] [NAME...]",
|
Use: "rm [NAME]",
|
||||||
Short: "Remove one or more builder instances",
|
Short: "Remove a builder instance",
|
||||||
|
Args: cli.RequiresMaxArgs(1),
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
options.builders = []string{rootOpts.builder}
|
options.builder = rootOpts.builder
|
||||||
if len(args) > 0 {
|
if len(args) > 0 {
|
||||||
if options.allInactive {
|
if options.allInactive {
|
||||||
return errors.New("cannot specify builder name when --all-inactive is set")
|
return errors.New("cannot specify builder name when --all-inactive is set")
|
||||||
}
|
}
|
||||||
options.builders = args
|
options.builder = args[0]
|
||||||
}
|
}
|
||||||
return runRm(cmd.Context(), dockerCli, options)
|
return runRm(dockerCli, options)
|
||||||
},
|
},
|
||||||
ValidArgsFunction: completion.BuilderNames(dockerCli),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
flags := cmd.Flags()
|
flags := cmd.Flags()
|
||||||
flags.BoolVar(&options.keepState, "keep-state", false, "Keep BuildKit state")
|
flags.BoolVar(&options.keepState, "keep-state", false, "Keep BuildKit state")
|
||||||
flags.BoolVar(&options.keepDaemon, "keep-daemon", false, "Keep the BuildKit daemon running")
|
flags.BoolVar(&options.keepDaemon, "keep-daemon", false, "Keep the buildkitd daemon running")
|
||||||
flags.BoolVar(&options.allInactive, "all-inactive", false, "Remove all inactive builders")
|
flags.BoolVar(&options.allInactive, "all-inactive", false, "Remove all inactive builders")
|
||||||
flags.BoolVarP(&options.force, "force", "f", false, "Do not prompt for confirmation")
|
flags.BoolVarP(&options.force, "force", "f", false, "Do not prompt for confirmation")
|
||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
func rm(ctx context.Context, nodes []builder.Node, in rmOptions) (err error) {
|
func rm(ctx context.Context, dockerCli command.Cli, in rmOptions, ng *store.NodeGroup) error {
|
||||||
for _, node := range nodes {
|
dis, err := driversForNodeGroup(ctx, dockerCli, ng, "")
|
||||||
if node.Driver == nil {
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, di := range dis {
|
||||||
|
if di.Driver == nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
// Do not stop the buildkitd daemon when --keep-daemon is provided
|
// Do not stop the buildkitd daemon when --keep-daemon is provided
|
||||||
if !in.keepDaemon {
|
if !in.keepDaemon {
|
||||||
if err := node.Driver.Stop(ctx, true); err != nil {
|
if err := di.Driver.Stop(ctx, true); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if err := node.Driver.Rm(ctx, true, !in.keepState, !in.keepDaemon); err != nil {
|
if err := di.Driver.Rm(ctx, true, !in.keepState, !in.keepDaemon); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if node.Err != nil {
|
if di.Err != nil {
|
||||||
err = node.Err
|
err = di.Err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func rmAllInactive(ctx context.Context, txn *store.Txn, dockerCli command.Cli, in rmOptions) error {
|
func rmAllInactive(ctx context.Context, txn *store.Txn, dockerCli command.Cli, in rmOptions) error {
|
||||||
builders, err := builder.GetBuilders(dockerCli, txn)
|
ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
timeoutCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
|
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
eg, _ := errgroup.WithContext(timeoutCtx)
|
ll, err := txn.List()
|
||||||
for _, b := range builders {
|
|
||||||
func(b *builder.Builder) {
|
|
||||||
eg.Go(func() error {
|
|
||||||
nodes, err := b.LoadNodes(timeoutCtx, builder.WithData())
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.Wrapf(err, "cannot load %s", b.Name)
|
|
||||||
}
|
|
||||||
if b.Dynamic {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if b.Inactive() {
|
|
||||||
rmerr := rm(ctx, nodes, in)
|
|
||||||
if err := txn.Remove(b.Name); err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
_, _ = fmt.Fprintf(dockerCli.Err(), "%s removed\n", b.Name)
|
|
||||||
|
builders := make([]*nginfo, len(ll))
|
||||||
|
for i, ng := range ll {
|
||||||
|
builders[i] = &nginfo{ng: ng}
|
||||||
|
}
|
||||||
|
|
||||||
|
eg, _ := errgroup.WithContext(ctx)
|
||||||
|
for _, b := range builders {
|
||||||
|
func(b *nginfo) {
|
||||||
|
eg.Go(func() error {
|
||||||
|
if err := loadNodeGroupData(ctx, dockerCli, b); err != nil {
|
||||||
|
return errors.Wrapf(err, "cannot load %s", b.ng.Name)
|
||||||
|
}
|
||||||
|
if b.ng.Dynamic {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if b.inactive() {
|
||||||
|
rmerr := rm(ctx, dockerCli, in, b.ng)
|
||||||
|
if err := txn.Remove(b.ng.Name); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
return rmerr
|
return rmerr
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -3,17 +3,11 @@ package commands
|
|||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
debugcmd "github.com/docker/buildx/commands/debug"
|
|
||||||
imagetoolscmd "github.com/docker/buildx/commands/imagetools"
|
imagetoolscmd "github.com/docker/buildx/commands/imagetools"
|
||||||
"github.com/docker/buildx/controller/remote"
|
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/buildx/util/logutil"
|
"github.com/docker/buildx/util/logutil"
|
||||||
"github.com/docker/cli-docs-tool/annotation"
|
"github.com/docker/cli-docs-tool/annotation"
|
||||||
"github.com/docker/cli/cli"
|
|
||||||
"github.com/docker/cli/cli-plugins/plugin"
|
"github.com/docker/cli/cli-plugins/plugin"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/cli/debug"
|
|
||||||
"github.com/moby/buildkit/util/appcontext"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"github.com/spf13/pflag"
|
"github.com/spf13/pflag"
|
||||||
@@ -27,29 +21,10 @@ func NewRootCmd(name string, isPlugin bool, dockerCli command.Cli) *cobra.Comman
|
|||||||
Annotations: map[string]string{
|
Annotations: map[string]string{
|
||||||
annotation.CodeDelimiter: `"`,
|
annotation.CodeDelimiter: `"`,
|
||||||
},
|
},
|
||||||
CompletionOptions: cobra.CompletionOptions{
|
|
||||||
HiddenDefaultCmd: true,
|
|
||||||
},
|
|
||||||
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
cmd.SetContext(appcontext.Context())
|
|
||||||
if !isPlugin {
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
if isPlugin {
|
||||||
|
cmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
|
||||||
return plugin.PersistentPreRunE(cmd, args)
|
return plugin.PersistentPreRunE(cmd, args)
|
||||||
},
|
|
||||||
}
|
|
||||||
if !isPlugin {
|
|
||||||
// match plugin behavior for standalone mode
|
|
||||||
// https://github.com/docker/cli/blob/6c9eb708fa6d17765d71965f90e1c59cea686ee9/cli-plugins/plugin/plugin.go#L117-L127
|
|
||||||
cmd.SilenceUsage = true
|
|
||||||
cmd.SilenceErrors = true
|
|
||||||
cmd.TraverseChildren = true
|
|
||||||
cmd.DisableFlagsInUseLine = true
|
|
||||||
cli.DisableFlagsInUseLine(cmd)
|
|
||||||
|
|
||||||
// DEBUG=1 should perform the same as --debug at the docker root level
|
|
||||||
if debug.IsEnabled() {
|
|
||||||
debug.Enable()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,9 +38,15 @@ func NewRootCmd(name string, isPlugin bool, dockerCli command.Cli) *cobra.Comman
|
|||||||
"using default config store",
|
"using default config store",
|
||||||
))
|
))
|
||||||
|
|
||||||
if !isExperimental() {
|
// filter out useless commandConn.CloseWrite warning message that can occur
|
||||||
cmd.SetHelpTemplate(cmd.HelpTemplate() + "\nExperimental commands and flags are hidden. Set BUILDX_EXPERIMENTAL=1 to show them.\n")
|
// when listing builder instances with "buildx ls" for those that are
|
||||||
}
|
// unreachable: "commandConn.CloseWrite: commandconn: failed to wait: signal: killed"
|
||||||
|
// https://github.com/docker/cli/blob/3fb4fb83dfb5db0c0753a8316f21aea54dab32c5/cli/connhelper/commandconn/commandconn.go#L203-L214
|
||||||
|
logrus.AddHook(logutil.NewFilter([]logrus.Level{
|
||||||
|
logrus.WarnLevel,
|
||||||
|
},
|
||||||
|
"commandConn.CloseWrite:",
|
||||||
|
))
|
||||||
|
|
||||||
addCommands(cmd, dockerCli)
|
addCommands(cmd, dockerCli)
|
||||||
return cmd
|
return cmd
|
||||||
@@ -80,10 +61,9 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
|
|||||||
rootFlags(opts, cmd.PersistentFlags())
|
rootFlags(opts, cmd.PersistentFlags())
|
||||||
|
|
||||||
cmd.AddCommand(
|
cmd.AddCommand(
|
||||||
buildCmd(dockerCli, opts, nil),
|
buildCmd(dockerCli, opts),
|
||||||
bakeCmd(dockerCli, opts),
|
bakeCmd(dockerCli, opts),
|
||||||
createCmd(dockerCli),
|
createCmd(dockerCli),
|
||||||
dialStdioCmd(dockerCli, opts),
|
|
||||||
rmCmd(dockerCli, opts),
|
rmCmd(dockerCli, opts),
|
||||||
lsCmd(dockerCli),
|
lsCmd(dockerCli),
|
||||||
useCmd(dockerCli, opts),
|
useCmd(dockerCli, opts),
|
||||||
@@ -94,18 +74,7 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
|
|||||||
versionCmd(dockerCli),
|
versionCmd(dockerCli),
|
||||||
pruneCmd(dockerCli, opts),
|
pruneCmd(dockerCli, opts),
|
||||||
duCmd(dockerCli, opts),
|
duCmd(dockerCli, opts),
|
||||||
imagetoolscmd.RootCmd(dockerCli, imagetoolscmd.RootOptions{Builder: &opts.builder}),
|
imagetoolscmd.RootCmd(dockerCli, imagetoolscmd.RootOptions{Builder: opts.builder}),
|
||||||
)
|
|
||||||
if isExperimental() {
|
|
||||||
cmd.AddCommand(debugcmd.RootCmd(dockerCli,
|
|
||||||
newDebuggableBuild(dockerCli, opts),
|
|
||||||
))
|
|
||||||
remote.AddControllerCommands(cmd, dockerCli)
|
|
||||||
}
|
|
||||||
|
|
||||||
cmd.RegisterFlagCompletionFunc( //nolint:errcheck
|
|
||||||
"builder",
|
|
||||||
completion.BuilderNames(dockerCli),
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,10 +3,11 @@ package commands
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/docker/buildx/builder"
|
"github.com/docker/buildx/store"
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
"github.com/docker/buildx/store/storeutil"
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
|
"github.com/moby/buildkit/util/appcontext"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -14,20 +15,35 @@ type stopOptions struct {
|
|||||||
builder string
|
builder string
|
||||||
}
|
}
|
||||||
|
|
||||||
func runStop(ctx context.Context, dockerCli command.Cli, in stopOptions) error {
|
func runStop(dockerCli command.Cli, in stopOptions) error {
|
||||||
b, err := builder.New(dockerCli,
|
ctx := appcontext.Context()
|
||||||
builder.WithName(in.builder),
|
|
||||||
builder.WithSkippedValidation(),
|
txn, release, err := storeutil.GetStore(dockerCli)
|
||||||
)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
nodes, err := b.LoadNodes(ctx)
|
defer release()
|
||||||
|
|
||||||
|
if in.builder != "" {
|
||||||
|
ng, err := storeutil.GetNodeGroup(txn, dockerCli, in.builder)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if err := stop(ctx, dockerCli, ng); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
return stop(ctx, nodes)
|
ng, err := storeutil.GetCurrentInstance(txn, dockerCli)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if ng != nil {
|
||||||
|
return stop(ctx, dockerCli, ng)
|
||||||
|
}
|
||||||
|
|
||||||
|
return stopCurrent(ctx, dockerCli)
|
||||||
}
|
}
|
||||||
|
|
||||||
func stopCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
func stopCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
||||||
@@ -42,23 +58,44 @@ func stopCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
|||||||
if len(args) > 0 {
|
if len(args) > 0 {
|
||||||
options.builder = args[0]
|
options.builder = args[0]
|
||||||
}
|
}
|
||||||
return runStop(cmd.Context(), dockerCli, options)
|
return runStop(dockerCli, options)
|
||||||
},
|
},
|
||||||
ValidArgsFunction: completion.BuilderNames(dockerCli),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
func stop(ctx context.Context, nodes []builder.Node) (err error) {
|
func stop(ctx context.Context, dockerCli command.Cli, ng *store.NodeGroup) error {
|
||||||
for _, node := range nodes {
|
dis, err := driversForNodeGroup(ctx, dockerCli, ng, "")
|
||||||
if node.Driver != nil {
|
if err != nil {
|
||||||
if err := node.Driver.Stop(ctx, true); err != nil {
|
return err
|
||||||
|
}
|
||||||
|
for _, di := range dis {
|
||||||
|
if di.Driver != nil {
|
||||||
|
if err := di.Driver.Stop(ctx, true); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if node.Err != nil {
|
if di.Err != nil {
|
||||||
err = node.Err
|
err = di.Err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func stopCurrent(ctx context.Context, dockerCli command.Cli) error {
|
||||||
|
dis, err := getDefaultDrivers(ctx, dockerCli, false, "")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, di := range dis {
|
||||||
|
if di.Driver != nil {
|
||||||
|
if err := di.Driver.Stop(ctx, true); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if di.Err != nil {
|
||||||
|
err = di.Err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/docker/buildx/util/cobrautil"
|
"github.com/docker/buildx/util/cobrautil"
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/docker/cli/cli/config"
|
"github.com/docker/cli/cli/config"
|
||||||
@@ -54,7 +53,6 @@ func uninstallCmd(dockerCli command.Cli) *cobra.Command {
|
|||||||
return runUninstall(dockerCli, options)
|
return runUninstall(dockerCli, options)
|
||||||
},
|
},
|
||||||
Hidden: true,
|
Hidden: true,
|
||||||
ValidArgsFunction: completion.Disable,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// hide builder persistent flag for this command
|
// hide builder persistent flag for this command
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/docker/buildx/store/storeutil"
|
"github.com/docker/buildx/store/storeutil"
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/buildx/util/dockerutil"
|
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
@@ -31,11 +29,14 @@ func runUse(dockerCli command.Cli, in useOptions) error {
|
|||||||
return errors.Errorf("run `docker context use default` to switch to default context")
|
return errors.Errorf("run `docker context use default` to switch to default context")
|
||||||
}
|
}
|
||||||
if in.builder == "default" || in.builder == dockerCli.CurrentContext() {
|
if in.builder == "default" || in.builder == dockerCli.CurrentContext() {
|
||||||
ep, err := dockerutil.GetCurrentEndpoint(dockerCli)
|
ep, err := storeutil.GetCurrentEndpoint(dockerCli)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return txn.SetCurrent(ep, "", false, false)
|
if err := txn.SetCurrent(ep, "", false, false); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
list, err := dockerCli.ContextStore().List()
|
list, err := dockerCli.ContextStore().List()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -51,11 +52,15 @@ func runUse(dockerCli command.Cli, in useOptions) error {
|
|||||||
return errors.Wrapf(err, "failed to find instance %q", in.builder)
|
return errors.Wrapf(err, "failed to find instance %q", in.builder)
|
||||||
}
|
}
|
||||||
|
|
||||||
ep, err := dockerutil.GetCurrentEndpoint(dockerCli)
|
ep, err := storeutil.GetCurrentEndpoint(dockerCli)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return txn.SetCurrent(ep, in.builder, in.isGlobal, in.isDefault)
|
if err := txn.SetCurrent(ep, in.builder, in.isGlobal, in.isDefault); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func useCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
func useCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
||||||
@@ -72,7 +77,6 @@ func useCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
|
|||||||
}
|
}
|
||||||
return runUse(dockerCli, options)
|
return runUse(dockerCli, options)
|
||||||
},
|
},
|
||||||
ValidArgsFunction: completion.BuilderNames(dockerCli),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
flags := cmd.Flags()
|
flags := cmd.Flags()
|
||||||
|
|||||||
446
commands/util.go
446
commands/util.go
@@ -2,22 +2,442 @@ package commands
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"io"
|
"net/url"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/docker/buildx/build"
|
||||||
|
"github.com/docker/buildx/driver"
|
||||||
|
ctxkube "github.com/docker/buildx/driver/kubernetes/context"
|
||||||
|
"github.com/docker/buildx/store"
|
||||||
|
"github.com/docker/buildx/store/storeutil"
|
||||||
|
"github.com/docker/buildx/util/platformutil"
|
||||||
|
"github.com/docker/buildx/util/progress"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
|
"github.com/docker/cli/cli/context/docker"
|
||||||
|
ctxstore "github.com/docker/cli/cli/context/store"
|
||||||
|
dopts "github.com/docker/cli/opts"
|
||||||
|
dockerclient "github.com/docker/docker/client"
|
||||||
|
specs "github.com/opencontainers/image-spec/specs-go/v1"
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"golang.org/x/sync/errgroup"
|
||||||
|
"k8s.io/client-go/tools/clientcmd"
|
||||||
)
|
)
|
||||||
|
|
||||||
func prompt(ctx context.Context, ins io.Reader, out io.Writer, msg string) (bool, error) {
|
// validateEndpoint validates that endpoint is either a context or a docker host
|
||||||
done := make(chan struct{})
|
func validateEndpoint(dockerCli command.Cli, ep string) (string, error) {
|
||||||
var ok bool
|
de, err := storeutil.GetDockerEndpoint(dockerCli, ep)
|
||||||
go func() {
|
if err == nil && de != "" {
|
||||||
ok = command.PromptForConfirmation(ins, out, msg)
|
if ep == "default" {
|
||||||
close(done)
|
return de, nil
|
||||||
}()
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
return false, context.Cause(ctx)
|
|
||||||
case <-done:
|
|
||||||
return ok, nil
|
|
||||||
}
|
}
|
||||||
|
return ep, nil
|
||||||
|
}
|
||||||
|
h, err := dopts.ParseHost(true, ep)
|
||||||
|
if err != nil {
|
||||||
|
return "", errors.Wrapf(err, "failed to parse endpoint %s", ep)
|
||||||
|
}
|
||||||
|
return h, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// driversForNodeGroup returns drivers for a nodegroup instance
|
||||||
|
func driversForNodeGroup(ctx context.Context, dockerCli command.Cli, ng *store.NodeGroup, contextPathHash string) ([]build.DriverInfo, error) {
|
||||||
|
eg, _ := errgroup.WithContext(ctx)
|
||||||
|
|
||||||
|
dis := make([]build.DriverInfo, len(ng.Nodes))
|
||||||
|
|
||||||
|
var f driver.Factory
|
||||||
|
if ng.Driver != "" {
|
||||||
|
f = driver.GetFactory(ng.Driver, true)
|
||||||
|
if f == nil {
|
||||||
|
return nil, errors.Errorf("failed to find driver %q", f)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
dockerapi, err := clientForEndpoint(dockerCli, ng.Nodes[0].Endpoint)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
f, err = driver.GetDefaultFactory(ctx, dockerapi, false)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
ng.Driver = f.Name()
|
||||||
|
}
|
||||||
|
imageopt, err := storeutil.GetImageConfig(dockerCli, ng)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, n := range ng.Nodes {
|
||||||
|
func(i int, n store.Node) {
|
||||||
|
eg.Go(func() error {
|
||||||
|
di := build.DriverInfo{
|
||||||
|
Name: n.Name,
|
||||||
|
Platform: n.Platforms,
|
||||||
|
ProxyConfig: storeutil.GetProxyConfig(dockerCli),
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
dis[i] = di
|
||||||
|
}()
|
||||||
|
dockerapi, err := clientForEndpoint(dockerCli, n.Endpoint)
|
||||||
|
if err != nil {
|
||||||
|
di.Err = err
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// TODO: replace the following line with dockerclient.WithAPIVersionNegotiation option in clientForEndpoint
|
||||||
|
dockerapi.NegotiateAPIVersion(ctx)
|
||||||
|
|
||||||
|
contextStore := dockerCli.ContextStore()
|
||||||
|
|
||||||
|
var kcc driver.KubeClientConfig
|
||||||
|
kcc, err = configFromContext(n.Endpoint, contextStore)
|
||||||
|
if err != nil {
|
||||||
|
// err is returned if n.Endpoint is non-context name like "unix:///var/run/docker.sock".
|
||||||
|
// try again with name="default".
|
||||||
|
// FIXME: n should retain real context name.
|
||||||
|
kcc, err = configFromContext("default", contextStore)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Error(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tryToUseKubeConfigInCluster := false
|
||||||
|
if kcc == nil {
|
||||||
|
tryToUseKubeConfigInCluster = true
|
||||||
|
} else {
|
||||||
|
if _, err := kcc.ClientConfig(); err != nil {
|
||||||
|
tryToUseKubeConfigInCluster = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if tryToUseKubeConfigInCluster {
|
||||||
|
kccInCluster := driver.KubeClientConfigInCluster{}
|
||||||
|
if _, err := kccInCluster.ClientConfig(); err == nil {
|
||||||
|
logrus.Debug("using kube config in cluster")
|
||||||
|
kcc = kccInCluster
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
d, err := driver.GetDriver(ctx, "buildx_buildkit_"+n.Name, f, dockerapi, imageopt.Auth, kcc, n.Flags, n.Files, n.DriverOpts, n.Platforms, contextPathHash)
|
||||||
|
if err != nil {
|
||||||
|
di.Err = err
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
di.Driver = d
|
||||||
|
di.ImageOpt = imageopt
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}(i, n)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := eg.Wait(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return dis, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func configFromContext(endpointName string, s ctxstore.Reader) (clientcmd.ClientConfig, error) {
|
||||||
|
if strings.HasPrefix(endpointName, "kubernetes://") {
|
||||||
|
u, _ := url.Parse(endpointName)
|
||||||
|
if kubeconfig := u.Query().Get("kubeconfig"); kubeconfig != "" {
|
||||||
|
_ = os.Setenv(clientcmd.RecommendedConfigPathEnvVar, kubeconfig)
|
||||||
|
}
|
||||||
|
rules := clientcmd.NewDefaultClientConfigLoadingRules()
|
||||||
|
apiConfig, err := rules.Load()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return clientcmd.NewDefaultClientConfig(*apiConfig, &clientcmd.ConfigOverrides{}), nil
|
||||||
|
}
|
||||||
|
return ctxkube.ConfigFromContext(endpointName, s)
|
||||||
|
}
|
||||||
|
|
||||||
|
// clientForEndpoint returns a docker client for an endpoint
|
||||||
|
func clientForEndpoint(dockerCli command.Cli, name string) (dockerclient.APIClient, error) {
|
||||||
|
list, err := dockerCli.ContextStore().List()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for _, l := range list {
|
||||||
|
if l.Name == name {
|
||||||
|
dep, ok := l.Endpoints["docker"]
|
||||||
|
if !ok {
|
||||||
|
return nil, errors.Errorf("context %q does not have a Docker endpoint", name)
|
||||||
|
}
|
||||||
|
epm, ok := dep.(docker.EndpointMeta)
|
||||||
|
if !ok {
|
||||||
|
return nil, errors.Errorf("endpoint %q is not of type EndpointMeta, %T", dep, dep)
|
||||||
|
}
|
||||||
|
ep, err := docker.WithTLSData(dockerCli.ContextStore(), name, epm)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
clientOpts, err := ep.ClientOpts()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return dockerclient.NewClientWithOpts(clientOpts...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ep := docker.Endpoint{
|
||||||
|
EndpointMeta: docker.EndpointMeta{
|
||||||
|
Host: name,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
clientOpts, err := ep.ClientOpts()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return dockerclient.NewClientWithOpts(clientOpts...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func getInstanceOrDefault(ctx context.Context, dockerCli command.Cli, instance, contextPathHash string) ([]build.DriverInfo, error) {
|
||||||
|
var defaultOnly bool
|
||||||
|
|
||||||
|
if instance == "default" && instance != dockerCli.CurrentContext() {
|
||||||
|
return nil, errors.Errorf("use `docker --context=default buildx` to switch to default context")
|
||||||
|
}
|
||||||
|
if instance == "default" || instance == dockerCli.CurrentContext() {
|
||||||
|
instance = ""
|
||||||
|
defaultOnly = true
|
||||||
|
}
|
||||||
|
list, err := dockerCli.ContextStore().List()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for _, l := range list {
|
||||||
|
if l.Name == instance {
|
||||||
|
return nil, errors.Errorf("use `docker --context=%s buildx` to switch to context %s", instance, instance)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if instance != "" {
|
||||||
|
return getInstanceByName(ctx, dockerCli, instance, contextPathHash)
|
||||||
|
}
|
||||||
|
return getDefaultDrivers(ctx, dockerCli, defaultOnly, contextPathHash)
|
||||||
|
}
|
||||||
|
|
||||||
|
func getInstanceByName(ctx context.Context, dockerCli command.Cli, instance, contextPathHash string) ([]build.DriverInfo, error) {
|
||||||
|
txn, release, err := storeutil.GetStore(dockerCli)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer release()
|
||||||
|
|
||||||
|
ng, err := txn.NodeGroupByName(instance)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return driversForNodeGroup(ctx, dockerCli, ng, contextPathHash)
|
||||||
|
}
|
||||||
|
|
||||||
|
// getDefaultDrivers returns drivers based on current cli config
|
||||||
|
func getDefaultDrivers(ctx context.Context, dockerCli command.Cli, defaultOnly bool, contextPathHash string) ([]build.DriverInfo, error) {
|
||||||
|
txn, release, err := storeutil.GetStore(dockerCli)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer release()
|
||||||
|
|
||||||
|
if !defaultOnly {
|
||||||
|
ng, err := storeutil.GetCurrentInstance(txn, dockerCli)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if ng != nil {
|
||||||
|
return driversForNodeGroup(ctx, dockerCli, ng, contextPathHash)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
imageopt, err := storeutil.GetImageConfig(dockerCli, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
d, err := driver.GetDriver(ctx, "buildx_buildkit_default", nil, dockerCli.Client(), imageopt.Auth, nil, nil, nil, nil, nil, contextPathHash)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return []build.DriverInfo{
|
||||||
|
{
|
||||||
|
Name: "default",
|
||||||
|
Driver: d,
|
||||||
|
ImageOpt: imageopt,
|
||||||
|
ProxyConfig: storeutil.GetProxyConfig(dockerCli),
|
||||||
|
},
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadInfoData(ctx context.Context, d *dinfo) error {
|
||||||
|
if d.di.Driver == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
info, err := d.di.Driver.Info(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
d.info = info
|
||||||
|
if info.Status == driver.Running {
|
||||||
|
c, err := d.di.Driver.Client(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
workers, err := c.ListWorkers(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return errors.Wrap(err, "listing workers")
|
||||||
|
}
|
||||||
|
for _, w := range workers {
|
||||||
|
d.platforms = append(d.platforms, w.Platforms...)
|
||||||
|
}
|
||||||
|
d.platforms = platformutil.Dedupe(d.platforms)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadNodeGroupData(ctx context.Context, dockerCli command.Cli, ngi *nginfo) error {
|
||||||
|
eg, _ := errgroup.WithContext(ctx)
|
||||||
|
|
||||||
|
dis, err := driversForNodeGroup(ctx, dockerCli, ngi.ng, "")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
ngi.drivers = make([]dinfo, len(dis))
|
||||||
|
for i, di := range dis {
|
||||||
|
d := di
|
||||||
|
ngi.drivers[i].di = &d
|
||||||
|
func(d *dinfo) {
|
||||||
|
eg.Go(func() error {
|
||||||
|
if err := loadInfoData(ctx, d); err != nil {
|
||||||
|
d.err = err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}(&ngi.drivers[i])
|
||||||
|
}
|
||||||
|
|
||||||
|
if eg.Wait(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
kubernetesDriverCount := 0
|
||||||
|
|
||||||
|
for _, di := range ngi.drivers {
|
||||||
|
if di.info != nil && len(di.info.DynamicNodes) > 0 {
|
||||||
|
kubernetesDriverCount++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
isAllKubernetesDrivers := len(ngi.drivers) == kubernetesDriverCount
|
||||||
|
|
||||||
|
if isAllKubernetesDrivers {
|
||||||
|
var drivers []dinfo
|
||||||
|
var dynamicNodes []store.Node
|
||||||
|
|
||||||
|
for _, di := range ngi.drivers {
|
||||||
|
// dynamic nodes are used in Kubernetes driver.
|
||||||
|
// Kubernetes pods are dynamically mapped to BuildKit Nodes.
|
||||||
|
if di.info != nil && len(di.info.DynamicNodes) > 0 {
|
||||||
|
for i := 0; i < len(di.info.DynamicNodes); i++ {
|
||||||
|
// all []dinfo share *build.DriverInfo and *driver.Info
|
||||||
|
diClone := di
|
||||||
|
if pl := di.info.DynamicNodes[i].Platforms; len(pl) > 0 {
|
||||||
|
diClone.platforms = pl
|
||||||
|
}
|
||||||
|
drivers = append(drivers, di)
|
||||||
|
}
|
||||||
|
dynamicNodes = append(dynamicNodes, di.info.DynamicNodes...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// not append (remove the static nodes in the store)
|
||||||
|
ngi.ng.Nodes = dynamicNodes
|
||||||
|
ngi.drivers = drivers
|
||||||
|
ngi.ng.Dynamic = true
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func dockerAPI(dockerCli command.Cli) *api {
|
||||||
|
return &api{dockerCli: dockerCli}
|
||||||
|
}
|
||||||
|
|
||||||
|
type api struct {
|
||||||
|
dockerCli command.Cli
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *api) DockerAPI(name string) (dockerclient.APIClient, error) {
|
||||||
|
if name == "" {
|
||||||
|
name = a.dockerCli.CurrentContext()
|
||||||
|
}
|
||||||
|
return clientForEndpoint(a.dockerCli, name)
|
||||||
|
}
|
||||||
|
|
||||||
|
type dinfo struct {
|
||||||
|
di *build.DriverInfo
|
||||||
|
info *driver.Info
|
||||||
|
platforms []specs.Platform
|
||||||
|
err error
|
||||||
|
}
|
||||||
|
|
||||||
|
type nginfo struct {
|
||||||
|
ng *store.NodeGroup
|
||||||
|
drivers []dinfo
|
||||||
|
err error
|
||||||
|
}
|
||||||
|
|
||||||
|
// inactive checks if all nodes are inactive for this builder
|
||||||
|
func (n *nginfo) inactive() bool {
|
||||||
|
for idx := range n.ng.Nodes {
|
||||||
|
d := n.drivers[idx]
|
||||||
|
if d.info != nil && d.info.Status == driver.Running {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func boot(ctx context.Context, ngi *nginfo) (bool, error) {
|
||||||
|
toBoot := make([]int, 0, len(ngi.drivers))
|
||||||
|
for i, d := range ngi.drivers {
|
||||||
|
if d.err != nil || d.di.Err != nil || d.di.Driver == nil || d.info == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if d.info.Status != driver.Running {
|
||||||
|
toBoot = append(toBoot, i)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(toBoot) == 0 {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
printer := progress.NewPrinter(context.TODO(), os.Stderr, os.Stderr, "auto")
|
||||||
|
|
||||||
|
baseCtx := ctx
|
||||||
|
eg, _ := errgroup.WithContext(ctx)
|
||||||
|
for _, idx := range toBoot {
|
||||||
|
func(idx int) {
|
||||||
|
eg.Go(func() error {
|
||||||
|
pw := progress.WithPrefix(printer, ngi.ng.Nodes[idx].Name, len(toBoot) > 1)
|
||||||
|
_, err := driver.Boot(ctx, baseCtx, ngi.drivers[idx].di.Driver, pw)
|
||||||
|
if err != nil {
|
||||||
|
ngi.drivers[idx].err = err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}(idx)
|
||||||
|
}
|
||||||
|
|
||||||
|
err := eg.Wait()
|
||||||
|
err1 := printer.Wait()
|
||||||
|
if err == nil {
|
||||||
|
err = err1
|
||||||
|
}
|
||||||
|
|
||||||
|
return true, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/docker/buildx/util/cobrautil"
|
"github.com/docker/buildx/util/cobrautil"
|
||||||
"github.com/docker/buildx/util/cobrautil/completion"
|
|
||||||
"github.com/docker/buildx/version"
|
"github.com/docker/buildx/version"
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
"github.com/docker/cli/cli/command"
|
"github.com/docker/cli/cli/command"
|
||||||
@@ -24,7 +23,6 @@ func versionCmd(dockerCli command.Cli) *cobra.Command {
|
|||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
return runVersion(dockerCli)
|
return runVersion(dockerCli)
|
||||||
},
|
},
|
||||||
ValidArgsFunction: completion.Disable,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// hide builder persistent flag for this command
|
// hide builder persistent flag for this command
|
||||||
|
|||||||
@@ -1,280 +0,0 @@
|
|||||||
package build
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
|
|
||||||
"github.com/docker/buildx/build"
|
|
||||||
"github.com/docker/buildx/builder"
|
|
||||||
controllerapi "github.com/docker/buildx/controller/pb"
|
|
||||||
"github.com/docker/buildx/store"
|
|
||||||
"github.com/docker/buildx/store/storeutil"
|
|
||||||
"github.com/docker/buildx/util/buildflags"
|
|
||||||
"github.com/docker/buildx/util/confutil"
|
|
||||||
"github.com/docker/buildx/util/dockerutil"
|
|
||||||
"github.com/docker/buildx/util/platformutil"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/docker/cli/cli/command"
|
|
||||||
"github.com/docker/cli/cli/config"
|
|
||||||
dockeropts "github.com/docker/cli/opts"
|
|
||||||
"github.com/docker/go-units"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
"github.com/moby/buildkit/session/auth/authprovider"
|
|
||||||
"github.com/moby/buildkit/util/grpcerrors"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"google.golang.org/grpc/codes"
|
|
||||||
)
|
|
||||||
|
|
||||||
const defaultTargetName = "default"
|
|
||||||
|
|
||||||
// RunBuild runs the specified build and returns the result.
|
|
||||||
//
|
|
||||||
// NOTE: When an error happens during the build and this function acquires the debuggable *build.ResultHandle,
|
|
||||||
// this function returns it in addition to the error (i.e. it does "return nil, res, err"). The caller can
|
|
||||||
// inspect the result and debug the cause of that error.
|
|
||||||
func RunBuild(ctx context.Context, dockerCli command.Cli, in controllerapi.BuildOptions, inStream io.Reader, progress progress.Writer, generateResult bool) (*client.SolveResponse, *build.ResultHandle, error) {
|
|
||||||
if in.NoCache && len(in.NoCacheFilter) > 0 {
|
|
||||||
return nil, nil, errors.Errorf("--no-cache and --no-cache-filter cannot currently be used together")
|
|
||||||
}
|
|
||||||
|
|
||||||
contexts := map[string]build.NamedContext{}
|
|
||||||
for name, path := range in.NamedContexts {
|
|
||||||
contexts[name] = build.NamedContext{Path: path}
|
|
||||||
}
|
|
||||||
|
|
||||||
opts := build.Options{
|
|
||||||
Inputs: build.Inputs{
|
|
||||||
ContextPath: in.ContextPath,
|
|
||||||
DockerfilePath: in.DockerfileName,
|
|
||||||
InStream: inStream,
|
|
||||||
NamedContexts: contexts,
|
|
||||||
},
|
|
||||||
Ref: in.Ref,
|
|
||||||
BuildArgs: in.BuildArgs,
|
|
||||||
CgroupParent: in.CgroupParent,
|
|
||||||
ExtraHosts: in.ExtraHosts,
|
|
||||||
Labels: in.Labels,
|
|
||||||
NetworkMode: in.NetworkMode,
|
|
||||||
NoCache: in.NoCache,
|
|
||||||
NoCacheFilter: in.NoCacheFilter,
|
|
||||||
Pull: in.Pull,
|
|
||||||
ShmSize: dockeropts.MemBytes(in.ShmSize),
|
|
||||||
Tags: in.Tags,
|
|
||||||
Target: in.Target,
|
|
||||||
Ulimits: controllerUlimitOpt2DockerUlimit(in.Ulimits),
|
|
||||||
GroupRef: in.GroupRef,
|
|
||||||
}
|
|
||||||
|
|
||||||
platforms, err := platformutil.Parse(in.Platforms)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
opts.Platforms = platforms
|
|
||||||
|
|
||||||
dockerConfig := config.LoadDefaultConfigFile(os.Stderr)
|
|
||||||
opts.Session = append(opts.Session, authprovider.NewDockerAuthProvider(dockerConfig, nil))
|
|
||||||
|
|
||||||
secrets, err := controllerapi.CreateSecrets(in.Secrets)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
opts.Session = append(opts.Session, secrets)
|
|
||||||
|
|
||||||
sshSpecs := in.SSH
|
|
||||||
if len(sshSpecs) == 0 && buildflags.IsGitSSH(in.ContextPath) {
|
|
||||||
sshSpecs = append(sshSpecs, &controllerapi.SSH{ID: "default"})
|
|
||||||
}
|
|
||||||
ssh, err := controllerapi.CreateSSH(sshSpecs)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
opts.Session = append(opts.Session, ssh)
|
|
||||||
|
|
||||||
outputs, err := controllerapi.CreateExports(in.Exports)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
if in.ExportPush {
|
|
||||||
if in.ExportLoad {
|
|
||||||
return nil, nil, errors.Errorf("push and load may not be set together at the moment")
|
|
||||||
}
|
|
||||||
if len(outputs) == 0 {
|
|
||||||
outputs = []client.ExportEntry{{
|
|
||||||
Type: "image",
|
|
||||||
Attrs: map[string]string{
|
|
||||||
"push": "true",
|
|
||||||
},
|
|
||||||
}}
|
|
||||||
} else {
|
|
||||||
switch outputs[0].Type {
|
|
||||||
case "image":
|
|
||||||
outputs[0].Attrs["push"] = "true"
|
|
||||||
default:
|
|
||||||
return nil, nil, errors.Errorf("push and %q output can't be used together", outputs[0].Type)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if in.ExportLoad {
|
|
||||||
if len(outputs) == 0 {
|
|
||||||
outputs = []client.ExportEntry{{
|
|
||||||
Type: "docker",
|
|
||||||
Attrs: map[string]string{},
|
|
||||||
}}
|
|
||||||
} else {
|
|
||||||
switch outputs[0].Type {
|
|
||||||
case "docker":
|
|
||||||
default:
|
|
||||||
return nil, nil, errors.Errorf("load and %q output can't be used together", outputs[0].Type)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
annotations, err := buildflags.ParseAnnotations(in.Annotations)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
for _, o := range outputs {
|
|
||||||
for k, v := range annotations {
|
|
||||||
o.Attrs[k.String()] = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
opts.Exports = outputs
|
|
||||||
|
|
||||||
opts.CacheFrom = controllerapi.CreateCaches(in.CacheFrom)
|
|
||||||
opts.CacheTo = controllerapi.CreateCaches(in.CacheTo)
|
|
||||||
|
|
||||||
opts.Attests = controllerapi.CreateAttestations(in.Attests)
|
|
||||||
|
|
||||||
opts.SourcePolicy = in.SourcePolicy
|
|
||||||
|
|
||||||
allow, err := buildflags.ParseEntitlements(in.Allow)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
opts.Allow = allow
|
|
||||||
|
|
||||||
if in.PrintFunc != nil {
|
|
||||||
opts.PrintFunc = &build.PrintFunc{
|
|
||||||
Name: in.PrintFunc.Name,
|
|
||||||
Format: in.PrintFunc.Format,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// key string used for kubernetes "sticky" mode
|
|
||||||
contextPathHash, err := filepath.Abs(in.ContextPath)
|
|
||||||
if err != nil {
|
|
||||||
contextPathHash = in.ContextPath
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: this should not be loaded this side of the controller api
|
|
||||||
b, err := builder.New(dockerCli,
|
|
||||||
builder.WithName(in.Builder),
|
|
||||||
builder.WithContextPathHash(contextPathHash),
|
|
||||||
)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
if err = updateLastActivity(dockerCli, b.NodeGroup); err != nil {
|
|
||||||
return nil, nil, errors.Wrapf(err, "failed to update builder last activity time")
|
|
||||||
}
|
|
||||||
nodes, err := b.LoadNodes(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
resp, res, err := buildTargets(ctx, dockerCli, b.NodeGroup, nodes, map[string]build.Options{defaultTargetName: opts}, progress, generateResult)
|
|
||||||
err = wrapBuildError(err, false)
|
|
||||||
if err != nil {
|
|
||||||
// NOTE: buildTargets can return *build.ResultHandle even on error.
|
|
||||||
return nil, res, err
|
|
||||||
}
|
|
||||||
return resp, res, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// buildTargets runs the specified build and returns the result.
|
|
||||||
//
|
|
||||||
// NOTE: When an error happens during the build and this function acquires the debuggable *build.ResultHandle,
|
|
||||||
// this function returns it in addition to the error (i.e. it does "return nil, res, err"). The caller can
|
|
||||||
// inspect the result and debug the cause of that error.
|
|
||||||
func buildTargets(ctx context.Context, dockerCli command.Cli, ng *store.NodeGroup, nodes []builder.Node, opts map[string]build.Options, progress progress.Writer, generateResult bool) (*client.SolveResponse, *build.ResultHandle, error) {
|
|
||||||
var res *build.ResultHandle
|
|
||||||
var resp map[string]*client.SolveResponse
|
|
||||||
var err error
|
|
||||||
if generateResult {
|
|
||||||
var mu sync.Mutex
|
|
||||||
var idx int
|
|
||||||
resp, err = build.BuildWithResultHandler(ctx, nodes, opts, dockerutil.NewClient(dockerCli), confutil.ConfigDir(dockerCli), progress, func(driverIndex int, gotRes *build.ResultHandle) {
|
|
||||||
mu.Lock()
|
|
||||||
defer mu.Unlock()
|
|
||||||
if res == nil || driverIndex < idx {
|
|
||||||
idx, res = driverIndex, gotRes
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
resp, err = build.Build(ctx, nodes, opts, dockerutil.NewClient(dockerCli), confutil.ConfigDir(dockerCli), progress)
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
return nil, res, err
|
|
||||||
}
|
|
||||||
return resp[defaultTargetName], res, err
|
|
||||||
}
|
|
||||||
|
|
||||||
func wrapBuildError(err error, bake bool) error {
|
|
||||||
if err == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
st, ok := grpcerrors.AsGRPCStatus(err)
|
|
||||||
if ok {
|
|
||||||
if st.Code() == codes.Unimplemented && strings.Contains(st.Message(), "unsupported frontend capability moby.buildkit.frontend.contexts") {
|
|
||||||
msg := "current frontend does not support --build-context."
|
|
||||||
if bake {
|
|
||||||
msg = "current frontend does not support defining additional contexts for targets."
|
|
||||||
}
|
|
||||||
msg += " Named contexts are supported since Dockerfile v1.4. Use #syntax directive in Dockerfile or update to latest BuildKit."
|
|
||||||
return &wrapped{err, msg}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
type wrapped struct {
|
|
||||||
err error
|
|
||||||
msg string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *wrapped) Error() string {
|
|
||||||
return w.msg
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *wrapped) Unwrap() error {
|
|
||||||
return w.err
|
|
||||||
}
|
|
||||||
|
|
||||||
func updateLastActivity(dockerCli command.Cli, ng *store.NodeGroup) error {
|
|
||||||
txn, release, err := storeutil.GetStore(dockerCli)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer release()
|
|
||||||
return txn.UpdateLastActivity(ng)
|
|
||||||
}
|
|
||||||
|
|
||||||
func controllerUlimitOpt2DockerUlimit(u *controllerapi.UlimitOpt) *dockeropts.UlimitOpt {
|
|
||||||
if u == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
values := make(map[string]*units.Ulimit)
|
|
||||||
for k, v := range u.Values {
|
|
||||||
values[k] = &units.Ulimit{
|
|
||||||
Name: v.Name,
|
|
||||||
Hard: v.Hard,
|
|
||||||
Soft: v.Soft,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return dockeropts.NewUlimitOpt(&values)
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
package control
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io"
|
|
||||||
|
|
||||||
controllerapi "github.com/docker/buildx/controller/pb"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
)
|
|
||||||
|
|
||||||
type BuildxController interface {
|
|
||||||
Build(ctx context.Context, options controllerapi.BuildOptions, in io.ReadCloser, progress progress.Writer) (ref string, resp *client.SolveResponse, err error)
|
|
||||||
// Invoke starts an IO session into the specified process.
|
|
||||||
// If pid doesn't matche to any running processes, it starts a new process with the specified config.
|
|
||||||
// If there is no container running or InvokeConfig.Rollback is speicfied, the process will start in a newly created container.
|
|
||||||
// NOTE: If needed, in the future, we can split this API into three APIs (NewContainer, NewProcess and Attach).
|
|
||||||
Invoke(ctx context.Context, ref, pid string, options controllerapi.InvokeConfig, ioIn io.ReadCloser, ioOut io.WriteCloser, ioErr io.WriteCloser) error
|
|
||||||
Kill(ctx context.Context) error
|
|
||||||
Close() error
|
|
||||||
List(ctx context.Context) (refs []string, _ error)
|
|
||||||
Disconnect(ctx context.Context, ref string) error
|
|
||||||
ListProcesses(ctx context.Context, ref string) (infos []*controllerapi.ProcessInfo, retErr error)
|
|
||||||
DisconnectProcess(ctx context.Context, ref, pid string) error
|
|
||||||
Inspect(ctx context.Context, ref string) (*controllerapi.InspectResponse, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
type ControlOptions struct {
|
|
||||||
ServerConfig string
|
|
||||||
Root string
|
|
||||||
Detach bool
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
package controller
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/docker/buildx/controller/control"
|
|
||||||
"github.com/docker/buildx/controller/local"
|
|
||||||
"github.com/docker/buildx/controller/remote"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/docker/cli/cli/command"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
func NewController(ctx context.Context, opts control.ControlOptions, dockerCli command.Cli, pw progress.Writer) (control.BuildxController, error) {
|
|
||||||
var name string
|
|
||||||
if opts.Detach {
|
|
||||||
name = "remote"
|
|
||||||
} else {
|
|
||||||
name = "local"
|
|
||||||
}
|
|
||||||
|
|
||||||
var c control.BuildxController
|
|
||||||
err := progress.Wrap(fmt.Sprintf("[internal] connecting to %s controller", name), pw.Write, func(l progress.SubLogger) (err error) {
|
|
||||||
if opts.Detach {
|
|
||||||
c, err = remote.NewRemoteBuildxController(ctx, dockerCli, opts, l)
|
|
||||||
} else {
|
|
||||||
c = local.NewLocalBuildxController(ctx, dockerCli, l)
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrap(err, "failed to start buildx controller")
|
|
||||||
}
|
|
||||||
return c, nil
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
package errdefs
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/containerd/typeurl/v2"
|
|
||||||
"github.com/moby/buildkit/util/grpcerrors"
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
typeurl.Register((*Build)(nil), "github.com/docker/buildx", "errdefs.Build+json")
|
|
||||||
}
|
|
||||||
|
|
||||||
type BuildError struct {
|
|
||||||
Build
|
|
||||||
error
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *BuildError) Unwrap() error {
|
|
||||||
return e.error
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *BuildError) ToProto() grpcerrors.TypedErrorProto {
|
|
||||||
return &e.Build
|
|
||||||
}
|
|
||||||
|
|
||||||
func WrapBuild(err error, ref string) error {
|
|
||||||
if err == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return &BuildError{Build: Build{Ref: ref}, error: err}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *Build) WrapError(err error) error {
|
|
||||||
return &BuildError{error: err, Build: *b}
|
|
||||||
}
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
// Code generated by protoc-gen-gogo. DO NOT EDIT.
|
|
||||||
// source: errdefs.proto
|
|
||||||
|
|
||||||
package errdefs
|
|
||||||
|
|
||||||
import (
|
|
||||||
fmt "fmt"
|
|
||||||
proto "github.com/gogo/protobuf/proto"
|
|
||||||
_ "github.com/moby/buildkit/solver/pb"
|
|
||||||
math "math"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Reference imports to suppress errors if they are not otherwise used.
|
|
||||||
var _ = proto.Marshal
|
|
||||||
var _ = fmt.Errorf
|
|
||||||
var _ = math.Inf
|
|
||||||
|
|
||||||
// This is a compile-time assertion to ensure that this generated file
|
|
||||||
// is compatible with the proto package it is being compiled against.
|
|
||||||
// A compilation error at this line likely means your copy of the
|
|
||||||
// proto package needs to be updated.
|
|
||||||
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
|
|
||||||
|
|
||||||
type Build struct {
|
|
||||||
Ref string `protobuf:"bytes,1,opt,name=Ref,proto3" json:"Ref,omitempty"`
|
|
||||||
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
|
||||||
XXX_unrecognized []byte `json:"-"`
|
|
||||||
XXX_sizecache int32 `json:"-"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Build) Reset() { *m = Build{} }
|
|
||||||
func (m *Build) String() string { return proto.CompactTextString(m) }
|
|
||||||
func (*Build) ProtoMessage() {}
|
|
||||||
func (*Build) Descriptor() ([]byte, []int) {
|
|
||||||
return fileDescriptor_689dc58a5060aff5, []int{0}
|
|
||||||
}
|
|
||||||
func (m *Build) XXX_Unmarshal(b []byte) error {
|
|
||||||
return xxx_messageInfo_Build.Unmarshal(m, b)
|
|
||||||
}
|
|
||||||
func (m *Build) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
|
|
||||||
return xxx_messageInfo_Build.Marshal(b, m, deterministic)
|
|
||||||
}
|
|
||||||
func (m *Build) XXX_Merge(src proto.Message) {
|
|
||||||
xxx_messageInfo_Build.Merge(m, src)
|
|
||||||
}
|
|
||||||
func (m *Build) XXX_Size() int {
|
|
||||||
return xxx_messageInfo_Build.Size(m)
|
|
||||||
}
|
|
||||||
func (m *Build) XXX_DiscardUnknown() {
|
|
||||||
xxx_messageInfo_Build.DiscardUnknown(m)
|
|
||||||
}
|
|
||||||
|
|
||||||
var xxx_messageInfo_Build proto.InternalMessageInfo
|
|
||||||
|
|
||||||
func (m *Build) GetRef() string {
|
|
||||||
if m != nil {
|
|
||||||
return m.Ref
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
proto.RegisterType((*Build)(nil), "errdefs.Build")
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() { proto.RegisterFile("errdefs.proto", fileDescriptor_689dc58a5060aff5) }
|
|
||||||
|
|
||||||
var fileDescriptor_689dc58a5060aff5 = []byte{
|
|
||||||
// 111 bytes of a gzipped FileDescriptorProto
|
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4d, 0x2d, 0x2a, 0x4a,
|
|
||||||
0x49, 0x4d, 0x2b, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x87, 0x72, 0xa5, 0x74, 0xd2,
|
|
||||||
0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x73, 0xf3, 0x93, 0x2a, 0xf5, 0x93,
|
|
||||||
0x4a, 0x33, 0x73, 0x52, 0xb2, 0x33, 0x4b, 0xf4, 0x8b, 0xf3, 0x73, 0xca, 0x52, 0x8b, 0xf4, 0x0b,
|
|
||||||
0x92, 0xf4, 0xf3, 0x0b, 0xa0, 0xda, 0x94, 0x24, 0xb9, 0x58, 0x9d, 0x40, 0xf2, 0x42, 0x02, 0x5c,
|
|
||||||
0xcc, 0x41, 0xa9, 0x69, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x20, 0x66, 0x12, 0x1b, 0x58,
|
|
||||||
0x85, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x56, 0x52, 0x41, 0x91, 0x69, 0x00, 0x00, 0x00,
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
syntax = "proto3";
|
|
||||||
|
|
||||||
package errdefs;
|
|
||||||
|
|
||||||
import "github.com/moby/buildkit/solver/pb/ops.proto";
|
|
||||||
|
|
||||||
message Build {
|
|
||||||
string Ref = 1;
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
package errdefs
|
|
||||||
|
|
||||||
//go:generate protoc -I=. -I=../../vendor/ --gogo_out=plugins=grpc:. errdefs.proto
|
|
||||||
@@ -1,146 +0,0 @@
|
|||||||
package local
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io"
|
|
||||||
"sync/atomic"
|
|
||||||
|
|
||||||
"github.com/docker/buildx/build"
|
|
||||||
cbuild "github.com/docker/buildx/controller/build"
|
|
||||||
"github.com/docker/buildx/controller/control"
|
|
||||||
controllererrors "github.com/docker/buildx/controller/errdefs"
|
|
||||||
controllerapi "github.com/docker/buildx/controller/pb"
|
|
||||||
"github.com/docker/buildx/controller/processes"
|
|
||||||
"github.com/docker/buildx/util/ioset"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/docker/cli/cli/command"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
func NewLocalBuildxController(ctx context.Context, dockerCli command.Cli, logger progress.SubLogger) control.BuildxController {
|
|
||||||
return &localController{
|
|
||||||
dockerCli: dockerCli,
|
|
||||||
ref: "local",
|
|
||||||
processes: processes.NewManager(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type buildConfig struct {
|
|
||||||
// TODO: these two structs should be merged
|
|
||||||
// Discussion: https://github.com/docker/buildx/pull/1640#discussion_r1113279719
|
|
||||||
resultCtx *build.ResultHandle
|
|
||||||
buildOptions *controllerapi.BuildOptions
|
|
||||||
}
|
|
||||||
|
|
||||||
type localController struct {
|
|
||||||
dockerCli command.Cli
|
|
||||||
ref string
|
|
||||||
buildConfig buildConfig
|
|
||||||
processes *processes.Manager
|
|
||||||
|
|
||||||
buildOnGoing atomic.Bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *localController) Build(ctx context.Context, options controllerapi.BuildOptions, in io.ReadCloser, progress progress.Writer) (string, *client.SolveResponse, error) {
|
|
||||||
if !b.buildOnGoing.CompareAndSwap(false, true) {
|
|
||||||
return "", nil, errors.New("build ongoing")
|
|
||||||
}
|
|
||||||
defer b.buildOnGoing.Store(false)
|
|
||||||
|
|
||||||
resp, res, buildErr := cbuild.RunBuild(ctx, b.dockerCli, options, in, progress, true)
|
|
||||||
// NOTE: RunBuild can return *build.ResultHandle even on error.
|
|
||||||
if res != nil {
|
|
||||||
b.buildConfig = buildConfig{
|
|
||||||
resultCtx: res,
|
|
||||||
buildOptions: &options,
|
|
||||||
}
|
|
||||||
if buildErr != nil {
|
|
||||||
buildErr = controllererrors.WrapBuild(buildErr, b.ref)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if buildErr != nil {
|
|
||||||
return "", nil, buildErr
|
|
||||||
}
|
|
||||||
return b.ref, resp, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *localController) ListProcesses(ctx context.Context, ref string) (infos []*controllerapi.ProcessInfo, retErr error) {
|
|
||||||
if ref != b.ref {
|
|
||||||
return nil, errors.Errorf("unknown ref %q", ref)
|
|
||||||
}
|
|
||||||
return b.processes.ListProcesses(), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *localController) DisconnectProcess(ctx context.Context, ref, pid string) error {
|
|
||||||
if ref != b.ref {
|
|
||||||
return errors.Errorf("unknown ref %q", ref)
|
|
||||||
}
|
|
||||||
return b.processes.DeleteProcess(pid)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *localController) cancelRunningProcesses() {
|
|
||||||
b.processes.CancelRunningProcesses()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *localController) Invoke(ctx context.Context, ref string, pid string, cfg controllerapi.InvokeConfig, ioIn io.ReadCloser, ioOut io.WriteCloser, ioErr io.WriteCloser) error {
|
|
||||||
if ref != b.ref {
|
|
||||||
return errors.Errorf("unknown ref %q", ref)
|
|
||||||
}
|
|
||||||
|
|
||||||
proc, ok := b.processes.Get(pid)
|
|
||||||
if !ok {
|
|
||||||
// Start a new process.
|
|
||||||
if b.buildConfig.resultCtx == nil {
|
|
||||||
return errors.New("no build result is registered")
|
|
||||||
}
|
|
||||||
var err error
|
|
||||||
proc, err = b.processes.StartProcess(pid, b.buildConfig.resultCtx, &cfg)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Attach containerIn to this process
|
|
||||||
ioCancelledCh := make(chan struct{})
|
|
||||||
proc.ForwardIO(&ioset.In{Stdin: ioIn, Stdout: ioOut, Stderr: ioErr}, func() { close(ioCancelledCh) })
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-ioCancelledCh:
|
|
||||||
return errors.Errorf("io cancelled")
|
|
||||||
case err := <-proc.Done():
|
|
||||||
return err
|
|
||||||
case <-ctx.Done():
|
|
||||||
return ctx.Err()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *localController) Kill(context.Context) error {
|
|
||||||
b.Close()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *localController) Close() error {
|
|
||||||
b.cancelRunningProcesses()
|
|
||||||
if b.buildConfig.resultCtx != nil {
|
|
||||||
b.buildConfig.resultCtx.Done()
|
|
||||||
}
|
|
||||||
// TODO: cancel ongoing builds?
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *localController) List(ctx context.Context) (res []string, _ error) {
|
|
||||||
return []string{b.ref}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *localController) Disconnect(ctx context.Context, key string) error {
|
|
||||||
b.Close()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *localController) Inspect(ctx context.Context, ref string) (*controllerapi.InspectResponse, error) {
|
|
||||||
if ref != b.ref {
|
|
||||||
return nil, errors.Errorf("unknown ref %q", ref)
|
|
||||||
}
|
|
||||||
return &controllerapi.InspectResponse{Options: b.buildConfig.buildOptions}, nil
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
package pb
|
|
||||||
|
|
||||||
func CreateAttestations(attests []*Attest) map[string]*string {
|
|
||||||
result := map[string]*string{}
|
|
||||||
for _, attest := range attests {
|
|
||||||
// ignore duplicates
|
|
||||||
if _, ok := result[attest.Type]; ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if attest.Disabled {
|
|
||||||
result[attest.Type] = nil
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
attrs := attest.Attrs
|
|
||||||
result[attest.Type] = &attrs
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
package pb
|
|
||||||
|
|
||||||
import "github.com/moby/buildkit/client"
|
|
||||||
|
|
||||||
func CreateCaches(entries []*CacheOptionsEntry) []client.CacheOptionsEntry {
|
|
||||||
var outs []client.CacheOptionsEntry
|
|
||||||
if len(entries) == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
for _, entry := range entries {
|
|
||||||
out := client.CacheOptionsEntry{
|
|
||||||
Type: entry.Type,
|
|
||||||
Attrs: map[string]string{},
|
|
||||||
}
|
|
||||||
for k, v := range entry.Attrs {
|
|
||||||
out.Attrs[k] = v
|
|
||||||
}
|
|
||||||
outs = append(outs, out)
|
|
||||||
}
|
|
||||||
return outs
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,248 +0,0 @@
|
|||||||
syntax = "proto3";
|
|
||||||
|
|
||||||
package buildx.controller.v1;
|
|
||||||
|
|
||||||
import "github.com/moby/buildkit/api/services/control/control.proto";
|
|
||||||
import "github.com/moby/buildkit/sourcepolicy/pb/policy.proto";
|
|
||||||
|
|
||||||
option go_package = "pb";
|
|
||||||
|
|
||||||
service Controller {
|
|
||||||
rpc Build(BuildRequest) returns (BuildResponse);
|
|
||||||
rpc Inspect(InspectRequest) returns (InspectResponse);
|
|
||||||
rpc Status(StatusRequest) returns (stream StatusResponse);
|
|
||||||
rpc Input(stream InputMessage) returns (InputResponse);
|
|
||||||
rpc Invoke(stream Message) returns (stream Message);
|
|
||||||
rpc List(ListRequest) returns (ListResponse);
|
|
||||||
rpc Disconnect(DisconnectRequest) returns (DisconnectResponse);
|
|
||||||
rpc Info(InfoRequest) returns (InfoResponse);
|
|
||||||
rpc ListProcesses(ListProcessesRequest) returns (ListProcessesResponse);
|
|
||||||
rpc DisconnectProcess(DisconnectProcessRequest) returns (DisconnectProcessResponse);
|
|
||||||
}
|
|
||||||
|
|
||||||
message ListProcessesRequest {
|
|
||||||
string Ref = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message ListProcessesResponse {
|
|
||||||
repeated ProcessInfo Infos = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message ProcessInfo {
|
|
||||||
string ProcessID = 1;
|
|
||||||
InvokeConfig InvokeConfig = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
message DisconnectProcessRequest {
|
|
||||||
string Ref = 1;
|
|
||||||
string ProcessID = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
message DisconnectProcessResponse {
|
|
||||||
}
|
|
||||||
|
|
||||||
message BuildRequest {
|
|
||||||
string Ref = 1;
|
|
||||||
BuildOptions Options = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
message BuildOptions {
|
|
||||||
string ContextPath = 1;
|
|
||||||
string DockerfileName = 2;
|
|
||||||
PrintFunc PrintFunc = 3;
|
|
||||||
map<string, string> NamedContexts = 4;
|
|
||||||
|
|
||||||
repeated string Allow = 5;
|
|
||||||
repeated Attest Attests = 6;
|
|
||||||
map<string, string> BuildArgs = 7;
|
|
||||||
repeated CacheOptionsEntry CacheFrom = 8;
|
|
||||||
repeated CacheOptionsEntry CacheTo = 9;
|
|
||||||
string CgroupParent = 10;
|
|
||||||
repeated ExportEntry Exports = 11;
|
|
||||||
repeated string ExtraHosts = 12;
|
|
||||||
map<string, string> Labels = 13;
|
|
||||||
string NetworkMode = 14;
|
|
||||||
repeated string NoCacheFilter = 15;
|
|
||||||
repeated string Platforms = 16;
|
|
||||||
repeated Secret Secrets = 17;
|
|
||||||
int64 ShmSize = 18;
|
|
||||||
repeated SSH SSH = 19;
|
|
||||||
repeated string Tags = 20;
|
|
||||||
string Target = 21;
|
|
||||||
UlimitOpt Ulimits = 22;
|
|
||||||
|
|
||||||
string Builder = 23;
|
|
||||||
bool NoCache = 24;
|
|
||||||
bool Pull = 25;
|
|
||||||
bool ExportPush = 26;
|
|
||||||
bool ExportLoad = 27;
|
|
||||||
moby.buildkit.v1.sourcepolicy.Policy SourcePolicy = 28;
|
|
||||||
string Ref = 29;
|
|
||||||
string GroupRef = 30;
|
|
||||||
repeated string Annotations = 31;
|
|
||||||
}
|
|
||||||
|
|
||||||
message ExportEntry {
|
|
||||||
string Type = 1;
|
|
||||||
map<string, string> Attrs = 2;
|
|
||||||
string Destination = 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
message CacheOptionsEntry {
|
|
||||||
string Type = 1;
|
|
||||||
map<string, string> Attrs = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
message Attest {
|
|
||||||
string Type = 1;
|
|
||||||
bool Disabled = 2;
|
|
||||||
string Attrs = 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
message SSH {
|
|
||||||
string ID = 1;
|
|
||||||
repeated string Paths = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
message Secret {
|
|
||||||
string ID = 1;
|
|
||||||
string FilePath = 2;
|
|
||||||
string Env = 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
message PrintFunc {
|
|
||||||
string Name = 1;
|
|
||||||
string Format = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
message InspectRequest {
|
|
||||||
string Ref = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message InspectResponse {
|
|
||||||
BuildOptions Options = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message UlimitOpt {
|
|
||||||
map<string, Ulimit> values = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message Ulimit {
|
|
||||||
string Name = 1;
|
|
||||||
int64 Hard = 2;
|
|
||||||
int64 Soft = 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
message BuildResponse {
|
|
||||||
map<string, string> ExporterResponse = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message DisconnectRequest {
|
|
||||||
string Ref = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message DisconnectResponse {}
|
|
||||||
|
|
||||||
message ListRequest {
|
|
||||||
string Ref = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message ListResponse {
|
|
||||||
repeated string keys = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message InputMessage {
|
|
||||||
oneof Input {
|
|
||||||
InputInitMessage Init = 1;
|
|
||||||
DataMessage Data = 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
message InputInitMessage {
|
|
||||||
string Ref = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message DataMessage {
|
|
||||||
bool EOF = 1; // true if eof was reached
|
|
||||||
bytes Data = 2; // should be chunked smaller than 4MB:
|
|
||||||
// https://pkg.go.dev/google.golang.org/grpc#MaxRecvMsgSize
|
|
||||||
}
|
|
||||||
|
|
||||||
message InputResponse {}
|
|
||||||
|
|
||||||
message Message {
|
|
||||||
oneof Input {
|
|
||||||
InitMessage Init = 1;
|
|
||||||
// FdMessage used from client to server for input (stdin) and
|
|
||||||
// from server to client for output (stdout, stderr)
|
|
||||||
FdMessage File = 2;
|
|
||||||
// ResizeMessage used from client to server for terminal resize events
|
|
||||||
ResizeMessage Resize = 3;
|
|
||||||
// SignalMessage is used from client to server to send signal events
|
|
||||||
SignalMessage Signal = 4;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
message InitMessage {
|
|
||||||
string Ref = 1;
|
|
||||||
|
|
||||||
// If ProcessID already exists in the server, it tries to connect to it
|
|
||||||
// instead of invoking the new one. In this case, InvokeConfig will be ignored.
|
|
||||||
string ProcessID = 2;
|
|
||||||
InvokeConfig InvokeConfig = 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
message InvokeConfig {
|
|
||||||
repeated string Entrypoint = 1;
|
|
||||||
repeated string Cmd = 2;
|
|
||||||
bool NoCmd = 11; // Do not set cmd but use the image's default
|
|
||||||
repeated string Env = 3;
|
|
||||||
string User = 4;
|
|
||||||
bool NoUser = 5; // Do not set user but use the image's default
|
|
||||||
string Cwd = 6;
|
|
||||||
bool NoCwd = 7; // Do not set cwd but use the image's default
|
|
||||||
bool Tty = 8;
|
|
||||||
bool Rollback = 9; // Kill all process in the container and recreate it.
|
|
||||||
bool Initial = 10; // Run container from the initial state of that stage (supported only on the failed step)
|
|
||||||
}
|
|
||||||
|
|
||||||
message FdMessage {
|
|
||||||
uint32 Fd = 1; // what fd the data was from
|
|
||||||
bool EOF = 2; // true if eof was reached
|
|
||||||
bytes Data = 3; // should be chunked smaller than 4MB:
|
|
||||||
// https://pkg.go.dev/google.golang.org/grpc#MaxRecvMsgSize
|
|
||||||
}
|
|
||||||
|
|
||||||
message ResizeMessage {
|
|
||||||
uint32 Rows = 1;
|
|
||||||
uint32 Cols = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
message SignalMessage {
|
|
||||||
// we only send name (ie HUP, INT) because the int values
|
|
||||||
// are platform dependent.
|
|
||||||
string Name = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message StatusRequest {
|
|
||||||
string Ref = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message StatusResponse {
|
|
||||||
repeated moby.buildkit.v1.Vertex vertexes = 1;
|
|
||||||
repeated moby.buildkit.v1.VertexStatus statuses = 2;
|
|
||||||
repeated moby.buildkit.v1.VertexLog logs = 3;
|
|
||||||
repeated moby.buildkit.v1.VertexWarning warnings = 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
message InfoRequest {}
|
|
||||||
|
|
||||||
message InfoResponse {
|
|
||||||
BuildxVersion buildxVersion = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message BuildxVersion {
|
|
||||||
string package = 1;
|
|
||||||
string version = 2;
|
|
||||||
string revision = 3;
|
|
||||||
}
|
|
||||||
@@ -1,105 +0,0 @@
|
|||||||
package pb
|
|
||||||
|
|
||||||
import (
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"strconv"
|
|
||||||
|
|
||||||
"github.com/containerd/console"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
func CreateExports(entries []*ExportEntry) ([]client.ExportEntry, error) {
|
|
||||||
var outs []client.ExportEntry
|
|
||||||
if len(entries) == 0 {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
var stdoutUsed bool
|
|
||||||
for _, entry := range entries {
|
|
||||||
if entry.Type == "" {
|
|
||||||
return nil, errors.Errorf("type is required for output")
|
|
||||||
}
|
|
||||||
|
|
||||||
out := client.ExportEntry{
|
|
||||||
Type: entry.Type,
|
|
||||||
Attrs: map[string]string{},
|
|
||||||
}
|
|
||||||
for k, v := range entry.Attrs {
|
|
||||||
out.Attrs[k] = v
|
|
||||||
}
|
|
||||||
|
|
||||||
supportFile := false
|
|
||||||
supportDir := false
|
|
||||||
switch out.Type {
|
|
||||||
case client.ExporterLocal:
|
|
||||||
supportDir = true
|
|
||||||
case client.ExporterTar:
|
|
||||||
supportFile = true
|
|
||||||
case client.ExporterOCI, client.ExporterDocker:
|
|
||||||
tar, err := strconv.ParseBool(out.Attrs["tar"])
|
|
||||||
if err != nil {
|
|
||||||
tar = true
|
|
||||||
}
|
|
||||||
supportFile = tar
|
|
||||||
supportDir = !tar
|
|
||||||
case "registry":
|
|
||||||
out.Type = client.ExporterImage
|
|
||||||
}
|
|
||||||
|
|
||||||
if supportDir {
|
|
||||||
if entry.Destination == "" {
|
|
||||||
return nil, errors.Errorf("dest is required for %s exporter", out.Type)
|
|
||||||
}
|
|
||||||
if entry.Destination == "-" {
|
|
||||||
return nil, errors.Errorf("dest cannot be stdout for %s exporter", out.Type)
|
|
||||||
}
|
|
||||||
|
|
||||||
fi, err := os.Stat(entry.Destination)
|
|
||||||
if err != nil && !os.IsNotExist(err) {
|
|
||||||
return nil, errors.Wrapf(err, "invalid destination directory: %s", entry.Destination)
|
|
||||||
}
|
|
||||||
if err == nil && !fi.IsDir() {
|
|
||||||
return nil, errors.Errorf("destination directory %s is a file", entry.Destination)
|
|
||||||
}
|
|
||||||
out.OutputDir = entry.Destination
|
|
||||||
}
|
|
||||||
if supportFile {
|
|
||||||
if entry.Destination == "" && out.Type != client.ExporterDocker {
|
|
||||||
entry.Destination = "-"
|
|
||||||
}
|
|
||||||
if entry.Destination == "-" {
|
|
||||||
if stdoutUsed {
|
|
||||||
return nil, errors.Errorf("multiple outputs configured to write to stdout")
|
|
||||||
}
|
|
||||||
if _, err := console.ConsoleFromFile(os.Stdout); err == nil {
|
|
||||||
return nil, errors.Errorf("dest file is required for %s exporter. refusing to write to console", out.Type)
|
|
||||||
}
|
|
||||||
out.Output = wrapWriteCloser(os.Stdout)
|
|
||||||
stdoutUsed = true
|
|
||||||
} else if entry.Destination != "" {
|
|
||||||
fi, err := os.Stat(entry.Destination)
|
|
||||||
if err != nil && !os.IsNotExist(err) {
|
|
||||||
return nil, errors.Wrapf(err, "invalid destination file: %s", entry.Destination)
|
|
||||||
}
|
|
||||||
if err == nil && fi.IsDir() {
|
|
||||||
return nil, errors.Errorf("destination file %s is a directory", entry.Destination)
|
|
||||||
}
|
|
||||||
f, err := os.Create(entry.Destination)
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Errorf("failed to open %s", err)
|
|
||||||
}
|
|
||||||
out.Output = wrapWriteCloser(f)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
outs = append(outs, out)
|
|
||||||
}
|
|
||||||
return outs, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func wrapWriteCloser(wc io.WriteCloser) func(map[string]string) (io.WriteCloser, error) {
|
|
||||||
return func(map[string]string) (io.WriteCloser, error) {
|
|
||||||
return wc, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
package pb
|
|
||||||
|
|
||||||
//go:generate protoc -I=. -I=../../vendor/ --gogo_out=plugins=grpc:. controller.proto
|
|
||||||
@@ -1,175 +0,0 @@
|
|||||||
package pb
|
|
||||||
|
|
||||||
import (
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/docker/docker/builder/remotecontext/urlutil"
|
|
||||||
"github.com/moby/buildkit/util/gitutil"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ResolveOptionPaths resolves all paths contained in BuildOptions
|
|
||||||
// and replaces them to absolute paths.
|
|
||||||
func ResolveOptionPaths(options *BuildOptions) (_ *BuildOptions, err error) {
|
|
||||||
localContext := false
|
|
||||||
if options.ContextPath != "" && options.ContextPath != "-" {
|
|
||||||
if !isRemoteURL(options.ContextPath) {
|
|
||||||
localContext = true
|
|
||||||
options.ContextPath, err = filepath.Abs(options.ContextPath)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if options.DockerfileName != "" && options.DockerfileName != "-" {
|
|
||||||
if localContext && !urlutil.IsURL(options.DockerfileName) {
|
|
||||||
options.DockerfileName, err = filepath.Abs(options.DockerfileName)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var contexts map[string]string
|
|
||||||
for k, v := range options.NamedContexts {
|
|
||||||
if isRemoteURL(v) || strings.HasPrefix(v, "docker-image://") {
|
|
||||||
// url prefix, this is a remote path
|
|
||||||
} else if strings.HasPrefix(v, "oci-layout://") {
|
|
||||||
// oci layout prefix, this is a local path
|
|
||||||
p := strings.TrimPrefix(v, "oci-layout://")
|
|
||||||
p, err = filepath.Abs(p)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
v = "oci-layout://" + p
|
|
||||||
} else {
|
|
||||||
// no prefix, assume local path
|
|
||||||
v, err = filepath.Abs(v)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if contexts == nil {
|
|
||||||
contexts = make(map[string]string)
|
|
||||||
}
|
|
||||||
contexts[k] = v
|
|
||||||
}
|
|
||||||
options.NamedContexts = contexts
|
|
||||||
|
|
||||||
var cacheFrom []*CacheOptionsEntry
|
|
||||||
for _, co := range options.CacheFrom {
|
|
||||||
switch co.Type {
|
|
||||||
case "local":
|
|
||||||
var attrs map[string]string
|
|
||||||
for k, v := range co.Attrs {
|
|
||||||
if attrs == nil {
|
|
||||||
attrs = make(map[string]string)
|
|
||||||
}
|
|
||||||
switch k {
|
|
||||||
case "src":
|
|
||||||
p := v
|
|
||||||
if p != "" {
|
|
||||||
p, err = filepath.Abs(p)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
attrs[k] = p
|
|
||||||
default:
|
|
||||||
attrs[k] = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
co.Attrs = attrs
|
|
||||||
cacheFrom = append(cacheFrom, co)
|
|
||||||
default:
|
|
||||||
cacheFrom = append(cacheFrom, co)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
options.CacheFrom = cacheFrom
|
|
||||||
|
|
||||||
var cacheTo []*CacheOptionsEntry
|
|
||||||
for _, co := range options.CacheTo {
|
|
||||||
switch co.Type {
|
|
||||||
case "local":
|
|
||||||
var attrs map[string]string
|
|
||||||
for k, v := range co.Attrs {
|
|
||||||
if attrs == nil {
|
|
||||||
attrs = make(map[string]string)
|
|
||||||
}
|
|
||||||
switch k {
|
|
||||||
case "dest":
|
|
||||||
p := v
|
|
||||||
if p != "" {
|
|
||||||
p, err = filepath.Abs(p)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
attrs[k] = p
|
|
||||||
default:
|
|
||||||
attrs[k] = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
co.Attrs = attrs
|
|
||||||
cacheTo = append(cacheTo, co)
|
|
||||||
default:
|
|
||||||
cacheTo = append(cacheTo, co)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
options.CacheTo = cacheTo
|
|
||||||
var exports []*ExportEntry
|
|
||||||
for _, e := range options.Exports {
|
|
||||||
if e.Destination != "" && e.Destination != "-" {
|
|
||||||
e.Destination, err = filepath.Abs(e.Destination)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
exports = append(exports, e)
|
|
||||||
}
|
|
||||||
options.Exports = exports
|
|
||||||
|
|
||||||
var secrets []*Secret
|
|
||||||
for _, s := range options.Secrets {
|
|
||||||
if s.FilePath != "" {
|
|
||||||
s.FilePath, err = filepath.Abs(s.FilePath)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
secrets = append(secrets, s)
|
|
||||||
}
|
|
||||||
options.Secrets = secrets
|
|
||||||
|
|
||||||
var ssh []*SSH
|
|
||||||
for _, s := range options.SSH {
|
|
||||||
var ps []string
|
|
||||||
for _, pt := range s.Paths {
|
|
||||||
p := pt
|
|
||||||
if p != "" {
|
|
||||||
p, err = filepath.Abs(p)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ps = append(ps, p)
|
|
||||||
|
|
||||||
}
|
|
||||||
s.Paths = ps
|
|
||||||
ssh = append(ssh, s)
|
|
||||||
}
|
|
||||||
options.SSH = ssh
|
|
||||||
|
|
||||||
return options, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func isRemoteURL(c string) bool {
|
|
||||||
if urlutil.IsURL(c) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
if _, err := gitutil.ParseGitRef(c); err == nil {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
@@ -1,248 +0,0 @@
|
|||||||
package pb
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"reflect"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestResolvePaths(t *testing.T) {
|
|
||||||
tmpwd, err := os.MkdirTemp("", "testresolvepaths")
|
|
||||||
require.NoError(t, err)
|
|
||||||
defer os.Remove(tmpwd)
|
|
||||||
require.NoError(t, os.Chdir(tmpwd))
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
options BuildOptions
|
|
||||||
want BuildOptions
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "contextpath",
|
|
||||||
options: BuildOptions{ContextPath: "test"},
|
|
||||||
want: BuildOptions{ContextPath: filepath.Join(tmpwd, "test")},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "contextpath-cwd",
|
|
||||||
options: BuildOptions{ContextPath: "."},
|
|
||||||
want: BuildOptions{ContextPath: tmpwd},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "contextpath-dash",
|
|
||||||
options: BuildOptions{ContextPath: "-"},
|
|
||||||
want: BuildOptions{ContextPath: "-"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "contextpath-ssh",
|
|
||||||
options: BuildOptions{ContextPath: "git@github.com:docker/buildx.git"},
|
|
||||||
want: BuildOptions{ContextPath: "git@github.com:docker/buildx.git"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "dockerfilename",
|
|
||||||
options: BuildOptions{DockerfileName: "test", ContextPath: "."},
|
|
||||||
want: BuildOptions{DockerfileName: filepath.Join(tmpwd, "test"), ContextPath: tmpwd},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "dockerfilename-dash",
|
|
||||||
options: BuildOptions{DockerfileName: "-", ContextPath: "."},
|
|
||||||
want: BuildOptions{DockerfileName: "-", ContextPath: tmpwd},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "dockerfilename-remote",
|
|
||||||
options: BuildOptions{DockerfileName: "test", ContextPath: "git@github.com:docker/buildx.git"},
|
|
||||||
want: BuildOptions{DockerfileName: "test", ContextPath: "git@github.com:docker/buildx.git"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "contexts",
|
|
||||||
options: BuildOptions{NamedContexts: map[string]string{"a": "test1", "b": "test2",
|
|
||||||
"alpine": "docker-image://alpine@sha256:0123456789", "project": "https://github.com/myuser/project.git"}},
|
|
||||||
want: BuildOptions{NamedContexts: map[string]string{"a": filepath.Join(tmpwd, "test1"), "b": filepath.Join(tmpwd, "test2"),
|
|
||||||
"alpine": "docker-image://alpine@sha256:0123456789", "project": "https://github.com/myuser/project.git"}},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "cache-from",
|
|
||||||
options: BuildOptions{
|
|
||||||
CacheFrom: []*CacheOptionsEntry{
|
|
||||||
{
|
|
||||||
Type: "local",
|
|
||||||
Attrs: map[string]string{"src": "test"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "registry",
|
|
||||||
Attrs: map[string]string{"ref": "user/app"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
want: BuildOptions{
|
|
||||||
CacheFrom: []*CacheOptionsEntry{
|
|
||||||
{
|
|
||||||
Type: "local",
|
|
||||||
Attrs: map[string]string{"src": filepath.Join(tmpwd, "test")},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "registry",
|
|
||||||
Attrs: map[string]string{"ref": "user/app"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "cache-to",
|
|
||||||
options: BuildOptions{
|
|
||||||
CacheTo: []*CacheOptionsEntry{
|
|
||||||
{
|
|
||||||
Type: "local",
|
|
||||||
Attrs: map[string]string{"dest": "test"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "registry",
|
|
||||||
Attrs: map[string]string{"ref": "user/app"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
want: BuildOptions{
|
|
||||||
CacheTo: []*CacheOptionsEntry{
|
|
||||||
{
|
|
||||||
Type: "local",
|
|
||||||
Attrs: map[string]string{"dest": filepath.Join(tmpwd, "test")},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "registry",
|
|
||||||
Attrs: map[string]string{"ref": "user/app"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "exports",
|
|
||||||
options: BuildOptions{
|
|
||||||
Exports: []*ExportEntry{
|
|
||||||
{
|
|
||||||
Type: "local",
|
|
||||||
Destination: "-",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "local",
|
|
||||||
Destination: "test1",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "tar",
|
|
||||||
Destination: "test3",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "oci",
|
|
||||||
Destination: "-",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "docker",
|
|
||||||
Destination: "test4",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "image",
|
|
||||||
Attrs: map[string]string{"push": "true"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
want: BuildOptions{
|
|
||||||
Exports: []*ExportEntry{
|
|
||||||
{
|
|
||||||
Type: "local",
|
|
||||||
Destination: "-",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "local",
|
|
||||||
Destination: filepath.Join(tmpwd, "test1"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "tar",
|
|
||||||
Destination: filepath.Join(tmpwd, "test3"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "oci",
|
|
||||||
Destination: "-",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "docker",
|
|
||||||
Destination: filepath.Join(tmpwd, "test4"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: "image",
|
|
||||||
Attrs: map[string]string{"push": "true"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "secrets",
|
|
||||||
options: BuildOptions{
|
|
||||||
Secrets: []*Secret{
|
|
||||||
{
|
|
||||||
FilePath: "test1",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
ID: "val",
|
|
||||||
Env: "a",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
ID: "test",
|
|
||||||
FilePath: "test3",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
want: BuildOptions{
|
|
||||||
Secrets: []*Secret{
|
|
||||||
{
|
|
||||||
FilePath: filepath.Join(tmpwd, "test1"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
ID: "val",
|
|
||||||
Env: "a",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
ID: "test",
|
|
||||||
FilePath: filepath.Join(tmpwd, "test3"),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "ssh",
|
|
||||||
options: BuildOptions{
|
|
||||||
SSH: []*SSH{
|
|
||||||
{
|
|
||||||
ID: "default",
|
|
||||||
Paths: []string{"test1", "test2"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
ID: "a",
|
|
||||||
Paths: []string{"test3"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
want: BuildOptions{
|
|
||||||
SSH: []*SSH{
|
|
||||||
{
|
|
||||||
ID: "default",
|
|
||||||
Paths: []string{filepath.Join(tmpwd, "test1"), filepath.Join(tmpwd, "test2")},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
ID: "a",
|
|
||||||
Paths: []string{filepath.Join(tmpwd, "test3")},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
for _, tt := range tests {
|
|
||||||
tt := tt
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
got, err := ResolveOptionPaths(&tt.options)
|
|
||||||
require.NoError(t, err)
|
|
||||||
if !reflect.DeepEqual(tt.want, *got) {
|
|
||||||
t.Fatalf("expected %#v, got %#v", tt.want, *got)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,126 +0,0 @@
|
|||||||
package pb
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
control "github.com/moby/buildkit/api/services/control"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
"github.com/opencontainers/go-digest"
|
|
||||||
)
|
|
||||||
|
|
||||||
type writer struct {
|
|
||||||
ch chan<- *StatusResponse
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewProgressWriter(ch chan<- *StatusResponse) progress.Writer {
|
|
||||||
return &writer{ch: ch}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *writer) Write(status *client.SolveStatus) {
|
|
||||||
w.ch <- ToControlStatus(status)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *writer) WriteBuildRef(target string, ref string) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *writer) ValidateLogSource(digest.Digest, interface{}) bool {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *writer) ClearLogSource(interface{}) {}
|
|
||||||
|
|
||||||
func ToControlStatus(s *client.SolveStatus) *StatusResponse {
|
|
||||||
resp := StatusResponse{}
|
|
||||||
for _, v := range s.Vertexes {
|
|
||||||
resp.Vertexes = append(resp.Vertexes, &control.Vertex{
|
|
||||||
Digest: v.Digest,
|
|
||||||
Inputs: v.Inputs,
|
|
||||||
Name: v.Name,
|
|
||||||
Started: v.Started,
|
|
||||||
Completed: v.Completed,
|
|
||||||
Error: v.Error,
|
|
||||||
Cached: v.Cached,
|
|
||||||
ProgressGroup: v.ProgressGroup,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
for _, v := range s.Statuses {
|
|
||||||
resp.Statuses = append(resp.Statuses, &control.VertexStatus{
|
|
||||||
ID: v.ID,
|
|
||||||
Vertex: v.Vertex,
|
|
||||||
Name: v.Name,
|
|
||||||
Total: v.Total,
|
|
||||||
Current: v.Current,
|
|
||||||
Timestamp: v.Timestamp,
|
|
||||||
Started: v.Started,
|
|
||||||
Completed: v.Completed,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
for _, v := range s.Logs {
|
|
||||||
resp.Logs = append(resp.Logs, &control.VertexLog{
|
|
||||||
Vertex: v.Vertex,
|
|
||||||
Stream: int64(v.Stream),
|
|
||||||
Msg: v.Data,
|
|
||||||
Timestamp: v.Timestamp,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
for _, v := range s.Warnings {
|
|
||||||
resp.Warnings = append(resp.Warnings, &control.VertexWarning{
|
|
||||||
Vertex: v.Vertex,
|
|
||||||
Level: int64(v.Level),
|
|
||||||
Short: v.Short,
|
|
||||||
Detail: v.Detail,
|
|
||||||
Url: v.URL,
|
|
||||||
Info: v.SourceInfo,
|
|
||||||
Ranges: v.Range,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return &resp
|
|
||||||
}
|
|
||||||
|
|
||||||
func FromControlStatus(resp *StatusResponse) *client.SolveStatus {
|
|
||||||
s := client.SolveStatus{}
|
|
||||||
for _, v := range resp.Vertexes {
|
|
||||||
s.Vertexes = append(s.Vertexes, &client.Vertex{
|
|
||||||
Digest: v.Digest,
|
|
||||||
Inputs: v.Inputs,
|
|
||||||
Name: v.Name,
|
|
||||||
Started: v.Started,
|
|
||||||
Completed: v.Completed,
|
|
||||||
Error: v.Error,
|
|
||||||
Cached: v.Cached,
|
|
||||||
ProgressGroup: v.ProgressGroup,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
for _, v := range resp.Statuses {
|
|
||||||
s.Statuses = append(s.Statuses, &client.VertexStatus{
|
|
||||||
ID: v.ID,
|
|
||||||
Vertex: v.Vertex,
|
|
||||||
Name: v.Name,
|
|
||||||
Total: v.Total,
|
|
||||||
Current: v.Current,
|
|
||||||
Timestamp: v.Timestamp,
|
|
||||||
Started: v.Started,
|
|
||||||
Completed: v.Completed,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
for _, v := range resp.Logs {
|
|
||||||
s.Logs = append(s.Logs, &client.VertexLog{
|
|
||||||
Vertex: v.Vertex,
|
|
||||||
Stream: int(v.Stream),
|
|
||||||
Data: v.Msg,
|
|
||||||
Timestamp: v.Timestamp,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
for _, v := range resp.Warnings {
|
|
||||||
s.Warnings = append(s.Warnings, &client.VertexWarning{
|
|
||||||
Vertex: v.Vertex,
|
|
||||||
Level: int(v.Level),
|
|
||||||
Short: v.Short,
|
|
||||||
Detail: v.Detail,
|
|
||||||
URL: v.Url,
|
|
||||||
SourceInfo: v.Info,
|
|
||||||
Range: v.Ranges,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return &s
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
package pb
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/moby/buildkit/session"
|
|
||||||
"github.com/moby/buildkit/session/secrets/secretsprovider"
|
|
||||||
)
|
|
||||||
|
|
||||||
func CreateSecrets(secrets []*Secret) (session.Attachable, error) {
|
|
||||||
fs := make([]secretsprovider.Source, 0, len(secrets))
|
|
||||||
for _, secret := range secrets {
|
|
||||||
fs = append(fs, secretsprovider.Source{
|
|
||||||
ID: secret.ID,
|
|
||||||
FilePath: secret.FilePath,
|
|
||||||
Env: secret.Env,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
store, err := secretsprovider.NewStore(fs)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return secretsprovider.NewSecretProvider(store), nil
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package pb
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/moby/buildkit/session"
|
|
||||||
"github.com/moby/buildkit/session/sshforward/sshprovider"
|
|
||||||
)
|
|
||||||
|
|
||||||
func CreateSSH(ssh []*SSH) (session.Attachable, error) {
|
|
||||||
configs := make([]sshprovider.AgentConfig, 0, len(ssh))
|
|
||||||
for _, ssh := range ssh {
|
|
||||||
cfg := sshprovider.AgentConfig{
|
|
||||||
ID: ssh.ID,
|
|
||||||
Paths: append([]string{}, ssh.Paths...),
|
|
||||||
}
|
|
||||||
configs = append(configs, cfg)
|
|
||||||
}
|
|
||||||
return sshprovider.NewSSHAgentProvider(configs)
|
|
||||||
}
|
|
||||||
@@ -1,149 +0,0 @@
|
|||||||
package processes
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"sync"
|
|
||||||
"sync/atomic"
|
|
||||||
|
|
||||||
"github.com/docker/buildx/build"
|
|
||||||
"github.com/docker/buildx/controller/pb"
|
|
||||||
"github.com/docker/buildx/util/ioset"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Process provides methods to control a process.
|
|
||||||
type Process struct {
|
|
||||||
inEnd *ioset.Forwarder
|
|
||||||
invokeConfig *pb.InvokeConfig
|
|
||||||
errCh chan error
|
|
||||||
processCancel func()
|
|
||||||
serveIOCancel func()
|
|
||||||
}
|
|
||||||
|
|
||||||
// ForwardIO forwards process's io to the specified reader/writer.
|
|
||||||
// Optionally specify ioCancelCallback which will be called when
|
|
||||||
// the process closes the specified IO. This will be useful for additional cleanup.
|
|
||||||
func (p *Process) ForwardIO(in *ioset.In, ioCancelCallback func()) {
|
|
||||||
p.inEnd.SetIn(in)
|
|
||||||
if f := p.serveIOCancel; f != nil {
|
|
||||||
f()
|
|
||||||
}
|
|
||||||
p.serveIOCancel = ioCancelCallback
|
|
||||||
}
|
|
||||||
|
|
||||||
// Done returns a channel where error or nil will be sent
|
|
||||||
// when the process exits.
|
|
||||||
// TODO: change this to Wait()
|
|
||||||
func (p *Process) Done() <-chan error {
|
|
||||||
return p.errCh
|
|
||||||
}
|
|
||||||
|
|
||||||
// Manager manages a set of proceses.
|
|
||||||
type Manager struct {
|
|
||||||
container atomic.Value
|
|
||||||
processes sync.Map
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewManager creates and returns a Manager.
|
|
||||||
func NewManager() *Manager {
|
|
||||||
return &Manager{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get returns the specified process.
|
|
||||||
func (m *Manager) Get(id string) (*Process, bool) {
|
|
||||||
v, ok := m.processes.Load(id)
|
|
||||||
if !ok {
|
|
||||||
return nil, false
|
|
||||||
}
|
|
||||||
return v.(*Process), true
|
|
||||||
}
|
|
||||||
|
|
||||||
// CancelRunningProcesses cancels execution of all running processes.
|
|
||||||
func (m *Manager) CancelRunningProcesses() {
|
|
||||||
var funcs []func()
|
|
||||||
m.processes.Range(func(key, value any) bool {
|
|
||||||
funcs = append(funcs, value.(*Process).processCancel)
|
|
||||||
m.processes.Delete(key)
|
|
||||||
return true
|
|
||||||
})
|
|
||||||
for _, f := range funcs {
|
|
||||||
f()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListProcesses lists all running processes.
|
|
||||||
func (m *Manager) ListProcesses() (res []*pb.ProcessInfo) {
|
|
||||||
m.processes.Range(func(key, value any) bool {
|
|
||||||
res = append(res, &pb.ProcessInfo{
|
|
||||||
ProcessID: key.(string),
|
|
||||||
InvokeConfig: value.(*Process).invokeConfig,
|
|
||||||
})
|
|
||||||
return true
|
|
||||||
})
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeleteProcess deletes the specified process.
|
|
||||||
func (m *Manager) DeleteProcess(id string) error {
|
|
||||||
p, ok := m.processes.LoadAndDelete(id)
|
|
||||||
if !ok {
|
|
||||||
return errors.Errorf("unknown process %q", id)
|
|
||||||
}
|
|
||||||
p.(*Process).processCancel()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// StartProcess starts a process in the container.
|
|
||||||
// When a container isn't available (i.e. first time invoking or the container has exited) or cfg.Rollback is set,
|
|
||||||
// this method will start a new container and run the process in it. Otherwise, this method starts a new process in the
|
|
||||||
// existing container.
|
|
||||||
func (m *Manager) StartProcess(pid string, resultCtx *build.ResultHandle, cfg *pb.InvokeConfig) (*Process, error) {
|
|
||||||
// Get the target result to invoke a container from
|
|
||||||
var ctr *build.Container
|
|
||||||
if a := m.container.Load(); a != nil {
|
|
||||||
ctr = a.(*build.Container)
|
|
||||||
}
|
|
||||||
if cfg.Rollback || ctr == nil || ctr.IsUnavailable() {
|
|
||||||
go m.CancelRunningProcesses()
|
|
||||||
// (Re)create a new container if this is rollback or first time to invoke a process.
|
|
||||||
if ctr != nil {
|
|
||||||
go ctr.Cancel() // Finish the existing container
|
|
||||||
}
|
|
||||||
var err error
|
|
||||||
ctr, err = build.NewContainer(context.TODO(), resultCtx, cfg)
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Errorf("failed to create container %v", err)
|
|
||||||
}
|
|
||||||
m.container.Store(ctr)
|
|
||||||
}
|
|
||||||
// [client(ForwardIO)] <-forwarder(switchable)-> [out] <-pipe-> [in] <- [process]
|
|
||||||
in, out := ioset.Pipe()
|
|
||||||
f := ioset.NewForwarder()
|
|
||||||
f.PropagateStdinClose = false
|
|
||||||
f.SetOut(&out)
|
|
||||||
|
|
||||||
// Register process
|
|
||||||
ctx, cancel := context.WithCancel(context.TODO())
|
|
||||||
var cancelOnce sync.Once
|
|
||||||
processCancelFunc := func() { cancelOnce.Do(func() { cancel(); f.Close(); in.Close(); out.Close() }) }
|
|
||||||
p := &Process{
|
|
||||||
inEnd: f,
|
|
||||||
invokeConfig: cfg,
|
|
||||||
processCancel: processCancelFunc,
|
|
||||||
errCh: make(chan error),
|
|
||||||
}
|
|
||||||
m.processes.Store(pid, p)
|
|
||||||
go func() {
|
|
||||||
var err error
|
|
||||||
if err = ctr.Exec(ctx, cfg, in.Stdin, in.Stdout, in.Stderr); err != nil {
|
|
||||||
logrus.Debugf("process error: %v", err)
|
|
||||||
}
|
|
||||||
logrus.Debugf("finished process %s %v", pid, cfg.Entrypoint)
|
|
||||||
m.processes.Delete(pid)
|
|
||||||
processCancelFunc()
|
|
||||||
p.errCh <- err
|
|
||||||
}()
|
|
||||||
|
|
||||||
return p, nil
|
|
||||||
}
|
|
||||||
@@ -1,240 +0,0 @@
|
|||||||
package remote
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/defaults"
|
|
||||||
"github.com/containerd/containerd/pkg/dialer"
|
|
||||||
"github.com/docker/buildx/controller/pb"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
"github.com/moby/buildkit/identity"
|
|
||||||
"github.com/moby/buildkit/util/grpcerrors"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"golang.org/x/sync/errgroup"
|
|
||||||
"google.golang.org/grpc"
|
|
||||||
"google.golang.org/grpc/backoff"
|
|
||||||
"google.golang.org/grpc/credentials/insecure"
|
|
||||||
)
|
|
||||||
|
|
||||||
func NewClient(ctx context.Context, addr string) (*Client, error) {
|
|
||||||
backoffConfig := backoff.DefaultConfig
|
|
||||||
backoffConfig.MaxDelay = 3 * time.Second
|
|
||||||
connParams := grpc.ConnectParams{
|
|
||||||
Backoff: backoffConfig,
|
|
||||||
}
|
|
||||||
gopts := []grpc.DialOption{
|
|
||||||
grpc.WithBlock(),
|
|
||||||
grpc.WithTransportCredentials(insecure.NewCredentials()),
|
|
||||||
grpc.WithConnectParams(connParams),
|
|
||||||
grpc.WithContextDialer(dialer.ContextDialer),
|
|
||||||
grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(defaults.DefaultMaxRecvMsgSize)),
|
|
||||||
grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(defaults.DefaultMaxSendMsgSize)),
|
|
||||||
grpc.WithUnaryInterceptor(grpcerrors.UnaryClientInterceptor),
|
|
||||||
grpc.WithStreamInterceptor(grpcerrors.StreamClientInterceptor),
|
|
||||||
}
|
|
||||||
conn, err := grpc.DialContext(ctx, dialer.DialAddress(addr), gopts...)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &Client{conn: conn}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type Client struct {
|
|
||||||
conn *grpc.ClientConn
|
|
||||||
closeOnce sync.Once
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) Close() (err error) {
|
|
||||||
c.closeOnce.Do(func() {
|
|
||||||
err = c.conn.Close()
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) Version(ctx context.Context) (string, string, string, error) {
|
|
||||||
res, err := c.client().Info(ctx, &pb.InfoRequest{})
|
|
||||||
if err != nil {
|
|
||||||
return "", "", "", err
|
|
||||||
}
|
|
||||||
v := res.BuildxVersion
|
|
||||||
return v.Package, v.Version, v.Revision, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) List(ctx context.Context) (keys []string, retErr error) {
|
|
||||||
res, err := c.client().List(ctx, &pb.ListRequest{})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return res.Keys, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) Disconnect(ctx context.Context, key string) error {
|
|
||||||
if key == "" {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
_, err := c.client().Disconnect(ctx, &pb.DisconnectRequest{Ref: key})
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) ListProcesses(ctx context.Context, ref string) (infos []*pb.ProcessInfo, retErr error) {
|
|
||||||
res, err := c.client().ListProcesses(ctx, &pb.ListProcessesRequest{Ref: ref})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return res.Infos, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) DisconnectProcess(ctx context.Context, ref, pid string) error {
|
|
||||||
_, err := c.client().DisconnectProcess(ctx, &pb.DisconnectProcessRequest{Ref: ref, ProcessID: pid})
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) Invoke(ctx context.Context, ref string, pid string, invokeConfig pb.InvokeConfig, in io.ReadCloser, stdout io.WriteCloser, stderr io.WriteCloser) error {
|
|
||||||
if ref == "" || pid == "" {
|
|
||||||
return errors.New("build reference must be specified")
|
|
||||||
}
|
|
||||||
stream, err := c.client().Invoke(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return attachIO(ctx, stream, &pb.InitMessage{Ref: ref, ProcessID: pid, InvokeConfig: &invokeConfig}, ioAttachConfig{
|
|
||||||
stdin: in,
|
|
||||||
stdout: stdout,
|
|
||||||
stderr: stderr,
|
|
||||||
// TODO: Signal, Resize
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) Inspect(ctx context.Context, ref string) (*pb.InspectResponse, error) {
|
|
||||||
return c.client().Inspect(ctx, &pb.InspectRequest{Ref: ref})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) Build(ctx context.Context, options pb.BuildOptions, in io.ReadCloser, progress progress.Writer) (string, *client.SolveResponse, error) {
|
|
||||||
ref := identity.NewID()
|
|
||||||
statusChan := make(chan *client.SolveStatus)
|
|
||||||
eg, egCtx := errgroup.WithContext(ctx)
|
|
||||||
var resp *client.SolveResponse
|
|
||||||
eg.Go(func() error {
|
|
||||||
defer close(statusChan)
|
|
||||||
var err error
|
|
||||||
resp, err = c.build(egCtx, ref, options, in, statusChan)
|
|
||||||
return err
|
|
||||||
})
|
|
||||||
eg.Go(func() error {
|
|
||||||
for s := range statusChan {
|
|
||||||
st := s
|
|
||||||
progress.Write(st)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
return ref, resp, eg.Wait()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) build(ctx context.Context, ref string, options pb.BuildOptions, in io.ReadCloser, statusChan chan *client.SolveStatus) (*client.SolveResponse, error) {
|
|
||||||
eg, egCtx := errgroup.WithContext(ctx)
|
|
||||||
done := make(chan struct{})
|
|
||||||
|
|
||||||
var resp *client.SolveResponse
|
|
||||||
|
|
||||||
eg.Go(func() error {
|
|
||||||
defer close(done)
|
|
||||||
pbResp, err := c.client().Build(egCtx, &pb.BuildRequest{
|
|
||||||
Ref: ref,
|
|
||||||
Options: &options,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
resp = &client.SolveResponse{
|
|
||||||
ExporterResponse: pbResp.ExporterResponse,
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
eg.Go(func() error {
|
|
||||||
stream, err := c.client().Status(egCtx, &pb.StatusRequest{
|
|
||||||
Ref: ref,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
for {
|
|
||||||
resp, err := stream.Recv()
|
|
||||||
if err != nil {
|
|
||||||
if err == io.EOF {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return errors.Wrap(err, "failed to receive status")
|
|
||||||
}
|
|
||||||
statusChan <- pb.FromControlStatus(resp)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
if in != nil {
|
|
||||||
eg.Go(func() error {
|
|
||||||
stream, err := c.client().Input(egCtx)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err := stream.Send(&pb.InputMessage{
|
|
||||||
Input: &pb.InputMessage_Init{
|
|
||||||
Init: &pb.InputInitMessage{
|
|
||||||
Ref: ref,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}); err != nil {
|
|
||||||
return errors.Wrap(err, "failed to init input")
|
|
||||||
}
|
|
||||||
|
|
||||||
inReader, inWriter := io.Pipe()
|
|
||||||
eg2, _ := errgroup.WithContext(ctx)
|
|
||||||
eg2.Go(func() error {
|
|
||||||
<-done
|
|
||||||
return inWriter.Close()
|
|
||||||
})
|
|
||||||
go func() {
|
|
||||||
// do not wait for read completion but return here and let the caller send EOF
|
|
||||||
// this allows us to return on ctx.Done() without being blocked by this reader.
|
|
||||||
io.Copy(inWriter, in)
|
|
||||||
inWriter.Close()
|
|
||||||
}()
|
|
||||||
eg2.Go(func() error {
|
|
||||||
for {
|
|
||||||
buf := make([]byte, 32*1024)
|
|
||||||
n, err := inReader.Read(buf)
|
|
||||||
if err != nil {
|
|
||||||
if err == io.EOF {
|
|
||||||
break // break loop and send EOF
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
} else if n > 0 {
|
|
||||||
if stream.Send(&pb.InputMessage{
|
|
||||||
Input: &pb.InputMessage_Data{
|
|
||||||
Data: &pb.DataMessage{
|
|
||||||
Data: buf[:n],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return stream.Send(&pb.InputMessage{
|
|
||||||
Input: &pb.InputMessage_Data{
|
|
||||||
Data: &pb.DataMessage{
|
|
||||||
EOF: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
})
|
|
||||||
return eg2.Wait()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return resp, eg.Wait()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) client() pb.ControllerClient {
|
|
||||||
return pb.NewControllerClient(c.conn)
|
|
||||||
}
|
|
||||||
@@ -1,333 +0,0 @@
|
|||||||
//go:build linux
|
|
||||||
|
|
||||||
package remote
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"net"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"os/signal"
|
|
||||||
"path/filepath"
|
|
||||||
"strconv"
|
|
||||||
"syscall"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/containerd/log"
|
|
||||||
"github.com/docker/buildx/build"
|
|
||||||
cbuild "github.com/docker/buildx/controller/build"
|
|
||||||
"github.com/docker/buildx/controller/control"
|
|
||||||
controllerapi "github.com/docker/buildx/controller/pb"
|
|
||||||
"github.com/docker/buildx/util/confutil"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/docker/buildx/version"
|
|
||||||
"github.com/docker/cli/cli/command"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
"github.com/moby/buildkit/util/grpcerrors"
|
|
||||||
"github.com/pelletier/go-toml"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
"google.golang.org/grpc"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
serveCommandName = "_INTERNAL_SERVE"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
defaultLogFilename = fmt.Sprintf("buildx.%s.log", version.Revision)
|
|
||||||
defaultSocketFilename = fmt.Sprintf("buildx.%s.sock", version.Revision)
|
|
||||||
defaultPIDFilename = fmt.Sprintf("buildx.%s.pid", version.Revision)
|
|
||||||
)
|
|
||||||
|
|
||||||
type serverConfig struct {
|
|
||||||
// Specify buildx server root
|
|
||||||
Root string `toml:"root"`
|
|
||||||
|
|
||||||
// LogLevel sets the logging level [trace, debug, info, warn, error, fatal, panic]
|
|
||||||
LogLevel string `toml:"log_level"`
|
|
||||||
|
|
||||||
// Specify file to output buildx server log
|
|
||||||
LogFile string `toml:"log_file"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewRemoteBuildxController(ctx context.Context, dockerCli command.Cli, opts control.ControlOptions, logger progress.SubLogger) (control.BuildxController, error) {
|
|
||||||
rootDir := opts.Root
|
|
||||||
if rootDir == "" {
|
|
||||||
rootDir = rootDataDir(dockerCli)
|
|
||||||
}
|
|
||||||
serverRoot := filepath.Join(rootDir, "shared")
|
|
||||||
|
|
||||||
// connect to buildx server if it is already running
|
|
||||||
ctx2, cancel := context.WithTimeout(ctx, 1*time.Second)
|
|
||||||
c, err := newBuildxClientAndCheck(ctx2, filepath.Join(serverRoot, defaultSocketFilename))
|
|
||||||
cancel()
|
|
||||||
if err != nil {
|
|
||||||
if !errors.Is(err, context.DeadlineExceeded) {
|
|
||||||
return nil, errors.Wrap(err, "cannot connect to the buildx server")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return &buildxController{c, serverRoot}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// start buildx server via subcommand
|
|
||||||
err = logger.Wrap("no buildx server found; launching...", func() error {
|
|
||||||
launchFlags := []string{}
|
|
||||||
if opts.ServerConfig != "" {
|
|
||||||
launchFlags = append(launchFlags, "--config", opts.ServerConfig)
|
|
||||||
}
|
|
||||||
logFile, err := getLogFilePath(dockerCli, opts.ServerConfig)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
wait, err := launch(ctx, logFile, append([]string{serveCommandName}, launchFlags...)...)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
go wait()
|
|
||||||
|
|
||||||
// wait for buildx server to be ready
|
|
||||||
ctx2, cancel = context.WithTimeout(ctx, 10*time.Second)
|
|
||||||
c, err = newBuildxClientAndCheck(ctx2, filepath.Join(serverRoot, defaultSocketFilename))
|
|
||||||
cancel()
|
|
||||||
if err != nil {
|
|
||||||
return errors.Wrap(err, "cannot connect to the buildx server")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &buildxController{c, serverRoot}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func AddControllerCommands(cmd *cobra.Command, dockerCli command.Cli) {
|
|
||||||
cmd.AddCommand(
|
|
||||||
serveCmd(dockerCli),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func serveCmd(dockerCli command.Cli) *cobra.Command {
|
|
||||||
var serverConfigPath string
|
|
||||||
cmd := &cobra.Command{
|
|
||||||
Use: fmt.Sprintf("%s [OPTIONS]", serveCommandName),
|
|
||||||
Hidden: true,
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
// Parse config
|
|
||||||
config, err := getConfig(dockerCli, serverConfigPath)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if config.LogLevel == "" {
|
|
||||||
logrus.SetLevel(logrus.InfoLevel)
|
|
||||||
} else {
|
|
||||||
lvl, err := logrus.ParseLevel(config.LogLevel)
|
|
||||||
if err != nil {
|
|
||||||
return errors.Wrap(err, "failed to prepare logger")
|
|
||||||
}
|
|
||||||
logrus.SetLevel(lvl)
|
|
||||||
}
|
|
||||||
logrus.SetFormatter(&logrus.JSONFormatter{
|
|
||||||
TimestampFormat: log.RFC3339NanoFixed,
|
|
||||||
})
|
|
||||||
root, err := prepareRootDir(dockerCli, config)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
pidF := filepath.Join(root, defaultPIDFilename)
|
|
||||||
if err := os.WriteFile(pidF, []byte(fmt.Sprintf("%d", os.Getpid())), 0600); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
if err := os.Remove(pidF); err != nil {
|
|
||||||
logrus.Errorf("failed to clean up info file %q: %v", pidF, err)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
// prepare server
|
|
||||||
b := NewServer(func(ctx context.Context, options *controllerapi.BuildOptions, stdin io.Reader, progress progress.Writer) (*client.SolveResponse, *build.ResultHandle, error) {
|
|
||||||
return cbuild.RunBuild(ctx, dockerCli, *options, stdin, progress, true)
|
|
||||||
})
|
|
||||||
defer b.Close()
|
|
||||||
|
|
||||||
// serve server
|
|
||||||
addr := filepath.Join(root, defaultSocketFilename)
|
|
||||||
if err := os.Remove(addr); err != nil && !os.IsNotExist(err) { // avoid EADDRINUSE
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
if err := os.Remove(addr); err != nil {
|
|
||||||
logrus.Errorf("failed to clean up socket %q: %v", addr, err)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
logrus.Infof("starting server at %q", addr)
|
|
||||||
l, err := net.Listen("unix", addr)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
rpc := grpc.NewServer(
|
|
||||||
grpc.UnaryInterceptor(grpcerrors.UnaryServerInterceptor),
|
|
||||||
grpc.StreamInterceptor(grpcerrors.StreamServerInterceptor),
|
|
||||||
)
|
|
||||||
controllerapi.RegisterControllerServer(rpc, b)
|
|
||||||
doneCh := make(chan struct{})
|
|
||||||
errCh := make(chan error, 1)
|
|
||||||
go func() {
|
|
||||||
defer close(doneCh)
|
|
||||||
if err := rpc.Serve(l); err != nil {
|
|
||||||
errCh <- errors.Wrapf(err, "error on serving via socket %q", addr)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
var s os.Signal
|
|
||||||
sigCh := make(chan os.Signal, 1)
|
|
||||||
signal.Notify(sigCh, syscall.SIGINT)
|
|
||||||
signal.Notify(sigCh, syscall.SIGTERM)
|
|
||||||
select {
|
|
||||||
case err := <-errCh:
|
|
||||||
logrus.Errorf("got error %s, exiting", err)
|
|
||||||
return err
|
|
||||||
case s = <-sigCh:
|
|
||||||
logrus.Infof("got signal %s, exiting", s)
|
|
||||||
return nil
|
|
||||||
case <-doneCh:
|
|
||||||
logrus.Infof("rpc server done, exiting")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
flags := cmd.Flags()
|
|
||||||
flags.StringVar(&serverConfigPath, "config", "", "Specify buildx server config file")
|
|
||||||
return cmd
|
|
||||||
}
|
|
||||||
|
|
||||||
func getLogFilePath(dockerCli command.Cli, configPath string) (string, error) {
|
|
||||||
config, err := getConfig(dockerCli, configPath)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
if config.LogFile == "" {
|
|
||||||
root, err := prepareRootDir(dockerCli, config)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return filepath.Join(root, defaultLogFilename), nil
|
|
||||||
}
|
|
||||||
return config.LogFile, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getConfig(dockerCli command.Cli, configPath string) (*serverConfig, error) {
|
|
||||||
var defaultConfigPath bool
|
|
||||||
if configPath == "" {
|
|
||||||
defaultRoot := rootDataDir(dockerCli)
|
|
||||||
configPath = filepath.Join(defaultRoot, "config.toml")
|
|
||||||
defaultConfigPath = true
|
|
||||||
}
|
|
||||||
var config serverConfig
|
|
||||||
tree, err := toml.LoadFile(configPath)
|
|
||||||
if err != nil && !(os.IsNotExist(err) && defaultConfigPath) {
|
|
||||||
return nil, errors.Wrapf(err, "failed to read config %q", configPath)
|
|
||||||
} else if err == nil {
|
|
||||||
if err := tree.Unmarshal(&config); err != nil {
|
|
||||||
return nil, errors.Wrapf(err, "failed to unmarshal config %q", configPath)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return &config, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func prepareRootDir(dockerCli command.Cli, config *serverConfig) (string, error) {
|
|
||||||
rootDir := config.Root
|
|
||||||
if rootDir == "" {
|
|
||||||
rootDir = rootDataDir(dockerCli)
|
|
||||||
}
|
|
||||||
if rootDir == "" {
|
|
||||||
return "", errors.New("buildx root dir must be determined")
|
|
||||||
}
|
|
||||||
if err := os.MkdirAll(rootDir, 0700); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
serverRoot := filepath.Join(rootDir, "shared")
|
|
||||||
if err := os.MkdirAll(serverRoot, 0700); err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return serverRoot, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func rootDataDir(dockerCli command.Cli) string {
|
|
||||||
return filepath.Join(confutil.ConfigDir(dockerCli), "controller")
|
|
||||||
}
|
|
||||||
|
|
||||||
func newBuildxClientAndCheck(ctx context.Context, addr string) (*Client, error) {
|
|
||||||
c, err := NewClient(ctx, addr)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
p, v, r, err := c.Version(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
logrus.Debugf("connected to server (\"%v %v %v\")", p, v, r)
|
|
||||||
if !(p == version.Package && v == version.Version && r == version.Revision) {
|
|
||||||
return nil, errors.Errorf("version mismatch (client: \"%v %v %v\", server: \"%v %v %v\")", version.Package, version.Version, version.Revision, p, v, r)
|
|
||||||
}
|
|
||||||
return c, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type buildxController struct {
|
|
||||||
*Client
|
|
||||||
serverRoot string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *buildxController) Kill(ctx context.Context) error {
|
|
||||||
pidB, err := os.ReadFile(filepath.Join(c.serverRoot, defaultPIDFilename))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
pid, err := strconv.ParseInt(string(pidB), 10, 64)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if pid <= 0 {
|
|
||||||
return errors.New("no PID is recorded for buildx server")
|
|
||||||
}
|
|
||||||
p, err := os.FindProcess(int(pid))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err := p.Signal(syscall.SIGINT); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
// TODO: Should we send SIGKILL if process doesn't finish?
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func launch(ctx context.Context, logFile string, args ...string) (func() error, error) {
|
|
||||||
// set absolute path of binary, since we set the working directory to the root
|
|
||||||
pathname, err := os.Executable()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
bCmd := exec.CommandContext(ctx, pathname, args...)
|
|
||||||
if logFile != "" {
|
|
||||||
f, err := os.OpenFile(logFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer f.Close()
|
|
||||||
bCmd.Stdout = f
|
|
||||||
bCmd.Stderr = f
|
|
||||||
}
|
|
||||||
bCmd.Stdin = nil
|
|
||||||
bCmd.Dir = "/"
|
|
||||||
bCmd.SysProcAttr = &syscall.SysProcAttr{
|
|
||||||
Setsid: true,
|
|
||||||
}
|
|
||||||
if err := bCmd.Start(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return bCmd.Wait, nil
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
//go:build !linux
|
|
||||||
|
|
||||||
package remote
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"github.com/docker/buildx/controller/control"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/docker/cli/cli/command"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
func NewRemoteBuildxController(ctx context.Context, dockerCli command.Cli, opts control.ControlOptions, logger progress.SubLogger) (control.BuildxController, error) {
|
|
||||||
return nil, errors.New("remote buildx unsupported")
|
|
||||||
}
|
|
||||||
|
|
||||||
func AddControllerCommands(cmd *cobra.Command, dockerCli command.Cli) {}
|
|
||||||
@@ -1,430 +0,0 @@
|
|||||||
package remote
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io"
|
|
||||||
"syscall"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/docker/buildx/controller/pb"
|
|
||||||
"github.com/moby/sys/signal"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"golang.org/x/sync/errgroup"
|
|
||||||
)
|
|
||||||
|
|
||||||
type msgStream interface {
|
|
||||||
Send(*pb.Message) error
|
|
||||||
Recv() (*pb.Message, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
type ioServerConfig struct {
|
|
||||||
stdin io.WriteCloser
|
|
||||||
stdout, stderr io.ReadCloser
|
|
||||||
|
|
||||||
// signalFn is a callback function called when a signal is reached to the client.
|
|
||||||
signalFn func(context.Context, syscall.Signal) error
|
|
||||||
|
|
||||||
// resizeFn is a callback function called when a resize event is reached to the client.
|
|
||||||
resizeFn func(context.Context, winSize) error
|
|
||||||
}
|
|
||||||
|
|
||||||
func serveIO(attachCtx context.Context, srv msgStream, initFn func(*pb.InitMessage) error, ioConfig *ioServerConfig) (err error) {
|
|
||||||
stdin, stdout, stderr := ioConfig.stdin, ioConfig.stdout, ioConfig.stderr
|
|
||||||
stream := &debugStream{srv, "server=" + time.Now().String()}
|
|
||||||
eg, ctx := errgroup.WithContext(attachCtx)
|
|
||||||
done := make(chan struct{})
|
|
||||||
|
|
||||||
msg, err := receive(ctx, stream)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
init := msg.GetInit()
|
|
||||||
if init == nil {
|
|
||||||
return errors.Errorf("unexpected message: %T; wanted init", msg.GetInput())
|
|
||||||
}
|
|
||||||
ref := init.Ref
|
|
||||||
if ref == "" {
|
|
||||||
return errors.New("no ref is provided")
|
|
||||||
}
|
|
||||||
if err := initFn(init); err != nil {
|
|
||||||
return errors.Wrap(err, "failed to initialize IO server")
|
|
||||||
}
|
|
||||||
|
|
||||||
if stdout != nil {
|
|
||||||
stdoutReader, stdoutWriter := io.Pipe()
|
|
||||||
eg.Go(func() error {
|
|
||||||
<-done
|
|
||||||
return stdoutWriter.Close()
|
|
||||||
})
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
// do not wait for read completion but return here and let the caller send EOF
|
|
||||||
// this allows us to return on ctx.Done() without being blocked by this reader.
|
|
||||||
io.Copy(stdoutWriter, stdout)
|
|
||||||
stdoutWriter.Close()
|
|
||||||
}()
|
|
||||||
|
|
||||||
eg.Go(func() error {
|
|
||||||
defer stdoutReader.Close()
|
|
||||||
return copyToStream(1, stream, stdoutReader)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
if stderr != nil {
|
|
||||||
stderrReader, stderrWriter := io.Pipe()
|
|
||||||
eg.Go(func() error {
|
|
||||||
<-done
|
|
||||||
return stderrWriter.Close()
|
|
||||||
})
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
// do not wait for read completion but return here and let the caller send EOF
|
|
||||||
// this allows us to return on ctx.Done() without being blocked by this reader.
|
|
||||||
io.Copy(stderrWriter, stderr)
|
|
||||||
stderrWriter.Close()
|
|
||||||
}()
|
|
||||||
|
|
||||||
eg.Go(func() error {
|
|
||||||
defer stderrReader.Close()
|
|
||||||
return copyToStream(2, stream, stderrReader)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
msgCh := make(chan *pb.Message)
|
|
||||||
eg.Go(func() error {
|
|
||||||
defer close(msgCh)
|
|
||||||
for {
|
|
||||||
msg, err := receive(ctx, stream)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
select {
|
|
||||||
case msgCh <- msg:
|
|
||||||
case <-done:
|
|
||||||
return nil
|
|
||||||
case <-ctx.Done():
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
eg.Go(func() error {
|
|
||||||
defer close(done)
|
|
||||||
for {
|
|
||||||
var msg *pb.Message
|
|
||||||
select {
|
|
||||||
case msg = <-msgCh:
|
|
||||||
case <-ctx.Done():
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if msg == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if file := msg.GetFile(); file != nil {
|
|
||||||
if file.Fd != 0 {
|
|
||||||
return errors.Errorf("unexpected fd: %v", file.Fd)
|
|
||||||
}
|
|
||||||
if stdin == nil {
|
|
||||||
continue // no stdin destination is specified so ignore the data
|
|
||||||
}
|
|
||||||
if len(file.Data) > 0 {
|
|
||||||
_, err := stdin.Write(file.Data)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if file.EOF {
|
|
||||||
stdin.Close()
|
|
||||||
}
|
|
||||||
} else if resize := msg.GetResize(); resize != nil {
|
|
||||||
if ioConfig.resizeFn != nil {
|
|
||||||
ioConfig.resizeFn(ctx, winSize{
|
|
||||||
cols: resize.Cols,
|
|
||||||
rows: resize.Rows,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
} else if sig := msg.GetSignal(); sig != nil {
|
|
||||||
if ioConfig.signalFn != nil {
|
|
||||||
syscallSignal, ok := signal.SignalMap[sig.Name]
|
|
||||||
if !ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
ioConfig.signalFn(ctx, syscallSignal)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return errors.Errorf("unexpected message: %T", msg.GetInput())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
return eg.Wait()
|
|
||||||
}
|
|
||||||
|
|
||||||
type ioAttachConfig struct {
|
|
||||||
stdin io.ReadCloser
|
|
||||||
stdout, stderr io.WriteCloser
|
|
||||||
signal <-chan syscall.Signal
|
|
||||||
resize <-chan winSize
|
|
||||||
}
|
|
||||||
|
|
||||||
type winSize struct {
|
|
||||||
rows uint32
|
|
||||||
cols uint32
|
|
||||||
}
|
|
||||||
|
|
||||||
func attachIO(ctx context.Context, stream msgStream, initMessage *pb.InitMessage, cfg ioAttachConfig) (retErr error) {
|
|
||||||
eg, ctx := errgroup.WithContext(ctx)
|
|
||||||
done := make(chan struct{})
|
|
||||||
|
|
||||||
if err := stream.Send(&pb.Message{
|
|
||||||
Input: &pb.Message_Init{
|
|
||||||
Init: initMessage,
|
|
||||||
},
|
|
||||||
}); err != nil {
|
|
||||||
return errors.Wrap(err, "failed to init")
|
|
||||||
}
|
|
||||||
|
|
||||||
if cfg.stdin != nil {
|
|
||||||
stdinReader, stdinWriter := io.Pipe()
|
|
||||||
eg.Go(func() error {
|
|
||||||
<-done
|
|
||||||
return stdinWriter.Close()
|
|
||||||
})
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
// do not wait for read completion but return here and let the caller send EOF
|
|
||||||
// this allows us to return on ctx.Done() without being blocked by this reader.
|
|
||||||
io.Copy(stdinWriter, cfg.stdin)
|
|
||||||
stdinWriter.Close()
|
|
||||||
}()
|
|
||||||
|
|
||||||
eg.Go(func() error {
|
|
||||||
defer stdinReader.Close()
|
|
||||||
return copyToStream(0, stream, stdinReader)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
if cfg.signal != nil {
|
|
||||||
eg.Go(func() error {
|
|
||||||
for {
|
|
||||||
var sig syscall.Signal
|
|
||||||
select {
|
|
||||||
case sig = <-cfg.signal:
|
|
||||||
case <-done:
|
|
||||||
return nil
|
|
||||||
case <-ctx.Done():
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
name := sigToName[sig]
|
|
||||||
if name == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if err := stream.Send(&pb.Message{
|
|
||||||
Input: &pb.Message_Signal{
|
|
||||||
Signal: &pb.SignalMessage{
|
|
||||||
Name: name,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}); err != nil {
|
|
||||||
return errors.Wrap(err, "failed to send signal")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
if cfg.resize != nil {
|
|
||||||
eg.Go(func() error {
|
|
||||||
for {
|
|
||||||
var win winSize
|
|
||||||
select {
|
|
||||||
case win = <-cfg.resize:
|
|
||||||
case <-done:
|
|
||||||
return nil
|
|
||||||
case <-ctx.Done():
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if err := stream.Send(&pb.Message{
|
|
||||||
Input: &pb.Message_Resize{
|
|
||||||
Resize: &pb.ResizeMessage{
|
|
||||||
Rows: win.rows,
|
|
||||||
Cols: win.cols,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}); err != nil {
|
|
||||||
return errors.Wrap(err, "failed to send resize")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
msgCh := make(chan *pb.Message)
|
|
||||||
eg.Go(func() error {
|
|
||||||
defer close(msgCh)
|
|
||||||
for {
|
|
||||||
msg, err := receive(ctx, stream)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
select {
|
|
||||||
case msgCh <- msg:
|
|
||||||
case <-done:
|
|
||||||
return nil
|
|
||||||
case <-ctx.Done():
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
eg.Go(func() error {
|
|
||||||
eofs := make(map[uint32]struct{})
|
|
||||||
defer close(done)
|
|
||||||
for {
|
|
||||||
var msg *pb.Message
|
|
||||||
select {
|
|
||||||
case msg = <-msgCh:
|
|
||||||
case <-ctx.Done():
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if msg == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if file := msg.GetFile(); file != nil {
|
|
||||||
if _, ok := eofs[file.Fd]; ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
var out io.WriteCloser
|
|
||||||
switch file.Fd {
|
|
||||||
case 1:
|
|
||||||
out = cfg.stdout
|
|
||||||
case 2:
|
|
||||||
out = cfg.stderr
|
|
||||||
default:
|
|
||||||
return errors.Errorf("unsupported fd %d", file.Fd)
|
|
||||||
|
|
||||||
}
|
|
||||||
if out == nil {
|
|
||||||
logrus.Warnf("attachIO: no writer for fd %d", file.Fd)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if len(file.Data) > 0 {
|
|
||||||
if _, err := out.Write(file.Data); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if file.EOF {
|
|
||||||
eofs[file.Fd] = struct{}{}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return errors.Errorf("unexpected message: %T", msg.GetInput())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
return eg.Wait()
|
|
||||||
}
|
|
||||||
|
|
||||||
func receive(ctx context.Context, stream msgStream) (*pb.Message, error) {
|
|
||||||
msgCh := make(chan *pb.Message)
|
|
||||||
errCh := make(chan error)
|
|
||||||
go func() {
|
|
||||||
msg, err := stream.Recv()
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, io.EOF) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
errCh <- err
|
|
||||||
return
|
|
||||||
}
|
|
||||||
msgCh <- msg
|
|
||||||
}()
|
|
||||||
select {
|
|
||||||
case msg := <-msgCh:
|
|
||||||
return msg, nil
|
|
||||||
case err := <-errCh:
|
|
||||||
return nil, err
|
|
||||||
case <-ctx.Done():
|
|
||||||
return nil, ctx.Err()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func copyToStream(fd uint32, snd msgStream, r io.Reader) error {
|
|
||||||
for {
|
|
||||||
buf := make([]byte, 32*1024)
|
|
||||||
n, err := r.Read(buf)
|
|
||||||
if err != nil {
|
|
||||||
if err == io.EOF {
|
|
||||||
break // break loop and send EOF
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
} else if n > 0 {
|
|
||||||
if snd.Send(&pb.Message{
|
|
||||||
Input: &pb.Message_File{
|
|
||||||
File: &pb.FdMessage{
|
|
||||||
Fd: fd,
|
|
||||||
Data: buf[:n],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return snd.Send(&pb.Message{
|
|
||||||
Input: &pb.Message_File{
|
|
||||||
File: &pb.FdMessage{
|
|
||||||
Fd: fd,
|
|
||||||
EOF: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
var sigToName = map[syscall.Signal]string{}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
for name, value := range signal.SignalMap {
|
|
||||||
sigToName[value] = name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type debugStream struct {
|
|
||||||
msgStream
|
|
||||||
prefix string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *debugStream) Send(msg *pb.Message) error {
|
|
||||||
switch m := msg.GetInput().(type) {
|
|
||||||
case *pb.Message_File:
|
|
||||||
if m.File.EOF {
|
|
||||||
logrus.Debugf("|---> File Message (sender:%v) fd=%d, EOF", s.prefix, m.File.Fd)
|
|
||||||
} else {
|
|
||||||
logrus.Debugf("|---> File Message (sender:%v) fd=%d, %d bytes", s.prefix, m.File.Fd, len(m.File.Data))
|
|
||||||
}
|
|
||||||
case *pb.Message_Resize:
|
|
||||||
logrus.Debugf("|---> Resize Message (sender:%v): %+v", s.prefix, m.Resize)
|
|
||||||
case *pb.Message_Signal:
|
|
||||||
logrus.Debugf("|---> Signal Message (sender:%v): %s", s.prefix, m.Signal.Name)
|
|
||||||
}
|
|
||||||
return s.msgStream.Send(msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *debugStream) Recv() (*pb.Message, error) {
|
|
||||||
msg, err := s.msgStream.Recv()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
switch m := msg.GetInput().(type) {
|
|
||||||
case *pb.Message_File:
|
|
||||||
if m.File.EOF {
|
|
||||||
logrus.Debugf("|<--- File Message (receiver:%v) fd=%d, EOF", s.prefix, m.File.Fd)
|
|
||||||
} else {
|
|
||||||
logrus.Debugf("|<--- File Message (receiver:%v) fd=%d, %d bytes", s.prefix, m.File.Fd, len(m.File.Data))
|
|
||||||
}
|
|
||||||
case *pb.Message_Resize:
|
|
||||||
logrus.Debugf("|<--- Resize Message (receiver:%v): %+v", s.prefix, m.Resize)
|
|
||||||
case *pb.Message_Signal:
|
|
||||||
logrus.Debugf("|<--- Signal Message (receiver:%v): %s", s.prefix, m.Signal.Name)
|
|
||||||
}
|
|
||||||
return msg, nil
|
|
||||||
}
|
|
||||||
@@ -1,439 +0,0 @@
|
|||||||
package remote
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io"
|
|
||||||
"sync"
|
|
||||||
"sync/atomic"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/docker/buildx/build"
|
|
||||||
controllererrors "github.com/docker/buildx/controller/errdefs"
|
|
||||||
"github.com/docker/buildx/controller/pb"
|
|
||||||
"github.com/docker/buildx/controller/processes"
|
|
||||||
"github.com/docker/buildx/util/ioset"
|
|
||||||
"github.com/docker/buildx/util/progress"
|
|
||||||
"github.com/docker/buildx/version"
|
|
||||||
"github.com/moby/buildkit/client"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"golang.org/x/sync/errgroup"
|
|
||||||
)
|
|
||||||
|
|
||||||
type BuildFunc func(ctx context.Context, options *pb.BuildOptions, stdin io.Reader, progress progress.Writer) (resp *client.SolveResponse, res *build.ResultHandle, err error)
|
|
||||||
|
|
||||||
func NewServer(buildFunc BuildFunc) *Server {
|
|
||||||
return &Server{
|
|
||||||
buildFunc: buildFunc,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type Server struct {
|
|
||||||
buildFunc BuildFunc
|
|
||||||
session map[string]*session
|
|
||||||
sessionMu sync.Mutex
|
|
||||||
}
|
|
||||||
|
|
||||||
type session struct {
|
|
||||||
buildOnGoing atomic.Bool
|
|
||||||
statusChan chan *pb.StatusResponse
|
|
||||||
cancelBuild func()
|
|
||||||
buildOptions *pb.BuildOptions
|
|
||||||
inputPipe *io.PipeWriter
|
|
||||||
|
|
||||||
result *build.ResultHandle
|
|
||||||
|
|
||||||
processes *processes.Manager
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *session) cancelRunningProcesses() {
|
|
||||||
s.processes.CancelRunningProcesses()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Server) ListProcesses(ctx context.Context, req *pb.ListProcessesRequest) (res *pb.ListProcessesResponse, err error) {
|
|
||||||
m.sessionMu.Lock()
|
|
||||||
defer m.sessionMu.Unlock()
|
|
||||||
s, ok := m.session[req.Ref]
|
|
||||||
if !ok {
|
|
||||||
return nil, errors.Errorf("unknown ref %q", req.Ref)
|
|
||||||
}
|
|
||||||
res = new(pb.ListProcessesResponse)
|
|
||||||
res.Infos = append(res.Infos, s.processes.ListProcesses()...)
|
|
||||||
return res, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Server) DisconnectProcess(ctx context.Context, req *pb.DisconnectProcessRequest) (res *pb.DisconnectProcessResponse, err error) {
|
|
||||||
m.sessionMu.Lock()
|
|
||||||
defer m.sessionMu.Unlock()
|
|
||||||
s, ok := m.session[req.Ref]
|
|
||||||
if !ok {
|
|
||||||
return nil, errors.Errorf("unknown ref %q", req.Ref)
|
|
||||||
}
|
|
||||||
return res, s.processes.DeleteProcess(req.ProcessID)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Server) Info(ctx context.Context, req *pb.InfoRequest) (res *pb.InfoResponse, err error) {
|
|
||||||
return &pb.InfoResponse{
|
|
||||||
BuildxVersion: &pb.BuildxVersion{
|
|
||||||
Package: version.Package,
|
|
||||||
Version: version.Version,
|
|
||||||
Revision: version.Revision,
|
|
||||||
},
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Server) List(ctx context.Context, req *pb.ListRequest) (res *pb.ListResponse, err error) {
|
|
||||||
keys := make(map[string]struct{})
|
|
||||||
|
|
||||||
m.sessionMu.Lock()
|
|
||||||
for k := range m.session {
|
|
||||||
keys[k] = struct{}{}
|
|
||||||
}
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
|
|
||||||
var keysL []string
|
|
||||||
for k := range keys {
|
|
||||||
keysL = append(keysL, k)
|
|
||||||
}
|
|
||||||
return &pb.ListResponse{
|
|
||||||
Keys: keysL,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Server) Disconnect(ctx context.Context, req *pb.DisconnectRequest) (res *pb.DisconnectResponse, err error) {
|
|
||||||
key := req.Ref
|
|
||||||
if key == "" {
|
|
||||||
return nil, errors.New("disconnect: empty key")
|
|
||||||
}
|
|
||||||
|
|
||||||
m.sessionMu.Lock()
|
|
||||||
if s, ok := m.session[key]; ok {
|
|
||||||
if s.cancelBuild != nil {
|
|
||||||
s.cancelBuild()
|
|
||||||
}
|
|
||||||
s.cancelRunningProcesses()
|
|
||||||
if s.result != nil {
|
|
||||||
s.result.Done()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
delete(m.session, key)
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
|
|
||||||
return &pb.DisconnectResponse{}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Server) Close() error {
|
|
||||||
m.sessionMu.Lock()
|
|
||||||
for k := range m.session {
|
|
||||||
if s, ok := m.session[k]; ok {
|
|
||||||
if s.cancelBuild != nil {
|
|
||||||
s.cancelBuild()
|
|
||||||
}
|
|
||||||
s.cancelRunningProcesses()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Server) Inspect(ctx context.Context, req *pb.InspectRequest) (*pb.InspectResponse, error) {
|
|
||||||
ref := req.Ref
|
|
||||||
if ref == "" {
|
|
||||||
return nil, errors.New("inspect: empty key")
|
|
||||||
}
|
|
||||||
var bo *pb.BuildOptions
|
|
||||||
m.sessionMu.Lock()
|
|
||||||
if s, ok := m.session[ref]; ok {
|
|
||||||
bo = s.buildOptions
|
|
||||||
} else {
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
return nil, errors.Errorf("inspect: unknown key %v", ref)
|
|
||||||
}
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
return &pb.InspectResponse{Options: bo}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Server) Build(ctx context.Context, req *pb.BuildRequest) (*pb.BuildResponse, error) {
|
|
||||||
ref := req.Ref
|
|
||||||
if ref == "" {
|
|
||||||
return nil, errors.New("build: empty key")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Prepare status channel and session
|
|
||||||
m.sessionMu.Lock()
|
|
||||||
if m.session == nil {
|
|
||||||
m.session = make(map[string]*session)
|
|
||||||
}
|
|
||||||
s, ok := m.session[ref]
|
|
||||||
if ok {
|
|
||||||
if !s.buildOnGoing.CompareAndSwap(false, true) {
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
return &pb.BuildResponse{}, errors.New("build ongoing")
|
|
||||||
}
|
|
||||||
s.cancelRunningProcesses()
|
|
||||||
s.result = nil
|
|
||||||
} else {
|
|
||||||
s = &session{}
|
|
||||||
s.buildOnGoing.Store(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
s.processes = processes.NewManager()
|
|
||||||
statusChan := make(chan *pb.StatusResponse)
|
|
||||||
s.statusChan = statusChan
|
|
||||||
inR, inW := io.Pipe()
|
|
||||||
defer inR.Close()
|
|
||||||
s.inputPipe = inW
|
|
||||||
m.session[ref] = s
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
defer func() {
|
|
||||||
close(statusChan)
|
|
||||||
m.sessionMu.Lock()
|
|
||||||
s, ok := m.session[ref]
|
|
||||||
if ok {
|
|
||||||
s.statusChan = nil
|
|
||||||
s.buildOnGoing.Store(false)
|
|
||||||
}
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
}()
|
|
||||||
|
|
||||||
pw := pb.NewProgressWriter(statusChan)
|
|
||||||
|
|
||||||
// Build the specified request
|
|
||||||
ctx, cancel := context.WithCancel(ctx)
|
|
||||||
defer cancel()
|
|
||||||
resp, res, buildErr := m.buildFunc(ctx, req.Options, inR, pw)
|
|
||||||
m.sessionMu.Lock()
|
|
||||||
if s, ok := m.session[ref]; ok {
|
|
||||||
// NOTE: buildFunc can return *build.ResultHandle even on error (e.g. when it's implemented using (github.com/docker/buildx/controller/build).RunBuild).
|
|
||||||
if res != nil {
|
|
||||||
s.result = res
|
|
||||||
s.cancelBuild = cancel
|
|
||||||
s.buildOptions = req.Options
|
|
||||||
m.session[ref] = s
|
|
||||||
if buildErr != nil {
|
|
||||||
buildErr = controllererrors.WrapBuild(buildErr, ref)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
return nil, errors.Errorf("build: unknown key %v", ref)
|
|
||||||
}
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
|
|
||||||
if buildErr != nil {
|
|
||||||
return nil, buildErr
|
|
||||||
}
|
|
||||||
|
|
||||||
if resp == nil {
|
|
||||||
resp = &client.SolveResponse{}
|
|
||||||
}
|
|
||||||
return &pb.BuildResponse{
|
|
||||||
ExporterResponse: resp.ExporterResponse,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Server) Status(req *pb.StatusRequest, stream pb.Controller_StatusServer) error {
|
|
||||||
ref := req.Ref
|
|
||||||
if ref == "" {
|
|
||||||
return errors.New("status: empty key")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Wait and get status channel prepared by Build()
|
|
||||||
var statusChan <-chan *pb.StatusResponse
|
|
||||||
for {
|
|
||||||
// TODO: timeout?
|
|
||||||
m.sessionMu.Lock()
|
|
||||||
if _, ok := m.session[ref]; !ok || m.session[ref].statusChan == nil {
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
time.Sleep(time.Millisecond) // TODO: wait Build without busy loop and make it cancellable
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
statusChan = m.session[ref].statusChan
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
// forward status
|
|
||||||
for ss := range statusChan {
|
|
||||||
if ss == nil {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
if err := stream.Send(ss); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Server) Input(stream pb.Controller_InputServer) (err error) {
|
|
||||||
// Get the target ref from init message
|
|
||||||
msg, err := stream.Recv()
|
|
||||||
if err != nil {
|
|
||||||
if !errors.Is(err, io.EOF) {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
init := msg.GetInit()
|
|
||||||
if init == nil {
|
|
||||||
return errors.Errorf("unexpected message: %T; wanted init", msg.GetInit())
|
|
||||||
}
|
|
||||||
ref := init.Ref
|
|
||||||
if ref == "" {
|
|
||||||
return errors.New("input: no ref is provided")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Wait and get input stream pipe prepared by Build()
|
|
||||||
var inputPipeW *io.PipeWriter
|
|
||||||
for {
|
|
||||||
// TODO: timeout?
|
|
||||||
m.sessionMu.Lock()
|
|
||||||
if _, ok := m.session[ref]; !ok || m.session[ref].inputPipe == nil {
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
time.Sleep(time.Millisecond) // TODO: wait Build without busy loop and make it cancellable
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
inputPipeW = m.session[ref].inputPipe
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
// Forward input stream
|
|
||||||
eg, ctx := errgroup.WithContext(context.TODO())
|
|
||||||
done := make(chan struct{})
|
|
||||||
msgCh := make(chan *pb.InputMessage)
|
|
||||||
eg.Go(func() error {
|
|
||||||
defer close(msgCh)
|
|
||||||
for {
|
|
||||||
msg, err := stream.Recv()
|
|
||||||
if err != nil {
|
|
||||||
if !errors.Is(err, io.EOF) {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
select {
|
|
||||||
case msgCh <- msg:
|
|
||||||
case <-done:
|
|
||||||
return nil
|
|
||||||
case <-ctx.Done():
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
eg.Go(func() (retErr error) {
|
|
||||||
defer close(done)
|
|
||||||
defer func() {
|
|
||||||
if retErr != nil {
|
|
||||||
inputPipeW.CloseWithError(retErr)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
inputPipeW.Close()
|
|
||||||
}()
|
|
||||||
for {
|
|
||||||
var msg *pb.InputMessage
|
|
||||||
select {
|
|
||||||
case msg = <-msgCh:
|
|
||||||
case <-ctx.Done():
|
|
||||||
return errors.Wrap(ctx.Err(), "canceled")
|
|
||||||
}
|
|
||||||
if msg == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if data := msg.GetData(); data != nil {
|
|
||||||
if len(data.Data) > 0 {
|
|
||||||
_, err := inputPipeW.Write(data.Data)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if data.EOF {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
return eg.Wait()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Server) Invoke(srv pb.Controller_InvokeServer) error {
|
|
||||||
containerIn, containerOut := ioset.Pipe()
|
|
||||||
defer func() { containerOut.Close(); containerIn.Close() }()
|
|
||||||
|
|
||||||
initDoneCh := make(chan *processes.Process)
|
|
||||||
initErrCh := make(chan error)
|
|
||||||
eg, egCtx := errgroup.WithContext(context.TODO())
|
|
||||||
srvIOCtx, srvIOCancel := context.WithCancel(egCtx)
|
|
||||||
eg.Go(func() error {
|
|
||||||
defer srvIOCancel()
|
|
||||||
return serveIO(srvIOCtx, srv, func(initMessage *pb.InitMessage) (retErr error) {
|
|
||||||
defer func() {
|
|
||||||
if retErr != nil {
|
|
||||||
initErrCh <- retErr
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
ref := initMessage.Ref
|
|
||||||
cfg := initMessage.InvokeConfig
|
|
||||||
|
|
||||||
m.sessionMu.Lock()
|
|
||||||
s, ok := m.session[ref]
|
|
||||||
if !ok {
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
return errors.Errorf("invoke: unknown key %v", ref)
|
|
||||||
}
|
|
||||||
m.sessionMu.Unlock()
|
|
||||||
|
|
||||||
pid := initMessage.ProcessID
|
|
||||||
if pid == "" {
|
|
||||||
return errors.Errorf("invoke: specify process ID")
|
|
||||||
}
|
|
||||||
proc, ok := s.processes.Get(pid)
|
|
||||||
if !ok {
|
|
||||||
// Start a new process.
|
|
||||||
if cfg == nil {
|
|
||||||
return errors.New("no container config is provided")
|
|
||||||
}
|
|
||||||
var err error
|
|
||||||
proc, err = s.processes.StartProcess(pid, s.result, cfg)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Attach containerIn to this process
|
|
||||||
proc.ForwardIO(&containerIn, srvIOCancel)
|
|
||||||
initDoneCh <- proc
|
|
||||||
return nil
|
|
||||||
}, &ioServerConfig{
|
|
||||||
stdin: containerOut.Stdin,
|
|
||||||
stdout: containerOut.Stdout,
|
|
||||||
stderr: containerOut.Stderr,
|
|
||||||
// TODO: signal, resize
|
|
||||||
})
|
|
||||||
})
|
|
||||||
eg.Go(func() (rErr error) {
|
|
||||||
defer srvIOCancel()
|
|
||||||
// Wait for init done
|
|
||||||
var proc *processes.Process
|
|
||||||
select {
|
|
||||||
case p := <-initDoneCh:
|
|
||||||
proc = p
|
|
||||||
case err := <-initErrCh:
|
|
||||||
return err
|
|
||||||
case <-egCtx.Done():
|
|
||||||
return egCtx.Err()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Wait for IO done
|
|
||||||
select {
|
|
||||||
case <-srvIOCtx.Done():
|
|
||||||
return srvIOCtx.Err()
|
|
||||||
case err := <-proc.Done():
|
|
||||||
return err
|
|
||||||
case <-egCtx.Done():
|
|
||||||
return egCtx.Err()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
return eg.Wait()
|
|
||||||
}
|
|
||||||
@@ -1,17 +1,17 @@
|
|||||||
variable "GO_VERSION" {
|
variable "GO_VERSION" {
|
||||||
default = null
|
default = "1.17"
|
||||||
|
}
|
||||||
|
variable "BIN_OUT" {
|
||||||
|
default = "./bin"
|
||||||
|
}
|
||||||
|
variable "RELEASE_OUT" {
|
||||||
|
default = "./release-out"
|
||||||
}
|
}
|
||||||
variable "DOCS_FORMATS" {
|
variable "DOCS_FORMATS" {
|
||||||
default = "md"
|
default = "md"
|
||||||
}
|
}
|
||||||
variable "DESTDIR" {
|
|
||||||
default = "./bin"
|
|
||||||
}
|
|
||||||
variable "GOLANGCI_LINT_MULTIPLATFORM" {
|
|
||||||
default = null
|
|
||||||
}
|
|
||||||
|
|
||||||
# Special target: https://github.com/docker/metadata-action#bake-definition
|
// Special target: https://github.com/docker/metadata-action#bake-definition
|
||||||
target "meta-helper" {
|
target "meta-helper" {
|
||||||
tags = ["docker/buildx-bin:local"]
|
tags = ["docker/buildx-bin:local"]
|
||||||
}
|
}
|
||||||
@@ -35,17 +35,6 @@ target "lint" {
|
|||||||
inherits = ["_common"]
|
inherits = ["_common"]
|
||||||
dockerfile = "./hack/dockerfiles/lint.Dockerfile"
|
dockerfile = "./hack/dockerfiles/lint.Dockerfile"
|
||||||
output = ["type=cacheonly"]
|
output = ["type=cacheonly"]
|
||||||
platforms = GOLANGCI_LINT_MULTIPLATFORM != null ? [
|
|
||||||
"darwin/amd64",
|
|
||||||
"darwin/arm64",
|
|
||||||
"linux/amd64",
|
|
||||||
"linux/arm64",
|
|
||||||
"linux/s390x",
|
|
||||||
"linux/ppc64le",
|
|
||||||
"linux/riscv64",
|
|
||||||
"windows/amd64",
|
|
||||||
"windows/arm64"
|
|
||||||
] : []
|
|
||||||
}
|
}
|
||||||
|
|
||||||
target "validate-vendor" {
|
target "validate-vendor" {
|
||||||
@@ -59,7 +48,6 @@ target "validate-docs" {
|
|||||||
inherits = ["_common"]
|
inherits = ["_common"]
|
||||||
args = {
|
args = {
|
||||||
FORMATS = DOCS_FORMATS
|
FORMATS = DOCS_FORMATS
|
||||||
BUILDX_EXPERIMENTAL = 1 // enables experimental cmds/flags for docs generation
|
|
||||||
}
|
}
|
||||||
dockerfile = "./hack/dockerfiles/docs.Dockerfile"
|
dockerfile = "./hack/dockerfiles/docs.Dockerfile"
|
||||||
target = "validate"
|
target = "validate"
|
||||||
@@ -73,13 +61,6 @@ target "validate-authors" {
|
|||||||
output = ["type=cacheonly"]
|
output = ["type=cacheonly"]
|
||||||
}
|
}
|
||||||
|
|
||||||
target "validate-generated-files" {
|
|
||||||
inherits = ["_common"]
|
|
||||||
dockerfile = "./hack/dockerfiles/generated-files.Dockerfile"
|
|
||||||
target = "validate"
|
|
||||||
output = ["type=cacheonly"]
|
|
||||||
}
|
|
||||||
|
|
||||||
target "update-vendor" {
|
target "update-vendor" {
|
||||||
inherits = ["_common"]
|
inherits = ["_common"]
|
||||||
dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
|
dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
|
||||||
@@ -91,7 +72,6 @@ target "update-docs" {
|
|||||||
inherits = ["_common"]
|
inherits = ["_common"]
|
||||||
args = {
|
args = {
|
||||||
FORMATS = DOCS_FORMATS
|
FORMATS = DOCS_FORMATS
|
||||||
BUILDX_EXPERIMENTAL = 1 // enables experimental cmds/flags for docs generation
|
|
||||||
}
|
}
|
||||||
dockerfile = "./hack/dockerfiles/docs.Dockerfile"
|
dockerfile = "./hack/dockerfiles/docs.Dockerfile"
|
||||||
target = "update"
|
target = "update"
|
||||||
@@ -105,31 +85,28 @@ target "update-authors" {
|
|||||||
output = ["."]
|
output = ["."]
|
||||||
}
|
}
|
||||||
|
|
||||||
target "update-generated-files" {
|
|
||||||
inherits = ["_common"]
|
|
||||||
dockerfile = "./hack/dockerfiles/generated-files.Dockerfile"
|
|
||||||
target = "update"
|
|
||||||
output = ["."]
|
|
||||||
}
|
|
||||||
|
|
||||||
target "mod-outdated" {
|
target "mod-outdated" {
|
||||||
inherits = ["_common"]
|
inherits = ["_common"]
|
||||||
dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
|
dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
|
||||||
target = "outdated"
|
target = "outdated"
|
||||||
no-cache-filter = ["outdated"]
|
args = {
|
||||||
|
// used to invalidate cache for outdated run stage
|
||||||
|
// can be dropped when https://github.com/moby/buildkit/issues/1213 fixed
|
||||||
|
_RANDOM = uuidv4()
|
||||||
|
}
|
||||||
output = ["type=cacheonly"]
|
output = ["type=cacheonly"]
|
||||||
}
|
}
|
||||||
|
|
||||||
target "test" {
|
target "test" {
|
||||||
inherits = ["_common"]
|
inherits = ["_common"]
|
||||||
target = "test-coverage"
|
target = "test-coverage"
|
||||||
output = ["${DESTDIR}/coverage"]
|
output = ["./coverage"]
|
||||||
}
|
}
|
||||||
|
|
||||||
target "binaries" {
|
target "binaries" {
|
||||||
inherits = ["_common"]
|
inherits = ["_common"]
|
||||||
target = "binaries"
|
target = "binaries"
|
||||||
output = ["${DESTDIR}/build"]
|
output = [BIN_OUT]
|
||||||
platforms = ["local"]
|
platforms = ["local"]
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -153,7 +130,7 @@ target "binaries-cross" {
|
|||||||
target "release" {
|
target "release" {
|
||||||
inherits = ["binaries-cross"]
|
inherits = ["binaries-cross"]
|
||||||
target = "release"
|
target = "release"
|
||||||
output = ["${DESTDIR}/release"]
|
output = [RELEASE_OUT]
|
||||||
}
|
}
|
||||||
|
|
||||||
target "image" {
|
target "image" {
|
||||||
@@ -170,29 +147,3 @@ target "image-local" {
|
|||||||
inherits = ["image"]
|
inherits = ["image"]
|
||||||
output = ["type=docker"]
|
output = ["type=docker"]
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "HTTP_PROXY" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
variable "HTTPS_PROXY" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
variable "NO_PROXY" {
|
|
||||||
default = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
target "integration-test-base" {
|
|
||||||
inherits = ["_common"]
|
|
||||||
args = {
|
|
||||||
HTTP_PROXY = HTTP_PROXY
|
|
||||||
HTTPS_PROXY = HTTPS_PROXY
|
|
||||||
NO_PROXY = NO_PROXY
|
|
||||||
}
|
|
||||||
target = "integration-test-base"
|
|
||||||
output = ["type=cacheonly"]
|
|
||||||
}
|
|
||||||
|
|
||||||
target "integration-test" {
|
|
||||||
inherits = ["integration-test-base"]
|
|
||||||
target = "integration-test"
|
|
||||||
}
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -3,7 +3,6 @@ package main
|
|||||||
import (
|
import (
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/docker/buildx/commands"
|
"github.com/docker/buildx/commands"
|
||||||
clidocstool "github.com/docker/cli-docs-tool"
|
clidocstool "github.com/docker/cli-docs-tool"
|
||||||
@@ -17,7 +16,6 @@ import (
|
|||||||
_ "github.com/docker/buildx/driver/docker"
|
_ "github.com/docker/buildx/driver/docker"
|
||||||
_ "github.com/docker/buildx/driver/docker-container"
|
_ "github.com/docker/buildx/driver/docker-container"
|
||||||
_ "github.com/docker/buildx/driver/kubernetes"
|
_ "github.com/docker/buildx/driver/kubernetes"
|
||||||
_ "github.com/docker/buildx/driver/remote"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const defaultSourcePath = "docs/reference/"
|
const defaultSourcePath = "docs/reference/"
|
||||||
@@ -27,28 +25,6 @@ type options struct {
|
|||||||
formats []string
|
formats []string
|
||||||
}
|
}
|
||||||
|
|
||||||
// fixUpExperimentalCLI trims the " (EXPERIMENTAL)" suffix from the CLI output,
|
|
||||||
// as docs.docker.com already displays "experimental (CLI)",
|
|
||||||
//
|
|
||||||
// https://github.com/docker/buildx/pull/2188#issuecomment-1889487022
|
|
||||||
func fixUpExperimentalCLI(cmd *cobra.Command) {
|
|
||||||
const (
|
|
||||||
annotationExperimentalCLI = "experimentalCLI"
|
|
||||||
suffixExperimental = " (EXPERIMENTAL)"
|
|
||||||
)
|
|
||||||
if _, ok := cmd.Annotations[annotationExperimentalCLI]; ok {
|
|
||||||
cmd.Short = strings.TrimSuffix(cmd.Short, suffixExperimental)
|
|
||||||
}
|
|
||||||
cmd.Flags().VisitAll(func(f *pflag.Flag) {
|
|
||||||
if _, ok := f.Annotations[annotationExperimentalCLI]; ok {
|
|
||||||
f.Usage = strings.TrimSuffix(f.Usage, suffixExperimental)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
for _, c := range cmd.Commands() {
|
|
||||||
fixUpExperimentalCLI(c)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func gen(opts *options) error {
|
func gen(opts *options) error {
|
||||||
log.SetFlags(0)
|
log.SetFlags(0)
|
||||||
|
|
||||||
@@ -80,8 +56,6 @@ func gen(opts *options) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
case "yaml":
|
case "yaml":
|
||||||
// fix up is needed only for yaml (used for generating docs.docker.com contents)
|
|
||||||
fixUpExperimentalCLI(cmd)
|
|
||||||
if err = c.GenYamlTree(cmd); err != nil {
|
if err = c.GenYamlTree(cmd); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,48 @@
|
|||||||
# CI/CD
|
# CI/CD
|
||||||
|
|
||||||
This page has moved to [Docker Docs website](https://docs.docker.com/build/ci/)
|
## GitHub Actions
|
||||||
|
|
||||||
|
Docker provides a [GitHub Action that will build and push your image](https://github.com/docker/build-push-action/#about)
|
||||||
|
using Buildx. Here is a simple workflow:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
name: ci
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- 'main'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
docker:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
-
|
||||||
|
name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v1
|
||||||
|
-
|
||||||
|
name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v1
|
||||||
|
-
|
||||||
|
name: Login to DockerHub
|
||||||
|
uses: docker/login-action@v1
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
-
|
||||||
|
name: Build and push
|
||||||
|
uses: docker/build-push-action@v2
|
||||||
|
with:
|
||||||
|
push: true
|
||||||
|
tags: user/app:latest
|
||||||
|
```
|
||||||
|
|
||||||
|
In this example we are also using 3 other actions:
|
||||||
|
|
||||||
|
* [`setup-buildx`](https://github.com/docker/setup-buildx-action) action will create and boot a builder using by
|
||||||
|
default the `docker-container` [builder driver](../reference/buildx_create.md#driver).
|
||||||
|
This is **not required but recommended** using it to be able to build multi-platform images, export cache, etc.
|
||||||
|
* [`setup-qemu`](https://github.com/docker/setup-qemu-action) action can be useful if you want
|
||||||
|
to add emulation support with QEMU to be able to build against more platforms.
|
||||||
|
* [`login`](https://github.com/docker/login-action) action will take care to log
|
||||||
|
in against a Docker registry.
|
||||||
|
|||||||
@@ -1,3 +1,23 @@
|
|||||||
# CNI networking
|
# CNI networking
|
||||||
|
|
||||||
This page has moved to [Docker Docs website](https://docs.docker.com/build/buildkit/configure/#cni-networking)
|
It can be useful to use a bridge network for your builder if for example you
|
||||||
|
encounter a network port contention during multiple builds. If you're using
|
||||||
|
the BuildKit image, CNI is not yet available in it, but you can create
|
||||||
|
[a custom BuildKit image with CNI support](https://github.com/moby/buildkit/blob/master/docs/cni-networking.md).
|
||||||
|
|
||||||
|
Now build this image:
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ docker buildx build --tag buildkit-cni:local --load .
|
||||||
|
```
|
||||||
|
|
||||||
|
Then [create a `docker-container` builder](../reference/buildx_create.md) that
|
||||||
|
will use this image:
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ docker buildx create --use \
|
||||||
|
--name mybuilder \
|
||||||
|
--driver docker-container \
|
||||||
|
--driver-opt "image=buildkit-cni:local" \
|
||||||
|
--buildkitd-flags "--oci-worker-net=cni"
|
||||||
|
```
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user