Skip to content

Commit 8ed77fb

Browse files
committed
Add "make test" during build (as requested by upstream)
1 parent f656df1 commit 8ed77fb

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

alpine/Dockerfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ENV MEMCACHED_VERSION 1.4.39
77
ENV MEMCACHED_SHA1 9d6f77f4f9f1b50289882fd88851dece7699c74b
88

99
RUN set -x \
10+
\
1011
&& apk add --no-cache --virtual .build-deps \
1112
ca-certificates \
1213
coreutils \
@@ -20,18 +21,29 @@ RUN set -x \
2021
make \
2122
perl \
2223
tar \
24+
\
2325
&& wget -O memcached.tar.gz "https://memcached.org/files/memcached-$MEMCACHED_VERSION.tar.gz" \
2426
&& echo "$MEMCACHED_SHA1 memcached.tar.gz" | sha1sum -c - \
2527
&& mkdir -p /usr/src/memcached \
2628
&& tar -xzf memcached.tar.gz -C /usr/src/memcached --strip-components=1 \
2729
&& rm memcached.tar.gz \
30+
\
2831
&& cd /usr/src/memcached \
32+
\
33+
# https://github.com/memcached/memcached/issues/286
34+
&& wget -O musl.patch 'https://github.com/memcached/memcached/commit/18316347865978868d70cc70dad54df2e3a8357e.patch' \
35+
&& patch -p1 < musl.patch \
36+
\
2937
&& ./configure \
3038
--build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
3139
--enable-sasl \
3240
&& make -j "$(nproc)" \
41+
\
42+
&& make test \
3343
&& make install \
44+
\
3445
&& cd / && rm -rf /usr/src/memcached \
46+
\
3547
&& runDeps="$( \
3648
scanelf --needed --nobanner --recursive /usr/local \
3749
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
@@ -41,6 +53,7 @@ RUN set -x \
4153
)" \
4254
&& apk add --virtual .memcached-rundeps $runDeps \
4355
&& apk del .build-deps \
56+
\
4457
&& memcached -V
4558

4659
COPY docker-entrypoint.sh /usr/local/bin/

debian/Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ENV MEMCACHED_VERSION 1.4.39
77
ENV MEMCACHED_SHA1 9d6f77f4f9f1b50289882fd88851dece7699c74b
88

99
RUN set -x \
10+
\
1011
&& buildDeps=' \
1112
ca-certificates \
1213
dpkg-dev \
@@ -20,22 +21,30 @@ RUN set -x \
2021
' \
2122
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
2223
&& rm -rf /var/lib/apt/lists/* \
24+
\
2325
&& wget -O memcached.tar.gz "https://memcached.org/files/memcached-$MEMCACHED_VERSION.tar.gz" \
2426
&& echo "$MEMCACHED_SHA1 memcached.tar.gz" | sha1sum -c - \
2527
&& mkdir -p /usr/src/memcached \
2628
&& tar -xzf memcached.tar.gz -C /usr/src/memcached --strip-components=1 \
2729
&& rm memcached.tar.gz \
30+
\
2831
&& cd /usr/src/memcached \
32+
\
2933
&& ./configure \
3034
--build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
3135
--enable-sasl \
3236
&& make -j "$(nproc)" \
37+
\
38+
&& make test \
3339
&& make install \
40+
\
3441
&& cd / && rm -rf /usr/src/memcached \
42+
\
3543
&& apt-mark manual \
3644
libevent-2.0-5 \
3745
libsasl2-2 \
3846
&& apt-get purge -y --auto-remove $buildDeps \
47+
\
3948
&& memcached -V
4049

4150
COPY docker-entrypoint.sh /usr/local/bin/

0 commit comments

Comments
 (0)