Skip to content

Commit

Permalink
Revert mimalloc / jemalloc (#132)
Browse files Browse the repository at this point in the history
* Revert mimalloc / jemalloc

* fix order
  • Loading branch information
pvizeli authored Apr 28, 2021
1 parent e75e85a commit 16eb2b8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
13 changes: 6 additions & 7 deletions alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ARG \
BASHIO_VERSION \
TEMPIO_VERSION \
S6_OVERLAY_VERSION \
MIMALLOC_VERSION
JEMALLOC_VERSION

# Base system
WORKDIR /usr/src
Expand All @@ -39,7 +39,7 @@ RUN \
\
&& apk add --no-cache --virtual .build-deps \
build-base \
cmake \
autoconf \
git \
\
&& if [ "${BUILD_ARCH}" = "armv7" ]; then \
Expand All @@ -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 \
\
Expand Down
2 changes: 1 addition & 1 deletion alpine/build.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 16eb2b8

Please sign in to comment.