Skip to content

Commit 1049538

Browse files
committed
dockerfile: update to docker v29.0.0
Signed-off-by: CrazyMax <[email protected]>
1 parent 6e68733 commit 1049538

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,24 +76,24 @@ jobs:
7676
- worker: docker+containerd # same as docker, but with containerd snapshotter
7777
pkg: ./tests
7878
mode: experimental
79-
- worker: "docker@27.5"
79+
- worker: "docker@28.5"
8080
pkg: ./tests
81-
- worker: "docker+containerd@27.5" # same as docker, but with containerd snapshotter
81+
- worker: "docker+containerd@28.5" # same as docker, but with containerd snapshotter
8282
pkg: ./tests
83-
- worker: "docker@27.5"
83+
- worker: "docker@28.5"
8484
pkg: ./tests
8585
mode: experimental
86-
- worker: "docker+containerd@27.5" # same as docker, but with containerd snapshotter
86+
- worker: "docker+containerd@28.5" # same as docker, but with containerd snapshotter
8787
pkg: ./tests
8888
mode: experimental
89-
- worker: "docker@26.1"
89+
- worker: "docker@27.5"
9090
pkg: ./tests
91-
- worker: "docker+containerd@26.1" # same as docker, but with containerd snapshotter
91+
- worker: "docker+containerd@27.5" # same as docker, but with containerd snapshotter
9292
pkg: ./tests
93-
- worker: "docker@26.1"
93+
- worker: "docker@27.5"
9494
pkg: ./tests
9595
mode: experimental
96-
- worker: "docker+containerd@26.1" # same as docker, but with containerd snapshotter
96+
- worker: "docker+containerd@27.5" # same as docker, but with containerd snapshotter
9797
pkg: ./tests
9898
mode: experimental
9999
steps:

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ ARG ALPINE_VERSION=3.22
55
ARG XX_VERSION=1.7.0
66

77
# for testing
8-
ARG DOCKER_VERSION=28.4
8+
ARG DOCKER_VERSION=29.0.0-rc.3
9+
ARG DOCKER_VERSION_ALT_28=28.5
910
ARG DOCKER_VERSION_ALT_27=27.5.1
10-
ARG DOCKER_VERSION_ALT_26=26.1.3
1111
ARG DOCKER_CLI_VERSION=${DOCKER_VERSION}
1212
ARG GOTESTSUM_VERSION=v1.13.0
1313
ARG REGISTRY_VERSION=3.0.0
@@ -19,10 +19,10 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
1919
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golatest
2020
FROM moby/moby-bin:$DOCKER_VERSION AS docker-engine
2121
FROM dockereng/cli-bin:$DOCKER_CLI_VERSION AS docker-cli
22+
FROM moby/moby-bin:$DOCKER_VERSION_ALT_28 AS docker-engine-alt28
2223
FROM moby/moby-bin:$DOCKER_VERSION_ALT_27 AS docker-engine-alt27
23-
FROM moby/moby-bin:$DOCKER_VERSION_ALT_26 AS docker-engine-alt26
24+
FROM dockereng/cli-bin:$DOCKER_VERSION_ALT_28 AS docker-cli-alt28
2425
FROM dockereng/cli-bin:$DOCKER_VERSION_ALT_27 AS docker-cli-alt27
25-
FROM dockereng/cli-bin:$DOCKER_VERSION_ALT_26 AS docker-cli-alt26
2626
FROM registry:$REGISTRY_VERSION AS registry
2727
FROM moby/buildkit:$BUILDKIT_VERSION AS buildkit
2828
FROM docker/compose-bin:$COMPOSE_VERSION AS compose
@@ -133,17 +133,17 @@ COPY --link --from=gotestsum /out /usr/bin/
133133
COPY --link --from=registry /bin/registry /usr/bin/
134134
COPY --link --from=docker-engine / /usr/bin/
135135
COPY --link --from=docker-cli / /usr/bin/
136+
COPY --link --from=docker-engine-alt28 / /opt/docker-alt-28/
136137
COPY --link --from=docker-engine-alt27 / /opt/docker-alt-27/
137-
COPY --link --from=docker-engine-alt26 / /opt/docker-alt-26/
138+
COPY --link --from=docker-cli-alt28 / /opt/docker-alt-28/
138139
COPY --link --from=docker-cli-alt27 / /opt/docker-alt-27/
139-
COPY --link --from=docker-cli-alt26 / /opt/docker-alt-26/
140140
COPY --link --from=buildkit /usr/bin/buildkitd /usr/bin/
141141
COPY --link --from=buildkit /usr/bin/buildctl /usr/bin/
142142
COPY --link --from=compose /docker-compose /usr/bin/compose
143143
COPY --link --from=undock /usr/local/bin/undock /usr/bin/
144144
COPY --link --from=binaries /buildx /usr/bin/
145145
RUN mkdir -p /usr/local/lib/docker/cli-plugins && ln -s /usr/bin/buildx /usr/local/lib/docker/cli-plugins/docker-buildx
146-
ENV TEST_DOCKER_EXTRA="docker@27.5=/opt/docker-alt-27,docker@26.1=/opt/docker-alt-26"
146+
ENV TEST_DOCKER_EXTRA="docker@28.5=/opt/docker-alt-28,docker@27.5=/opt/docker-alt-27"
147147

148148
FROM integration-test-base AS integration-test
149149
COPY . .

0 commit comments

Comments
 (0)