diff options
| author | Linus Färnstrand <faern@faern.net> | 2023-03-14 11:24:30 +0100 |
|---|---|---|
| committer | Linus Färnstrand <faern@faern.net> | 2023-03-14 13:09:14 +0100 |
| commit | 2756c43522149cce7b9dc43010cb823b306c81df (patch) | |
| tree | ddb5d918fbe1e4bdd4fdf62bd5479b7bb9735451 | |
| parent | f3b9cdce26a9e5fdce0156aa687da88a7e7ee1d4 (diff) | |
| download | mullvadvpn-2756c43522149cce7b9dc43010cb823b306c81df.tar.xz mullvadvpn-2756c43522149cce7b9dc43010cb823b306c81df.zip | |
Use ARG instead of ENV for desktop container
Also rename _HASH to _REF since it can point to any git reference
| -rw-r--r-- | building/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
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 . && \ |