Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-09-27 21:45:50 +02:00
Remove mimalloc workaround
- libatomic linking for armv6 has been fixed in 992c9da4c5
Dieser Commit ist enthalten in:
Ursprung
8f05a90b96
Commit
9e880cc7b1
2 geänderte Dateien mit 0 neuen und 4 gelöschten Zeilen
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Laden …
In neuem Issue referenzieren