diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_attach.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_attach.md index 5a0338819225..6d5cff9d982e 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_attach.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_attach.md @@ -11,7 +11,7 @@ Attach local standard input, output, and error streams to a service's running co | `--dry-run` | | | Execute command in dry run mode | | `--index` | `int` | `0` | index of the container if service has multiple replicas. | | `--no-stdin` | | | Do not attach STDIN | -| `--sig-proxy` | | | Proxy all received signals to the process | +| `--sig-proxy` | `bool` | `true` | Proxy all received signals to the process | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_build.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_build.md index a0ceb050c091..271dfcde7b61 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_build.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_build.md @@ -23,7 +23,7 @@ Build or rebuild services ## Description -Services are built once and then tagged, by default as `project_service`. +Services are built once and then tagged, by default as `project-service`. If the Compose file specifies an [image](https://github.com/compose-spec/compose-spec/blob/master/spec.md#image) name, diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_config.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_config.md index fd213b4c38cc..e38eb5c654ee 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_config.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_config.md @@ -13,18 +13,19 @@ Parse, resolve and render compose file in canonical format |:--------------------------|:---------|:--------|:----------------------------------------------------------------------------| | `--dry-run` | | | Execute command in dry run mode | | `--format` | `string` | `yaml` | Format the output. Values: [yaml \| json] | -| `--hash` | `string` | | Print the service config hash, one per line | -| `--images` | | | Print the image names, one per line | +| `--hash` | `string` | | Print the service config hash, one per line. | +| `--images` | | | Print the image names, one per line. | | `--no-consistency` | | | Don't check model consistency - warning: may produce invalid Compose output | | `--no-interpolate` | | | Don't interpolate environment variables | | `--no-normalize` | | | Don't normalize compose model | | `--no-path-resolution` | | | Don't resolve file paths | | `-o`, `--output` | `string` | | Save to file (default to stdout) | -| `--profiles` | | | Print the profile names, one per line | +| `--profiles` | | | Print the profile names, one per line. | | `-q`, `--quiet` | | | Only validate the configuration, don't print anything | | `--resolve-image-digests` | | | Pin image tags to digests | -| `--services` | | | Print the service names, one per line | -| `--volumes` | | | Print the volume names, one per line | +| `--services` | | | Print the service names, one per line. | +| `--variables` | | | Print model variables and default values. | +| `--volumes` | | | Print the volume names, one per line. | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_exec.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_exec.md index fab822178281..d647ea0e4974 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_exec.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_exec.md @@ -11,7 +11,7 @@ Execute a command in a running container | `--dry-run` | | | Execute command in dry run mode | | `-e`, `--env` | `stringArray` | | Set environment variables | | `--index` | `int` | `0` | Index of the container if service has multiple replicas | -| `-T`, `--no-TTY` | | | Disable pseudo-TTY allocation. By default `docker compose exec` allocates a TTY. | +| `-T`, `--no-TTY` | `bool` | `true` | Disable pseudo-TTY allocation. By default `docker compose exec` allocates a TTY. | | `--privileged` | | | Give extended privileges to the process | | `-u`, `--user` | `string` | | Run the command as this user | | `-w`, `--workdir` | `string` | | Path to workdir directory for this command | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_ps.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_ps.md index f0c1a2576278..70b409ecc061 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_ps.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_ps.md @@ -12,7 +12,7 @@ List containers | [`--filter`](#filter) | `string` | | Filter services by a property (supported filters: status) | | [`--format`](#format) | `string` | `table` | Format output using a custom template:
'table': Print output in table format with column headers (default)
'table TEMPLATE': Print output in table format using the given Go template
'json': Print in JSON format
'TEMPLATE': Print output using the given Go template.
Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates | | `--no-trunc` | | | Don't truncate output | -| `--orphans` | | | Include orphaned services (not declared by project) | +| `--orphans` | `bool` | `true` | Include orphaned services (not declared by project) | | `-q`, `--quiet` | | | Only display IDs | | `--services` | | | Display services | | [`--status`](#status) | `stringArray` | | Filter services by status. Values: [paused \| restarting \| removing \| running \| dead \| created \| exited] | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_run.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_run.md index 185b4ad073ac..656ea353eaee 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_run.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_run.md @@ -14,10 +14,10 @@ Run a one-off command on a service | `--dry-run` | | | Execute command in dry run mode | | `--entrypoint` | `string` | | Override the entrypoint of the image | | `-e`, `--env` | `stringArray` | | Set environment variables | -| `-i`, `--interactive` | | | Keep STDIN open even if not attached | +| `-i`, `--interactive` | `bool` | `true` | Keep STDIN open even if not attached | | `-l`, `--label` | `stringArray` | | Add or override a label | | `--name` | `string` | | Assign a name to the container | -| `-T`, `--no-TTY` | | | Disable pseudo-TTY allocation (default: auto-detected) | +| `-T`, `--no-TTY` | `bool` | `true` | Disable pseudo-TTY allocation (default: auto-detected) | | `--no-deps` | | | Don't start linked services | | `-p`, `--publish` | `stringArray` | | Publish a container's port(s) to the host | | `--quiet-pull` | | | Pull without printing progress information | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_build.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_build.yaml index 34175696fb5c..1c7c2ecd9e49 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_build.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_build.yaml @@ -1,7 +1,7 @@ command: docker compose build short: Build or rebuild services long: |- - Services are built once and then tagged, by default as `project_service`. + Services are built once and then tagged, by default as `project-service`. If the Compose file specifies an [image](https://github.com/compose-spec/compose-spec/blob/master/spec.md#image) name, diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_config.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_config.yaml index ea7669b0d97f..68a7b8994eba 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_config.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_config.yaml @@ -21,7 +21,7 @@ options: swarm: false - option: hash value_type: string - description: Print the service config hash, one per line + description: Print the service config hash, one per line. deprecated: false hidden: false experimental: false @@ -31,7 +31,7 @@ options: - option: images value_type: bool default_value: "false" - description: Print the image names, one per line + description: Print the image names, one per line. deprecated: false hidden: false experimental: false @@ -92,7 +92,7 @@ options: - option: profiles value_type: bool default_value: "false" - description: Print the profile names, one per line + description: Print the profile names, one per line. deprecated: false hidden: false experimental: false @@ -123,7 +123,17 @@ options: - option: services value_type: bool default_value: "false" - description: Print the service names, one per line + description: Print the service names, one per line. + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: variables + value_type: bool + default_value: "false" + description: Print model variables and default values. deprecated: false hidden: false experimental: false @@ -133,7 +143,7 @@ options: - option: volumes value_type: bool default_value: "false" - description: Print the volume names, one per line + description: Print the volume names, one per line. deprecated: false hidden: false experimental: false diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml index ec269c8b85b1..967a16379f90 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml @@ -108,6 +108,17 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: menu + value_type: bool + default_value: "false" + description: | + Enable interactive shortcuts when running attached (Experimental). Incompatible with --detach. + deprecated: false + hidden: true + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: no-attach value_type: stringArray default_value: '[]' diff --git a/_vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md b/_vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md index b7ec6d0408fe..85afe175c12f 100644 --- a/_vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md +++ b/_vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md @@ -453,7 +453,7 @@ The exec form is parsed as a JSON array, which means that you must use double-quotes (") around words, not single-quotes ('). ```dockerfile -ENTRYPOINT ["/bin/bash", "-c", "echo", "hello"] +ENTRYPOINT ["/bin/bash", "-c", "echo hello"] ``` The exec form is best used to specify an `ENTRYPOINT` instruction, combined @@ -564,8 +564,10 @@ The image can be any valid image. `FROM` instruction. Each `FROM` instruction clears any state created by previous instructions. - Optionally a name can be given to a new build stage by adding `AS name` to the - `FROM` instruction. The name can be used in subsequent `FROM` and - `COPY --from=` instructions to refer to the image built in this stage. + `FROM` instruction. The name can be used in subsequent `FROM `, + [`COPY --from=`](#copy---from), + and [`RUN --mount=type=bind,from=`](#run---mounttypebind) instructions + to refer to the image built in this stage. - The `tag` or `digest` values are optional. If you omit either of them, the builder assumes a `latest` tag by default. The builder returns an error if it can't find the `tag` value. @@ -786,7 +788,7 @@ with support for passphrases. | `uid` | User ID for socket. Default `0`. | | `gid` | Group ID for socket. Default `0`. | -#### Example: access to Gitlab +#### Example: access to GitLab ```dockerfile # syntax=docker/dockerfile:1 @@ -1361,6 +1363,7 @@ COPY [OPTIONS] ["", ... ""] The available `[OPTIONS]` are: +- [`--from`](#copy---from) - [`--chown`](#copy---chown---chmod) - [`--chmod`](#copy---chown---chmod) - [`--link`](#copy---link) @@ -1426,10 +1429,10 @@ attempted to be used instead. `COPY` obeys the following rules: -- The `` path must be inside the build context; - you can't use `COPY ../something /something`, because the builder can only - access files from the context, and `../something` specifies a parent file or - directory of the build context root. +- The `` path is resolved relative to the build context. + If you specify a relative path leading outside of the build context, such as + `COPY ../something /something`, parent directory paths are stripped out automatically. + The effective source path in this example becomes `COPY something /something` - If `` is a directory, the entire contents of the directory are copied, including filesystem metadata. @@ -1462,6 +1465,42 @@ attempted to be used instead. > guide – Leverage build cache](https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#leverage-build-cache) > for more information. +### COPY --from + +By default, the `COPY` instruction copies files from the build context. The +`COPY --from` flag lets you copy files from an image, a build stage, +or a named context instead. + +```dockerfile +COPY [--from=] ... +``` + +To copy from a build stage in a +[multi-stage build](https://docs.docker.com/build/building/multi-stage/), +specify the name of the stage you want to copy from. You specify stage names +using the `AS` keyword with the `FROM` instruction. + +```dockerfile +# syntax=docker/dockerfile:1 +FROM alpine AS build +COPY . . +RUN apk add clang +RUN clang -o /hello hello.c + +FROM scratch +COPY --from=build /hello / +``` + +You can also copy files directly from other images. The following example +copies an `nginx.conf` file from the official Nginx image. + +```dockerfile +COPY --from=nginx:latest /etc/nginx/nginx.conf /nginx.conf +``` + +The source path of `COPY --from` is always resolved from filesystem root of the +image or stage that you specify. + ### COPY --chown --chmod > **Note** @@ -2098,14 +2137,6 @@ flag. > learn about secure ways to use secrets when building images. { .warning } - -If you specify a build argument that wasn't defined in the Dockerfile, -the build outputs a warning. - -```console -[Warning] One or more build-args [foo] were not consumed. -``` - A Dockerfile may include one or more `ARG` instructions. For example, the following is a valid Dockerfile: @@ -2449,15 +2480,11 @@ ONBUILD ADD . /app/src ONBUILD RUN /usr/local/bin/python-build --dir /app/src ``` -> **Warning** -> -> Chaining `ONBUILD` instructions using `ONBUILD ONBUILD` isn't allowed. -{ .warning } +### ONBUILD limitations -> **Warning** -> -> The `ONBUILD` instruction may not trigger `FROM` or `MAINTAINER` instructions. -{ .warning } +- Chaining `ONBUILD` instructions using `ONBUILD ONBUILD` isn't allowed. +- The `ONBUILD` instruction may not trigger `FROM` or `MAINTAINER` instructions. +- `ONBUILD COPY --from` is [not supported](https://github.com/moby/buildkit/issues/816). ## STOPSIGNAL diff --git a/_vendor/modules.txt b/_vendor/modules.txt index e1a85630e6d6..b0c916b5cf6a 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,5 +1,5 @@ # github.com/moby/moby v26.0.0+incompatible -# github.com/moby/buildkit v0.13.0 -# github.com/docker/buildx v0.13.1 +# github.com/moby/buildkit v0.13.0-rc3.0.20240402103816-7cd12732690e +# github.com/docker/buildx v0.0.0-00010101000000-000000000000 # github.com/docker/cli v26.0.0+incompatible -# github.com/docker/compose/v2 v2.26.1 +# github.com/docker/compose/v2 v2.0.0-00010101000000-000000000000 diff --git a/go.mod b/go.mod index 009ad2e46eaa..bbc7e7340db2 100644 --- a/go.mod +++ b/go.mod @@ -7,15 +7,15 @@ toolchain go1.21.1 require ( github.com/docker/buildx v0.13.1 // indirect github.com/docker/cli v26.0.0+incompatible // indirect - github.com/docker/compose/v2 v2.26.1 // indirect - github.com/moby/buildkit v0.13.0 // indirect + github.com/docker/compose/v2 v2.0.0-00010101000000-000000000000 // indirect + github.com/moby/buildkit v0.13.1 // indirect github.com/moby/moby v26.0.0+incompatible // indirect ) replace ( github.com/docker/buildx => github.com/docker/buildx v0.13.1 github.com/docker/cli => github.com/docker/cli v26.0.0+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.25.0 - github.com/moby/buildkit => github.com/moby/buildkit v0.13.0-rc3.0.20240308080452-a38011b9f57d + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.26.1 + github.com/moby/buildkit => github.com/moby/buildkit v0.13.0-rc3.0.20240402103816-7cd12732690e github.com/moby/moby => github.com/moby/moby v26.0.0+incompatible ) diff --git a/go.sum b/go.sum index 0e002a869bc0..6b5a308534ed 100644 --- a/go.sum +++ b/go.sum @@ -122,6 +122,8 @@ github.com/docker/compose/v2 v2.24.7 h1:1WSo4CVf18tnGJMC6V78jYsAxSDD61ry6L3JwVT+ github.com/docker/compose/v2 v2.24.7/go.mod h1:7U3QbXdRJfBylTgkdlrjOg8hWLZqM09mof9DVZ5Fh4E= github.com/docker/compose/v2 v2.25.0 h1:UMCrWFItKdXXrlbxvA63V3aFb4Nr3zmlSY2GvJIqJW0= github.com/docker/compose/v2 v2.25.0/go.mod h1:M0PSYeTsp2ZEZJGhvzNTBtJeJRN7ZBGb4Ft1mUteTac= +github.com/docker/compose/v2 v2.26.1 h1:27fAR5jVzNUYwY/9ppIjrPqGYLW5HtOTq2aYGBMCtA0= +github.com/docker/compose/v2 v2.26.1/go.mod h1:5iVCMlr18ab0NlMxIPdtTgThTkzb34Z/zj15N7KSW+s= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= @@ -218,6 +220,8 @@ github.com/moby/buildkit v0.13.0-rc3.0.20240307092343-22d4212fed7e h1:lEQehVlOgE github.com/moby/buildkit v0.13.0-rc3.0.20240307092343-22d4212fed7e/go.mod h1:P5zIr3pyh1VQoK751o5JFtogepVcLi9+77PTfmvJwls= github.com/moby/buildkit v0.13.0-rc3.0.20240308080452-a38011b9f57d h1:q8sI5enL3NBniNUIeVyrbUj6WCSc0gg+tAQgX1m6oTM= github.com/moby/buildkit v0.13.0-rc3.0.20240308080452-a38011b9f57d/go.mod h1:P5zIr3pyh1VQoK751o5JFtogepVcLi9+77PTfmvJwls= +github.com/moby/buildkit v0.13.0-rc3.0.20240402103816-7cd12732690e h1:+hA09x+9xK3KoXtxNFHiJxBbJrpVr/7UR221F2+pG9w= +github.com/moby/buildkit v0.13.0-rc3.0.20240402103816-7cd12732690e/go.mod h1:ij4XbVmcwOPQdTJQeO6341hqzvlw10kkuSsT36suSrk= github.com/moby/buildkit v0.13.0 h1:reVR1Y+rbNIUQ9jf0Q1YZVH5a/nhOixZsl+HJ9qQEGI= github.com/moby/buildkit v0.13.0/go.mod h1:aNmNQKLBFYAOFuzQjR3VA27/FijlvtBD1pjNwTSN37k= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= @@ -250,6 +254,7 @@ github.com/opencontainers/image-spec v1.1.0-rc4/go.mod h1:X4pATf0uXsnn3g5aiGIsVn github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI= github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= github.com/opencontainers/image-spec v1.1.0-rc6 h1:XDqvyKsJEbRtATzkgItUqBA7QHk58yxX1Ov9HERHNqU= +github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=