diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 1e651818c8ea..e072b1736d71 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -23,7 +23,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH -RUN GOARCH=$(go env GOARCH); \ +RUN set -ex; \ + GOARCH=$(go env GOARCH); \ if [ "${GOARCH}" = "arm" ]; then \ RUST_ARCH=armv7-unknown-linux-gnueabihf; \ TRIVY_ARCH=ARM; \ @@ -37,7 +38,7 @@ RUN GOARCH=$(go env GOARCH); \ RUST_ARCH=s390x-unknown-linux-gnu; \ fi; \ if [ -n "${RUST_ARCH}" ]; then \ - curl -sLO https://static.rust-lang.org/rustup/archive/1.25.1/${RUST_ARCH}/rustup-init; \ + curl -sfLO https://static.rust-lang.org/rustup/archive/1.25.1/${RUST_ARCH}/rustup-init; \ chmod +x ./rustup-init; \ ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.67.0 --default-host ${RUST_ARCH}; \ rustup --version; \ @@ -45,7 +46,7 @@ RUN GOARCH=$(go env GOARCH); \ rustc --version; \ fi; \ if [ -n "${TRIVY_ARCH}" ]; then \ - curl -sL https://github.com/aquasecurity/trivy/releases/download/v0.25.3/trivy_0.25.3_Linux-${TRIVY_ARCH}.tar.gz | tar -zxvC /usr/local/bin trivy; \ + curl -sFL https://github.com/aquasecurity/trivy/releases/download/v0.25.3/trivy_0.25.3_Linux-${TRIVY_ARCH}.tar.gz | tar -zxvC /usr/local/bin trivy; \ trivy --version; \ fi