diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-09-29 17:59:05 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 17:59:05 -0600 |
| commit | d6451f0b33a112217fd59dc4d3c938796bdbbcd7 (patch) | |
| tree | 7837f2607522f132cdaee776ebd75a884ba6b245 /src | |
| parent | 4489a7a0bba46396420336a8f36310edf7bdd8bb (diff) | |
| parent | 3457a22d9151806d2af401a94076cb55d88ac8c8 (diff) | |
| download | rust-d6451f0b33a112217fd59dc4d3c938796bdbbcd7.tar.gz rust-d6451f0b33a112217fd59dc4d3c938796bdbbcd7.zip | |
Rollup merge of #44903 - kallisti5:ci-build-disabled, r=aidanhs
ci: Fix building disabled containers * Change the context into the disabled directory. Now you can test containers which are disabled.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/disabled/aarch64-gnu/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/disabled/wasm32-exp/Dockerfile | 2 | ||||
| -rwxr-xr-x | src/ci/docker/run.sh | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/ci/docker/disabled/aarch64-gnu/Dockerfile b/src/ci/docker/disabled/aarch64-gnu/Dockerfile index 9a0e4531223..fedb4094c8a 100644 --- a/src/ci/docker/disabled/aarch64-gnu/Dockerfile +++ b/src/ci/docker/disabled/aarch64-gnu/Dockerfile @@ -31,7 +31,7 @@ WORKDIR /build # The `config` config file was a previously generated config file for # the kernel. This file was generated by running `make defconfig` # followed by `make menuconfig` and then enabling the IPv6 protocol page. -COPY disabled/aarch64-gnu/config /build/.config +COPY aarch64-gnu/config /build/.config RUN curl https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.4.42.tar.xz | \ tar xJf - && \ cd /build/linux-4.4.42 && \ diff --git a/src/ci/docker/disabled/wasm32-exp/Dockerfile b/src/ci/docker/disabled/wasm32-exp/Dockerfile index 6323369421b..8653b0e8b46 100644 --- a/src/ci/docker/disabled/wasm32-exp/Dockerfile +++ b/src/ci/docker/disabled/wasm32-exp/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # emscripten COPY scripts/emscripten-wasm.sh /scripts/ -COPY disabled/wasm32-exp/node.sh /usr/local/bin/node +COPY wasm32-exp/node.sh /usr/local/bin/node RUN bash /scripts/emscripten-wasm.sh # cache diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index 7087033e117..b2560c6b95b 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -36,12 +36,14 @@ elif [ -f "$docker_dir/disabled/$image/Dockerfile" ]; then echo Cannot run disabled images on travis! exit 1 fi - retry docker \ + # retry messes with the pipe from tar to docker. Not needed on non-travis + # Transform changes the context of disabled Dockerfiles to match the enabled ones + tar --transform 's#^./disabled/#./#' -C $docker_dir -c . | docker \ build \ --rm \ -t rust-ci \ - -f "$docker_dir/disabled/$image/Dockerfile" \ - "$docker_dir" + -f "$image/Dockerfile" \ + - else echo Invalid image: $image exit 1 |