Skip to content

Conversation

@tianon
Copy link
Member

@tianon tianon commented Oct 7, 2021

Changes:

Changes:

- docker-library/memcached@2f7d163: Apply memcached/memcached@7e570c7 directly instead of sed
- docker-library/memcached@4396d78: Merge pull request docker-library/memcached#72 from infosiftr/update
- docker-library/memcached@fed47a9: Update to 1.6.12
@github-actions
Copy link

github-actions bot commented Oct 7, 2021

Diff for 9c668bc:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 54020f5..e6bfeba 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,12 +1,12 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/memcached.git
 
-Tags: 1.6.10, 1.6, 1, latest, 1.6.10-buster, 1.6-buster, 1-buster, buster
+Tags: 1.6.12, 1.6, 1, latest, 1.6.12-buster, 1.6-buster, 1-buster, buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 1a01e364e20f571700e35e1ba8906a59ea4561b8
+GitCommit: fed47a936a307aa1e0be990a59ae4de71f134ca5
 Directory: debian
 
-Tags: 1.6.10-alpine, 1.6-alpine, 1-alpine, alpine, 1.6.10-alpine3.14, 1.6-alpine3.14, 1-alpine3.14, alpine3.14
+Tags: 1.6.12-alpine, 1.6-alpine, 1-alpine, alpine, 1.6.12-alpine3.14, 1.6-alpine3.14, 1-alpine3.14, alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1a01e364e20f571700e35e1ba8906a59ea4561b8
+GitCommit: 2f7d163ec21401699a4f87e6e293b2ed45227598
 Directory: alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 55fa0d1..09ee1f9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,10 @@ memcached:1.6
 memcached:1.6-alpine
 memcached:1.6-alpine3.14
 memcached:1.6-buster
-memcached:1.6.10
-memcached:1.6.10-alpine
-memcached:1.6.10-alpine3.14
-memcached:1.6.10-buster
+memcached:1.6.12
+memcached:1.6.12-alpine
+memcached:1.6.12-alpine3.14
+memcached:1.6.12-buster
 memcached:alpine
 memcached:alpine3.14
 memcached:buster
diff --git a/memcached_alpine3.14/Dockerfile b/memcached_alpine3.14/Dockerfile
index 3aa208f..e148f01 100644
--- a/memcached_alpine3.14/Dockerfile
+++ b/memcached_alpine3.14/Dockerfile
@@ -6,8 +6,8 @@ RUN addgroup -g 11211 memcache && adduser -D -u 11211 -G memcache memcache
 # ensure SASL's "libplain.so" is installed as per https://github.com/memcached/memcached/wiki/SASLHowto
 RUN apk add --no-cache libsasl
 
-ENV MEMCACHED_VERSION 1.6.10
-ENV MEMCACHED_SHA1 cb5b9fe77a2a59cc6cc7103a415bc07df9ddc6ec
+ENV MEMCACHED_VERSION 1.6.12
+ENV MEMCACHED_SHA1 40d43e98f149e13e6c81eee813e6734f23413a01
 
 RUN set -x \
 	\
@@ -22,6 +22,7 @@ RUN set -x \
 		make \
 		openssl \
 		openssl-dev \
+		patch \
 		perl \
 		perl-io-socket-ssl \
 		perl-utils \
@@ -34,6 +35,11 @@ RUN set -x \
 	\
 	&& cd /usr/src/memcached \
 	\
+# https://github.com/docker-library/memcached/issues/71#issuecomment-937067759 🙈
+	&& wget -O cdefs.patch 'https://github.com/memcached/memcached/commit/7e570c789f4473354461e6eeb8bb7a283df613bf.patch' \
+	&& patch -p1 --input=cdefs.patch \
+	&& rm cdefs.patch \
+	\
 	&& ./configure \
 		--build="$gnuArch" \
 		--enable-extstore \
diff --git a/memcached_buster/Dockerfile b/memcached_buster/Dockerfile
index 31f56f6..12e04e3 100644
--- a/memcached_buster/Dockerfile
+++ b/memcached_buster/Dockerfile
@@ -11,8 +11,8 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*
 
-ENV MEMCACHED_VERSION 1.6.10
-ENV MEMCACHED_SHA1 cb5b9fe77a2a59cc6cc7103a415bc07df9ddc6ec
+ENV MEMCACHED_VERSION 1.6.12
+ENV MEMCACHED_SHA1 40d43e98f149e13e6c81eee813e6734f23413a01
 
 RUN set -x \
 	\

@yosifkit yosifkit merged commit dc33485 into docker-library:master Oct 7, 2021
@yosifkit yosifkit deleted the memcached branch October 7, 2021 17:45
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