Skip to content

Add "make test" during build (as requested by upstream) #22

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 17, 2017
Merged

Add "make test" during build (as requested by upstream) #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ENV MEMCACHED_VERSION 1.4.39
ENV MEMCACHED_SHA1 9d6f77f4f9f1b50289882fd88851dece7699c74b

RUN set -x \
\
&& apk add --no-cache --virtual .build-deps \
ca-certificates \
coreutils \
Expand All @@ -20,18 +21,29 @@ RUN set -x \
make \
perl \
tar \
\
&& wget -O memcached.tar.gz "https://memcached.org/files/memcached-$MEMCACHED_VERSION.tar.gz" \
&& echo "$MEMCACHED_SHA1 memcached.tar.gz" | sha1sum -c - \
&& mkdir -p /usr/src/memcached \
&& tar -xzf memcached.tar.gz -C /usr/src/memcached --strip-components=1 \
&& rm memcached.tar.gz \
\
&& cd /usr/src/memcached \
\
# https://github.com/memcached/memcached/issues/286
&& wget -O musl.patch 'https://github.com/memcached/memcached/commit/18316347865978868d70cc70dad54df2e3a8357e.patch' \
&& patch -p1 < musl.patch \
\
&& ./configure \
--build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
--enable-sasl \
&& make -j "$(nproc)" \
\
&& make test \
&& make install \
\
&& cd / && rm -rf /usr/src/memcached \
\
&& runDeps="$( \
scanelf --needed --nobanner --recursive /usr/local \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
Expand All @@ -41,6 +53,7 @@ RUN set -x \
)" \
&& apk add --virtual .memcached-rundeps $runDeps \
&& apk del .build-deps \
\
&& memcached -V

COPY docker-entrypoint.sh /usr/local/bin/
Expand Down
9 changes: 9 additions & 0 deletions debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ENV MEMCACHED_VERSION 1.4.39
ENV MEMCACHED_SHA1 9d6f77f4f9f1b50289882fd88851dece7699c74b

RUN set -x \
\
&& buildDeps=' \
ca-certificates \
dpkg-dev \
Expand All @@ -20,22 +21,30 @@ RUN set -x \
' \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \
\
&& wget -O memcached.tar.gz "https://memcached.org/files/memcached-$MEMCACHED_VERSION.tar.gz" \
&& echo "$MEMCACHED_SHA1 memcached.tar.gz" | sha1sum -c - \
&& mkdir -p /usr/src/memcached \
&& tar -xzf memcached.tar.gz -C /usr/src/memcached --strip-components=1 \
&& rm memcached.tar.gz \
\
&& cd /usr/src/memcached \
\
&& ./configure \
--build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
--enable-sasl \
&& make -j "$(nproc)" \
\
&& make test \
&& make install \
\
&& cd / && rm -rf /usr/src/memcached \
\
&& apt-mark manual \
libevent-2.0-5 \
libsasl2-2 \
&& apt-get purge -y --auto-remove $buildDeps \
\
&& memcached -V

COPY docker-entrypoint.sh /usr/local/bin/
Expand Down