From 6643e83b61bccefc24d7265bd1bbbcd9a786f85e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Sat, 26 Mar 2022 20:11:46 +0100 Subject: [PATCH] Disable mimalloc in arm for now --- docker/Dockerfile.j2 | 2 +- docker/arm64/Dockerfile.alpine | 3 +-- docker/arm64/Dockerfile.buildx.alpine | 3 +-- docker/armv6/Dockerfile.alpine | 3 +-- docker/armv6/Dockerfile.buildx.alpine | 3 +-- docker/armv7/Dockerfile.alpine | 3 +-- docker/armv7/Dockerfile.buildx.alpine | 3 +-- 7 files changed, 7 insertions(+), 13 deletions(-) diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index 4b42bd67..c9eaa464 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -163,7 +163,7 @@ RUN {{ mount_rust_cache -}} rustup target add {{ package_arch_target }} {% endif %} # Configure the DB ARG as late as possible to not invalidate the cached layers above -{% if "alpine" in target_file %} +{% if "alpine" in target_file and "amd64" in target_file %} # Enable MiMalloc to improve performance on Alpine builds ARG DB=sqlite,mysql,postgresql,enable_mimalloc {% else %} diff --git a/docker/arm64/Dockerfile.alpine b/docker/arm64/Dockerfile.alpine index e813a929..7dcd849e 100644 --- a/docker/arm64/Dockerfile.alpine +++ b/docker/arm64/Dockerfile.alpine @@ -58,8 +58,7 @@ COPY ./build.rs ./build.rs RUN rustup target add aarch64-unknown-linux-musl # Configure the DB ARG as late as possible to not invalidate the cached layers above -# Enable MiMalloc to improve performance on Alpine builds -ARG DB=sqlite,mysql,postgresql,enable_mimalloc +ARG DB=sqlite,mysql,postgresql # Builds your dependencies and removes the # dummy project, except the target folder diff --git a/docker/arm64/Dockerfile.buildx.alpine b/docker/arm64/Dockerfile.buildx.alpine index 844c6d93..d3a3500c 100644 --- a/docker/arm64/Dockerfile.buildx.alpine +++ b/docker/arm64/Dockerfile.buildx.alpine @@ -58,8 +58,7 @@ COPY ./build.rs ./build.rs RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry rustup target add aarch64-unknown-linux-musl # Configure the DB ARG as late as possible to not invalidate the cached layers above -# Enable MiMalloc to improve performance on Alpine builds -ARG DB=sqlite,mysql,postgresql,enable_mimalloc +ARG DB=sqlite,mysql,postgresql # Builds your dependencies and removes the # dummy project, except the target folder diff --git a/docker/armv6/Dockerfile.alpine b/docker/armv6/Dockerfile.alpine index 9ea07b8e..a1fd5a78 100644 --- a/docker/armv6/Dockerfile.alpine +++ b/docker/armv6/Dockerfile.alpine @@ -58,8 +58,7 @@ COPY ./build.rs ./build.rs RUN rustup target add arm-unknown-linux-musleabi # Configure the DB ARG as late as possible to not invalidate the cached layers above -# Enable MiMalloc to improve performance on Alpine builds -ARG DB=sqlite,mysql,postgresql,enable_mimalloc +ARG DB=sqlite,mysql,postgresql # Builds your dependencies and removes the # dummy project, except the target folder diff --git a/docker/armv6/Dockerfile.buildx.alpine b/docker/armv6/Dockerfile.buildx.alpine index 21156981..a7831562 100644 --- a/docker/armv6/Dockerfile.buildx.alpine +++ b/docker/armv6/Dockerfile.buildx.alpine @@ -58,8 +58,7 @@ COPY ./build.rs ./build.rs RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry rustup target add arm-unknown-linux-musleabi # Configure the DB ARG as late as possible to not invalidate the cached layers above -# Enable MiMalloc to improve performance on Alpine builds -ARG DB=sqlite,mysql,postgresql,enable_mimalloc +ARG DB=sqlite,mysql,postgresql # Builds your dependencies and removes the # dummy project, except the target folder diff --git a/docker/armv7/Dockerfile.alpine b/docker/armv7/Dockerfile.alpine index 5d615ee4..943a7563 100644 --- a/docker/armv7/Dockerfile.alpine +++ b/docker/armv7/Dockerfile.alpine @@ -59,8 +59,7 @@ COPY ./build.rs ./build.rs RUN rustup target add armv7-unknown-linux-musleabihf # Configure the DB ARG as late as possible to not invalidate the cached layers above -# Enable MiMalloc to improve performance on Alpine builds -ARG DB=sqlite,mysql,postgresql,enable_mimalloc +ARG DB=sqlite,mysql,postgresql # Builds your dependencies and removes the # dummy project, except the target folder diff --git a/docker/armv7/Dockerfile.buildx.alpine b/docker/armv7/Dockerfile.buildx.alpine index 4c78f50f..34666d5c 100644 --- a/docker/armv7/Dockerfile.buildx.alpine +++ b/docker/armv7/Dockerfile.buildx.alpine @@ -59,8 +59,7 @@ COPY ./build.rs ./build.rs RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry rustup target add armv7-unknown-linux-musleabihf # Configure the DB ARG as late as possible to not invalidate the cached layers above -# Enable MiMalloc to improve performance on Alpine builds -ARG DB=sqlite,mysql,postgresql,enable_mimalloc +ARG DB=sqlite,mysql,postgresql # Builds your dependencies and removes the # dummy project, except the target folder