From 8ed77fbb88bfff7ae74115471b2f96a0bcd393e4 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 17 Jul 2017 10:49:42 -0700
Subject: [PATCH] Add "make test" during build (as requested by upstream)

---
 alpine/Dockerfile | 13 +++++++++++++
 debian/Dockerfile |  9 +++++++++
 2 files changed, 22 insertions(+)

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 0a92f49..4aaa472 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -7,6 +7,7 @@ ENV MEMCACHED_VERSION 1.4.39
 ENV MEMCACHED_SHA1 9d6f77f4f9f1b50289882fd88851dece7699c74b
 
 RUN set -x \
+	\
 	&& apk add --no-cache --virtual .build-deps \
 		ca-certificates \
 		coreutils \
@@ -20,18 +21,29 @@ RUN set -x \
 		make \
 		perl \
 		tar \
+	\
 	&& wget -O memcached.tar.gz "https://memcached.org/files/memcached-$MEMCACHED_VERSION.tar.gz" \
 	&& echo "$MEMCACHED_SHA1  memcached.tar.gz" | sha1sum -c - \
 	&& mkdir -p /usr/src/memcached \
 	&& tar -xzf memcached.tar.gz -C /usr/src/memcached --strip-components=1 \
 	&& rm memcached.tar.gz \
+	\
 	&& cd /usr/src/memcached \
+	\
+# https://github.com/memcached/memcached/issues/286
+	&& wget -O musl.patch 'https://github.com/memcached/memcached/commit/18316347865978868d70cc70dad54df2e3a8357e.patch' \
+	&& patch -p1 < musl.patch \
+	\
 	&& ./configure \
 		--build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 		--enable-sasl \
 	&& make -j "$(nproc)" \
+	\
+	&& make test \
 	&& make install \
+	\
 	&& cd / && rm -rf /usr/src/memcached \
+	\
 	&& runDeps="$( \
 		scanelf --needed --nobanner --recursive /usr/local \
 			| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
@@ -41,6 +53,7 @@ RUN set -x \
 	)" \
 	&& apk add --virtual .memcached-rundeps $runDeps \
 	&& apk del .build-deps \
+	\
 	&& memcached -V
 
 COPY docker-entrypoint.sh /usr/local/bin/
diff --git a/debian/Dockerfile b/debian/Dockerfile
index a96ebfb..8649130 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -7,6 +7,7 @@ ENV MEMCACHED_VERSION 1.4.39
 ENV MEMCACHED_SHA1 9d6f77f4f9f1b50289882fd88851dece7699c74b
 
 RUN set -x \
+	\
 	&& buildDeps=' \
 		ca-certificates \
 		dpkg-dev \
@@ -20,22 +21,30 @@ RUN set -x \
 	' \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/* \
+	\
 	&& wget -O memcached.tar.gz "https://memcached.org/files/memcached-$MEMCACHED_VERSION.tar.gz" \
 	&& echo "$MEMCACHED_SHA1  memcached.tar.gz" | sha1sum -c - \
 	&& mkdir -p /usr/src/memcached \
 	&& tar -xzf memcached.tar.gz -C /usr/src/memcached --strip-components=1 \
 	&& rm memcached.tar.gz \
+	\
 	&& cd /usr/src/memcached \
+	\
 	&& ./configure \
 		--build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 		--enable-sasl \
 	&& make -j "$(nproc)" \
+	\
+	&& make test \
 	&& make install \
+	\
 	&& cd / && rm -rf /usr/src/memcached \
+	\
 	&& apt-mark manual \
 		libevent-2.0-5 \
 		libsasl2-2 \
 	&& apt-get purge -y --auto-remove $buildDeps \
+	\
 	&& memcached -V
 
 COPY docker-entrypoint.sh /usr/local/bin/