Skip to content

Commit 5e899c1

Browse files
committed
properly set architecture on dockerfile builds; attempt to locate DockerCli on Windows
1 parent dfb1c07 commit 5e899c1

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

.github/scripts/run-container-test.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,14 @@ def create_docker_image(opts, oci_exe, base_image_name, packages):
111111

112112
# Build the image
113113
image_name = f"container-test-{opts.distro}:latest"
114+
platform = DOCKER_PLATFORM_BY_ARCH[opts.arch]
114115
cmd = shlex.join([
115116
oci_exe,
116117
"build",
117118
"-t",
118119
image_name,
120+
"--platform",
121+
platform,
119122
".",
120123
])
121124
shell(cmd)

.github/workflows/ci.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,12 @@ jobs:
141141
- name: Configure Docker Images
142142
shell: bash
143143
run: |
144+
echo "Checking for DockerCli.exe via which"
145+
which DockerCli.exe || true
146+
147+
echo "Checking for DockerCli.exe via path"
148+
ls /c/Program\ Files/Docker/Docker/DockerCli.exe
149+
144150
echo "Building Docker images"
145151
./docker-images/build-images.sh mingw-x64
146152
echo "Built images:"

0 commit comments

Comments
 (0)