Skip to content

Commit

Permalink
chore(deps): upgrade BuildKit to v0.13 / Moby to v26
Browse files Browse the repository at this point in the history 
Additionally update some workflows in CI to add Moby
v26 RC2 to the matrix and upgrade the various Docker
actions.

Signed-off-by: Milas Bowman <[email protected]>
  • Loading branch information
@milas
milas committed Mar 8, 2024
1 parent 4efb897 commit c82ab38
Show file tree
Hide file tree
Showing 16 changed files with 267 additions and 280 deletions.
27 changes: 13 additions & 14 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ on:
required: false
default: "false"

env:
DOCKER_CLI_VERSION: "25.0.1"

permissions:
contents: read # to fetch code (actions/checkout)

Expand Down Expand Up @@ -84,13 +81,13 @@ jobs:
uses: actions/checkout@v3
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
-
name: Build
uses: docker/bake-action@v2
uses: docker/bake-action@v4
with:
targets: release
set: |
Expand All @@ -113,10 +110,10 @@ jobs:
uses: actions/checkout@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
-
name: Test
uses: docker/bake-action@v2
uses: docker/bake-action@v4
with:
targets: test
set: |
Expand Down Expand Up @@ -144,8 +141,9 @@ jobs:
- plugin
- standalone
engine:
- 26.0.0-rc2
- 24.0.9
- 25.0.3
- 25.0.4
steps:
-
name: Checkout
Expand All @@ -154,22 +152,23 @@ jobs:
run: |
sudo apt-get install curl
curl -fsSL https://get.docker.com -o get-docker.sh
sudo sh ./get-docker.sh --version ${{ matrix.engine }}
# test channel has stable packages too but lets us use RCs as well
sudo sh ./get-docker.sh --channel test --version ${{ matrix.engine }}
- name: Check Docker Version
run: docker --version
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
-
name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
check-latest: true
cache: true
-
name: Build
uses: docker/bake-action@v2
uses: docker/bake-action@v4
with:
targets: binary-with-coverage
set: |
Expand Down Expand Up @@ -223,7 +222,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
check-latest: true
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/compose_attach.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 |


<!---MARKER_GEN_END-->
2 changes: 1 addition & 1 deletion docs/reference/compose_exec.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/compose_ps.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:<br>'table': Print output in table format with column headers (default)<br>'table TEMPLATE': Print output in table format using the given Go template<br>'json': Print in JSON format<br>'TEMPLATE': Print output using the given Go template.<br>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] |
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/compose_run.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
Loading

0 comments on commit c82ab38

Please sign in to comment.