Skip to content

Commit d9fec59

Browse files
committed
ci: fix context for disabled docker images
When the dockerfiles were moved into the host-x86_64 directory, paths for COPY commands were updated with the new host-x86_64/ prefix. This suggested that the intended context was src/ci/docker. However, the context for disabled docker images was src/ci/docker/host-x86_64. This broke the new paths and prevented src/ci/docker/scripts from being included in the context at all. This commit corrects this context allowing docker to find the files it needs for COPY commands.
1 parent 51b646e commit d9fec59

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/ci/docker/run.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ elif [ -f "$docker_dir/disabled/$image/Dockerfile" ]; then
119119
exit 1
120120
fi
121121
# Transform changes the context of disabled Dockerfiles to match the enabled ones
122-
tar --transform 's#^./disabled/#./#' -C $docker_dir -c . | docker \
122+
tar --transform 's#disabled/#./#' -C $script_dir -c . | docker \
123123
build \
124124
--rm \
125125
-t rust-ci \
126-
-f "$image/Dockerfile" \
126+
-f "host-$(uname -m)/$image/Dockerfile" \
127127
-
128128
else
129129
echo Invalid image: $image

0 commit comments

Comments
 (0)