From 59060a514155749ee7305d31c655c9c1b2e9e20c Mon Sep 17 00:00:00 2001 From: pataquets Date: Tue, 15 May 2018 19:55:41 +0200 Subject: [PATCH 1/2] Enable external storage shim (extstore). --- alpine/Dockerfile | 1 + debian/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 9313522..09de3b9 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -33,6 +33,7 @@ RUN set -x \ \ && ./configure \ --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + --enable-extstore \ --enable-sasl \ && make -j "$(nproc)" \ \ diff --git a/debian/Dockerfile b/debian/Dockerfile index 05ca5af..74abc43 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -32,6 +32,7 @@ RUN set -x \ \ && ./configure \ --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + --enable-extstore \ --enable-sasl \ && make -j "$(nproc)" \ \ From 6c09fae709f1cee21d63f7b3619cad097edb6609 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 29 May 2018 12:45:39 -0700 Subject: [PATCH 2/2] Exclude "s390x" from using "--enable-extstore" --- alpine/Dockerfile | 15 +++++++++++++-- debian/Dockerfile | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 09de3b9..8abf1dc 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -22,6 +22,7 @@ RUN set -x \ perl \ perl-utils \ tar \ + wget \ \ && wget -O memcached.tar.gz "https://memcached.org/files/memcached-$MEMCACHED_VERSION.tar.gz" \ && echo "$MEMCACHED_SHA1 memcached.tar.gz" | sha1sum -c - \ @@ -31,12 +32,22 @@ RUN set -x \ \ && cd /usr/src/memcached \ \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && enableExtstore="$( \ +# https://github.com/docker-library/memcached/pull/38 + case "$gnuArch" in \ +# https://github.com/memcached/memcached/issues/381 "--enable-extstore on s390x (IBM System Z mainframe architecture) fails tests" + s390x-*) ;; \ + *) echo '--enable-extstore' ;; \ + esac \ + )" \ && ./configure \ - --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - --enable-extstore \ + --build="$gnuArch" \ --enable-sasl \ + $enableExtstore \ && make -j "$(nproc)" \ \ +# TODO https://github.com/memcached/memcached/issues/382 "t/chunked-extstore.t is flaky on arm32v6" && make test \ && make install \ \ diff --git a/debian/Dockerfile b/debian/Dockerfile index 74abc43..e324685 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -30,12 +30,22 @@ RUN set -x \ \ && cd /usr/src/memcached \ \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && enableExtstore="$( \ +# https://github.com/docker-library/memcached/pull/38 + case "$gnuArch" in \ +# https://github.com/memcached/memcached/issues/381 "--enable-extstore on s390x (IBM System Z mainframe architecture) fails tests" + s390x-*) ;; \ + *) echo '--enable-extstore' ;; \ + esac \ + )" \ && ./configure \ - --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - --enable-extstore \ + --build="$gnuArch" \ --enable-sasl \ + $enableExtstore \ && make -j "$(nproc)" \ \ +# TODO https://github.com/memcached/memcached/issues/382 "t/chunked-extstore.t is flaky on arm32v6" && make test \ && make install \ \