Skip to content

Commit dca6925

Browse files
authored
Merge pull request #76 from J0WI/memcached-1.6.13
Memcached 1.6.13
2 parents 8ccbd92 + 899756d commit dca6925

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

alpine/Dockerfile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ RUN addgroup -g 11211 memcache && adduser -D -u 11211 -G memcache memcache
66
# ensure SASL's "libplain.so" is installed as per https://github.com/memcached/memcached/wiki/SASLHowto
77
RUN apk add --no-cache libsasl
88

9-
ENV MEMCACHED_VERSION 1.6.12
10-
ENV MEMCACHED_SHA1 40d43e98f149e13e6c81eee813e6734f23413a01
9+
ENV MEMCACHED_VERSION 1.6.13
10+
ENV MEMCACHED_SHA1 b9da57ba63ba8de8a980fe0fe2fedc8d59e1dfe3
1111

1212
RUN set -x \
1313
\
@@ -22,7 +22,6 @@ RUN set -x \
2222
make \
2323
openssl \
2424
openssl-dev \
25-
patch \
2625
perl \
2726
perl-io-socket-ssl \
2827
perl-utils \
@@ -35,11 +34,6 @@ RUN set -x \
3534
\
3635
&& cd /usr/src/memcached \
3736
\
38-
# https://github.com/docker-library/memcached/issues/71#issuecomment-937067759 🙈
39-
&& wget -O cdefs.patch 'https://github.com/memcached/memcached/commit/7e570c789f4473354461e6eeb8bb7a283df613bf.patch' \
40-
&& patch -p1 --input=cdefs.patch \
41-
&& rm cdefs.patch \
42-
\
4337
&& ./configure \
4438
--build="$gnuArch" \
4539
--enable-extstore \

debian/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ RUN set -eux; \
1111
; \
1212
rm -rf /var/lib/apt/lists/*
1313

14-
ENV MEMCACHED_VERSION 1.6.12
15-
ENV MEMCACHED_SHA1 40d43e98f149e13e6c81eee813e6734f23413a01
14+
ENV MEMCACHED_VERSION 1.6.13
15+
ENV MEMCACHED_SHA1 b9da57ba63ba8de8a980fe0fe2fedc8d59e1dfe3
1616

1717
RUN set -x \
1818
\

0 commit comments

Comments
 (0)