Skip to content

Use "dpkg-architecture" to ensure the _image_ (not the host CPU) architecture gets built properly #13

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
yosifkit merged 1 commit into from
Feb 20, 2017
Merged

Use "dpkg-architecture" to ensure the _image_ (not the host CPU) architecture gets built properly #13

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
6 changes: 4 additions & 2 deletions alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ ENV MEMCACHED_SHA1 7c7214f5183c6e20c22b243e21ed1ffddb91497e

RUN set -x \
&& apk add --no-cache --virtual .build-deps \
coreutils \
dpkg-dev dpkg \
gcc \
libc-dev \
libevent-dev \
Expand All @@ -21,8 +23,8 @@ RUN set -x \
&& tar -xzf memcached.tar.gz -C /usr/src/memcached --strip-components=1 \
&& rm memcached.tar.gz \
&& cd /usr/src/memcached \
&& ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& ./configure --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& make -j "$(nproc)" \
&& make install \
&& cd / && rm -rf /usr/src/memcached \
&& runDeps="$( \
Expand Down
9 changes: 5 additions & 4 deletions debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ENV MEMCACHED_VERSION 1.4.34
ENV MEMCACHED_SHA1 7c7214f5183c6e20c22b243e21ed1ffddb91497e

RUN buildDeps=' \
RUN set -x \
&& buildDeps=' \
dpkg-dev \
gcc \
libc6-dev \
libevent-dev \
make \
perl \
wget \
' \
&& set -x \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \
&& wget -O memcached.tar.gz "http://memcached.org/files/memcached-$MEMCACHED_VERSION.tar.gz" \
Expand All @@ -27,8 +28,8 @@ RUN buildDeps=' \
&& tar -xzf memcached.tar.gz -C /usr/src/memcached --strip-components=1 \
&& rm memcached.tar.gz \
&& cd /usr/src/memcached \
&& ./configure \
&& make -j$(nproc) \
&& ./configure --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& make -j "$(nproc)" \
&& make install \
&& cd / && rm -rf /usr/src/memcached \
&& apt-get purge -y --auto-remove $buildDeps
Expand Down