diff options
| author | Linus Färnstrand <faern@faern.net> | 2023-03-24 10:01:51 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-03-24 10:59:31 +0100 |
| commit | e35ef807e253dc4c39ac035e11eed11262cfcb28 (patch) | |
| tree | c6ffdfd6f796d7f8d99c9ea706393f92fc34d504 | |
| parent | 72dd8f525b5053b8db0dc06aaf97cf7d63358f08 (diff) | |
| download | mullvadvpn-e35ef807e253dc4c39ac035e11eed11262cfcb28.tar.xz mullvadvpn-e35ef807e253dc4c39ac035e11eed11262cfcb28.zip | |
Change build container CARGO_TARGET_DIR to allow cargo clean
| -rw-r--r-- | android/docker/Dockerfile | 7 | ||||
| -rw-r--r-- | building/Dockerfile | 8 | ||||
| -rwxr-xr-x | building/container-run.sh | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 82da167027..e8a7337586 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -3,9 +3,10 @@ # # To build using the image: # podman run --rm \ -# -v /path/to/container_cache/target:/root/.cargo/target:Z \ -# -v /path/to/container_cache/registry:/root/.cargo/registry:Z \ -# -v /path/to/container_cache/gradle:/root/.gradle:Z \ +# -v $CARGO_TARGET_VOLUME_NAME:/cargo-target:Z \ +# -v $CARGO_REGISTRY_VOLUME_NAME:/root/.cargo/registry:Z \ +# -v $GRADLE_CACHE_VOLUME_NAME:/root/.gradle:Z \ +# -v $ANDROID_CREDENTIALS_DIR:/build/android/credentials:Z \ # -v /path/to/repository_root:/build:Z \ # mullvadvpn-app-build-android ./build-apk.sh --dev-build --no-docker # diff --git a/building/Dockerfile b/building/Dockerfile index 5a7707cd6a..4ba73db628 100644 --- a/building/Dockerfile +++ b/building/Dockerfile @@ -7,9 +7,9 @@ # dependencies and building everything. # # podman run --rm \ -# -v /path/to/container_cache/target:/root/.cargo/target:Z \ -# -v /path/to/container_cache/registry:/root/.cargo/registry:Z \ -# -v .:/build:Z \ +# -v $CARGO_TARGET_VOLUME_NAME:/cargo-target:Z \ +# -v $CARGO_REGISTRY_VOLUME_NAME:/root/.cargo/registry:Z \ +# -v /path/to/repository_root:/build:Z \ # mullvadvpn-app-build ./build.sh # # And add -e TARGETS="aarch64-unknown-linux-gnu" to build for ARM64 @@ -26,7 +26,7 @@ LABEL org.opencontainers.image.licenses=GPL-3.0 # === Define toolchain versions and paths === -ENV CARGO_TARGET_DIR=/root/.cargo/target +ENV CARGO_TARGET_DIR=/cargo-target/target ARG GOLANG_VERSION=1.18.5 \ GOLANG_HASH=9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2 diff --git a/building/container-run.sh b/building/container-run.sh index 4981d316cc..fef4cb412a 100755 --- a/building/container-run.sh +++ b/building/container-run.sh @@ -53,7 +53,7 @@ fi set -x exec "$CONTAINER_RUNNER" run --rm -it \ -v "$REPO_DIR:$REPO_MOUNT_TARGET:Z" \ - -v "$CARGO_TARGET_VOLUME_NAME:/root/.cargo/target:Z" \ + -v "$CARGO_TARGET_VOLUME_NAME:/cargo-target:Z" \ -v "$CARGO_REGISTRY_VOLUME_NAME:/root/.cargo/registry:Z" \ "${optional_gradle_cache_volume[@]}" \ "${optional_android_credentials_volume[@]}" \ |