diff options
| author | Daniel <[email protected]> | 2024-06-24 20:44:21 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-06-24 19:44:21 +0200 |
| commit | 8e2a87fd79d56e4aa9ddd4d17080eebce0cf83af (patch) | |
| tree | 92f5f11ae37eee131a0c97310bcd517fc5451f50 | |
| parent | 4233dbf3db773c2fc933618dd5789da87efaf5ce (diff) | |
| download | vaultwarden-8e2a87fd79d56e4aa9ddd4d17080eebce0cf83af.tar.gz vaultwarden-8e2a87fd79d56e4aa9ddd4d17080eebce0cf83af.zip | |
Remove mimalloc workaround (#4606)
- libatomic linking for armv6 has been fixed in https://github.com/purpleprotocol/mimalloc_rust/commit/992c9da4c5afba7fbf4c5815c43c8f0fbd2a8da6
| -rw-r--r-- | docker/Dockerfile.alpine | 2 | ||||
| -rw-r--r-- | docker/Dockerfile.j2 | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 53492855..31182115 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -67,8 +67,6 @@ WORKDIR /app # Environment variables for Cargo on Alpine based builds RUN echo "export CARGO_TARGET=${RUST_MUSL_CROSS_TARGET}" >> /env-cargo && \ - # To be able to build the armv6 image with mimalloc we need to tell the linker to also look for libatomic - if [[ "${TARGETARCH}${TARGETVARIANT}" == "armv6" ]] ; then echo "export RUSTFLAGS='-Clink-arg=-latomic'" >> /env-cargo ; fi && \ # Output the current contents of the file cat /env-cargo diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index 3552cc39..d71b4ccc 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -133,8 +133,6 @@ RUN source /env-cargo && \ {% elif base == "alpine" %} # Environment variables for Cargo on Alpine based builds RUN echo "export CARGO_TARGET=${RUST_MUSL_CROSS_TARGET}" >> /env-cargo && \ - # To be able to build the armv6 image with mimalloc we need to tell the linker to also look for libatomic - if [[ "${TARGETARCH}${TARGETVARIANT}" == "armv6" ]] ; then echo "export RUSTFLAGS='-Clink-arg=-latomic'" >> /env-cargo ; fi && \ # Output the current contents of the file cat /env-cargo |