diff options
| author | Rudi Floren <rudi.floren@googlemail.com> | 2021-03-04 17:22:23 +0000 |
|---|---|---|
| committer | Rudi Floren <rudi.floren@googlemail.com> | 2021-03-04 17:22:23 +0000 |
| commit | 156296ac051a83cf009cd399dc097164238a6a18 (patch) | |
| tree | 365f38fb56bae3c723b1317f8092432dc7347f80 /tests | |
| parent | 643109309bed7fc3ba638af3711354a1dcf4dd9a (diff) | |
| download | conduit-156296ac051a83cf009cd399dc097164238a6a18.zip | |
Fix Complement CI paths
The final container tried to COPY from the default cargo target dir, but we only checked if cached_target is present.
We copy from cached_target to target when cached_target is present now in the builder
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Complement.Dockerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/Complement.Dockerfile b/tests/Complement.Dockerfile index 370db7c..7deb6e8 100644 --- a/tests/Complement.Dockerfile +++ b/tests/Complement.Dockerfile @@ -9,7 +9,9 @@ ARG SCCACHE_ENDPOINT ARG SCCACHE_S3_USE_SSL COPY . . -RUN test -e cached_target/release/conduit || cargo build --release +RUN mkdir -p target/release +RUN test -e cached_target/release/conduit && cp cached_target/release/conduit target/release/conduit || cargo build --release + FROM valkum/docker-rust-ci:latest WORKDIR /workdir @@ -37,4 +39,4 @@ CMD ([ -z "${COMPLEMENT_CA}" ] && echo "Error: Need Complement PKI support" && t sed -i "s/your.server.name/${SERVER_NAME}/g" caddy.json && \ /workdir/caddy start --config caddy.json > /dev/null && \ /workdir/conduit -
\ No newline at end of file + |