Skip to content

Commit 5d836d6

Browse files
committed
Test with buildx
Signed-off-by: apostasie <[email protected]>
1 parent b187986 commit 5d836d6

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

.github/workflows/test.yml

+13-14
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,11 @@ jobs:
4747
uses: crazy-max/ghaction-github-runtime@v3
4848
- name: "Enable containerd to be able to use gha cache"
4949
run: |
50-
sudo mkdir -p /etc/docker
51-
echo '{"features": {"containerd-snapshotter": true}}' | sudo tee /etc/docker/daemon.json
52-
sudo systemctl restart docker
50+
docker buildx create --name with-gha --use
5351
- name: "Build dependencies for the integration test environment image"
5452
run: |
55-
docker build \
53+
docker buildx build \
54+
--output=type=docker \
5655
--cache-to type=gha,mode=max,scope=${ARCH}-${CONTAINERD_VERSION} \
5756
--cache-from type=gha,scope=${ARCH}-${CONTAINERD_VERSION} \
5857
--target build-dependencies --build-arg CONTAINERD_VERSION=${CONTAINERD_VERSION} .
@@ -136,12 +135,11 @@ jobs:
136135
uses: crazy-max/ghaction-github-runtime@v3
137136
- name: "Enable containerd to be able to use gha cache"
138137
run: |
139-
sudo mkdir -p /etc/docker
140-
echo '{"features": {"containerd-snapshotter": true}}' | sudo tee /etc/docker/daemon.json
141-
sudo systemctl restart docker
138+
docker buildx create --name with-gha --use
142139
- name: "Prepare integration test environment"
143140
run: |
144-
docker build \
141+
docker buildx build \
142+
--output=type=docker \
145143
--cache-from type=gha,scope=${ARCH}-${CONTAINERD_VERSION} \
146144
-t test-integration --target test-integration --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} --build-arg CONTAINERD_VERSION=${CONTAINERD_VERSION} .
147145
- name: "Remove snap loopback devices (conflicts with our loopback devices in TestRunDevice)"
@@ -194,11 +192,13 @@ jobs:
194192
- name: Enable IPv6 for Docker, and configure docker to use containerd for gha
195193
run: |
196194
sudo mkdir -p /etc/docker
197-
echo '{"features": {"containerd-snapshotter": true}, "ipv6": true, "fixed-cidr-v6": "2001:db8:1::/64", "experimental": true, "ip6tables": true}' | sudo tee /etc/docker/daemon.json
195+
echo '{"ipv6": true, "fixed-cidr-v6": "2001:db8:1::/64", "experimental": true, "ip6tables": true}' | sudo tee /etc/docker/daemon.json
198196
sudo systemctl restart docker
197+
docker buildx create --name with-gha --use
199198
- name: "Prepare integration test environment"
200199
run: |
201-
docker build \
200+
docker buildx build \
201+
--output=type=docker \
202202
--cache-from type=gha,scope=${ARCH}-${CONTAINERD_VERSION} \
203203
-t test-integration --target test-integration --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} --build-arg CONTAINERD_VERSION=${CONTAINERD_VERSION} .
204204
- name: "Remove snap loopback devices (conflicts with our loopback devices in TestRunDevice)"
@@ -293,12 +293,11 @@ jobs:
293293
uses: crazy-max/ghaction-github-runtime@v3
294294
- name: "Enable containerd to be able to use gha cache"
295295
run: |
296-
sudo mkdir -p /etc/docker
297-
echo '{"features": {"containerd-snapshotter": true}}' | sudo tee /etc/docker/daemon.json
298-
sudo systemctl restart docker
296+
docker buildx create --name with-gha --use
299297
- name: "Prepare (network driver=slirp4netns, port driver=builtin)"
300298
run: |
301-
docker build \
299+
docker buildx build \
300+
--output=type=docker \
302301
--cache-from type=gha,scope=${ARCH}-${CONTAINERD_VERSION} \
303302
-t ${TEST_TARGET} --target ${TEST_TARGET} --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} --build-arg CONTAINERD_VERSION=${CONTAINERD_VERSION} --build-arg ROOTLESSKIT_VERSION=${ROOTLESSKIT_VERSION} .
304303
- name: "Disable BuildKit for RootlessKit v1 (workaround for issue #622)"

0 commit comments

Comments
 (0)