diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-03-14 13:09:43 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-03-14 13:09:43 +0100 |
| commit | 3461d7d2cf08cb4582f25696a12874c7f71665e8 (patch) | |
| tree | 29acc0115c00a229e0aa6e9c0a50855b92c9a550 | |
| parent | f3b9cdce26a9e5fdce0156aa687da88a7e7ee1d4 (diff) | |
| parent | ff732eee490695da8f753e50e1a1da67a5a1942a (diff) | |
| download | mullvadvpn-3461d7d2cf08cb4582f25696a12874c7f71665e8.tar.xz mullvadvpn-3461d7d2cf08cb4582f25696a12874c7f71665e8.zip | |
Merge branch 'replace-usage-of-env-with-arg-des-48'
| -rw-r--r-- | android/docker/Dockerfile | 6 | ||||
| -rw-r--r-- | building/Dockerfile | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index f4248cf597..9419a38416 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -27,15 +27,15 @@ LABEL org.opencontainers.image.licenses=GPL-3.0 # === Define toolchain versions and paths === -ENV SDK_VERSION=platforms;android-33 \ +ARG SDK_VERSION=platforms;android-33 \ BUILD_TOOLS_VERSION=build-tools;30.0.3 # Command line tools and checksum from: https://developer.android.com/studio#command-tools -ENV COMMAND_LINE_TOOLS_VERSION=9123335 \ +ARG COMMAND_LINE_TOOLS_VERSION=9123335 \ COMMAND_LINE_TOOLS_SHA256_CHECKSUM=0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a # NDK and checksum from: https://github.com/android/ndk/wiki/Unsupported-Downloads -ENV NDK_VERSION=r20b \ +ARG NDK_VERSION=r20b \ NDK_SHA1_CHECKSUM=d903fdf077039ad9331fb6c3bee78aa46d45527b \ MIN_SDK_VERSION=21 diff --git a/building/Dockerfile b/building/Dockerfile index 77edf8ac1a..5a7707cd6a 100644 --- a/building/Dockerfile +++ b/building/Dockerfile @@ -28,11 +28,11 @@ LABEL org.opencontainers.image.licenses=GPL-3.0 ENV CARGO_TARGET_DIR=/root/.cargo/target -ENV GOLANG_VERSION=1.18.5 \ +ARG GOLANG_VERSION=1.18.5 \ GOLANG_HASH=9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2 # The pinned commit has this solved: https://github.com/rui314/mold/issues/1003. -ARG MOLD_COMMIT_HASH=c4722fe5aed96295837d9150b20ef8698c7a28db +ARG MOLD_COMMIT_REF=c4722fe5aed96295837d9150b20ef8698c7a28db # === Install/set up the image === @@ -71,7 +71,7 @@ RUN apt-get update -y && \ rm -rf /var/lib/apt/lists/* && \ git clone https://github.com/rui314/mold.git && \ mkdir mold/build && cd mold/build && \ - git reset --hard "$MOLD_COMMIT_HASH" && \ + git reset --hard "$MOLD_COMMIT_REF" && \ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=c++ .. && \ cmake --build . -j $(nproc) && \ cmake --install . && \ |