From 2dd3a853adceea25e2059f41d11d9e64f3f2b7b8 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 13 Jul 2020 15:18:18 +0200 Subject: [PATCH] Cleanup jemalloc from mariadb because it's on base image now (#1448) * Cleanup jemalloc from mariadb because it's on base image now * Update build.json --- mariadb/Dockerfile | 13 ------------- mariadb/build.json | 3 --- 2 files changed, 16 deletions(-) diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index 431d8b5..ceb644e 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -8,19 +8,6 @@ RUN apk add --no-cache \ mariadb-server-utils \ pwgen -# Install jemalloc -WORKDIR /usr/src -ARG JEMALLOC_VERSION -RUN apk add --no-cache --virtual .build-deps \ - build-base \ - && curl -L -s https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2 | tar -xjf - -C /usr/src \ - && cd /usr/src/jemalloc-${JEMALLOC_VERSION} \ - && ./configure \ - && make \ - && make install \ - && apk del .build-deps \ - && rm -rf /usr/src/jemalloc-${JEMALLOC_VERSION} - ENV \ LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" \ S6_SERVICES_GRACETIME=18000 diff --git a/mariadb/build.json b/mariadb/build.json index 9842644..8b1f9c0 100644 --- a/mariadb/build.json +++ b/mariadb/build.json @@ -5,8 +5,5 @@ "armhf": "homeassistant/armhf-base:3.12", "armv7": "homeassistant/armv7-base:3.12", "i386": "homeassistant/i386-base:3.12" - }, - "args": { - "JEMALLOC_VERSION": "5.2.1" } }