Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update memcached #8988

Merged
merged 1 commit into from
Oct 29, 2020
Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Oct 29, 2020

Changes:

Changes:

- docker-library/memcached@6923e9c: Merge pull request docker-library/memcached#62 from infosiftr/parallel-test
- docker-library/memcached@af2f393: Add "PARALLEL" to "make test" invocation
@github-actions
Copy link

Diff for 1db9f9b:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index cd78896..4df3831 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,10 +3,10 @@ GitRepo: https://github.com/docker-library/memcached.git
 
 Tags: 1.6.8, 1.6, 1, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: dcaec15d8dcdf7ae6929b6c81e7bcc7c95a5fc75
+GitCommit: af2f39379f20b6d3f7d31df7295cb85144aa7f51
 Directory: debian
 
 Tags: 1.6.8-alpine, 1.6-alpine, 1-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: dcaec15d8dcdf7ae6929b6c81e7bcc7c95a5fc75
+GitCommit: af2f39379f20b6d3f7d31df7295cb85144aa7f51
 Directory: alpine
diff --git a/memcached_alpine/Dockerfile b/memcached_alpine/Dockerfile
index de2e8fe..fab1f6f 100644
--- a/memcached_alpine/Dockerfile
+++ b/memcached_alpine/Dockerfile
@@ -52,10 +52,11 @@ RUN set -x \
 		--enable-sasl-pwdb \
 		--enable-tls \
 		$enableExtstore \
-	&& make -j "$(nproc)" \
+	&& nproc="$(nproc)" \
+	&& make -j "$nproc" \
+	\
+	&& make test PARALLEL="$nproc" \
 	\
-# TODO https://github.com/memcached/memcached/issues/382 "t/chunked-extstore.t is flaky on arm32v6"
-	&& make test \
 	&& make install \
 	\
 	&& cd / && rm -rf /usr/src/memcached \
diff --git a/memcached_latest/Dockerfile b/memcached_latest/Dockerfile
index 1f5bd9d..5b06a6f 100644
--- a/memcached_latest/Dockerfile
+++ b/memcached_latest/Dockerfile
@@ -55,13 +55,14 @@ RUN set -x \
 		--enable-sasl-pwdb \
 		--enable-tls \
 		$enableExtstore \
-	&& make -j "$(nproc)" \
+	&& nproc="$(nproc)" \
+	&& make -j "$nproc" \
 	\
 # see https://github.com/docker-library/memcached/pull/54#issuecomment-562797748 and https://bugs.debian.org/927461 for why we have to munge openssl.cnf
 	&& sed -i.bak 's/SECLEVEL=2/SECLEVEL=1/g' /etc/ssl/openssl.cnf \
-# TODO https://github.com/memcached/memcached/issues/382 "t/chunked-extstore.t is flaky on arm32v6"
-	&& make test \
+	&& make test PARALLEL="$nproc" \
 	&& mv /etc/ssl/openssl.cnf.bak /etc/ssl/openssl.cnf \
+	\
 	&& make install \
 	\
 	&& cd / && rm -rf /usr/src/memcached \

@yosifkit yosifkit merged commit 1ab53b1 into docker-library:master Oct 29, 2020
@yosifkit yosifkit deleted the memcached branch October 29, 2020 23:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants