From 16eb2b84d74a5603e291350a4fd4fc8efc4c2f75 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 28 Apr 2021 13:33:52 +0200 Subject: [PATCH] Revert mimalloc / jemalloc (#132) * Revert mimalloc / jemalloc * fix order --- README.md | 4 ++-- alpine/Dockerfile | 13 ++++++------- alpine/build.json | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 6db0293..92e51ae 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,9 @@ We support version that are not EOL: https://alpinelinux.org/releases/ | amd64-base | Alpine | 3.10, 3.11 3.12 3.13 | 3.13 | | i386-base | Alpine | 3.10, 3.11 3.12 3.13 | 3.13 | -### Mimalloc +### jemalloc -We support on our platforms mimalloc. On the application which you want to enable it, set as environment `LD_PRELOAD="/usr/local/lib/libmimalloc.so"` on your Dockerfile or before you start the application. +We support on our platforms jemalloc. On the application which you want to enable it, set as environment `LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"` on your Dockerfile or before you start the application. ### Python images diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 4ccf62c..7c3e9ca 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -21,7 +21,7 @@ ARG \ BASHIO_VERSION \ TEMPIO_VERSION \ S6_OVERLAY_VERSION \ - MIMALLOC_VERSION + JEMALLOC_VERSION # Base system WORKDIR /usr/src @@ -39,7 +39,7 @@ RUN \ \ && apk add --no-cache --virtual .build-deps \ build-base \ - cmake \ + autoconf \ git \ \ && if [ "${BUILD_ARCH}" = "armv7" ]; then \ @@ -55,11 +55,10 @@ RUN \ && mkdir -p /etc/fix-attrs.d \ && mkdir -p /etc/services.d \ \ - && git clone --depth 1 -b v${MIMALLOC_VERSION} \ - "https://github.com/microsoft/mimalloc" /usr/src/mimalloc \ - && mkdir -p /usr/src/mimalloc/build \ - && cd /usr/src/mimalloc/build \ - && cmake .. \ + && git clone "https://github.com/jemalloc/jemalloc" /usr/src/jemalloc \ + && cd /usr/src/jemalloc \ + && git checkout ${JEMALLOC_VERSION} \ + && ./autogen.sh \ && make -j "$(nproc)" \ && make install \ \ diff --git a/alpine/build.json b/alpine/build.json index bf451c1..852de47 100644 --- a/alpine/build.json +++ b/alpine/build.json @@ -12,7 +12,7 @@ "BASHIO_VERSION": "0.13.0", "TEMPIO_VERSION": "2021.01.0", "S6_OVERLAY_VERSION": "2.1.0.2", - "MIMALLOC_VERSION": "1.7.1" + "JEMALLOC_VERSION": "5.2.1" }, "labels": { "io.hass.base.name": "alpine",