Skip to content

Commit

Permalink
Merge pull request #70 from infosiftr/multiarch
Browse files Browse the repository at this point in the history 
Add explicit "--build" to our "./configure" invocations
  • Loading branch information
@yosifkit
yosifkit authored May 5, 2017
2 parents 1cf5b22 + aceabe0 commit 6bf4db2
Show file tree
Hide file tree
Showing 16 changed files with 48 additions and 0 deletions.
3 changes: 3 additions & 0 deletions 6/jre7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ RUN set -x \
&& nativeBuildDir="$(mktemp -d)" \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& nativeBuildDeps=" \
dpkg-dev \
gcc \
libapr1-dev \
libssl-dev \
Expand All @@ -73,7 +74,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions 6/jre8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ RUN set -x \
&& nativeBuildDir="$(mktemp -d)" \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& nativeBuildDeps=" \
dpkg-dev \
gcc \
libapr1-dev \
libssl-dev \
Expand All @@ -73,7 +74,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions 7/jre7-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ RUN set -x \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& apk add --no-cache --virtual .native-build-deps \
apr-dev \
dpkg-dev dpkg \
gcc \
libc-dev \
make \
Expand All @@ -52,7 +53,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions 7/jre7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ RUN set -x \
&& nativeBuildDir="$(mktemp -d)" \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& nativeBuildDeps=" \
dpkg-dev \
gcc \
libapr1-dev \
libssl-dev \
Expand All @@ -73,7 +74,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions 7/jre8-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ RUN set -x \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& apk add --no-cache --virtual .native-build-deps \
apr-dev \
dpkg-dev dpkg \
gcc \
libc-dev \
make \
Expand All @@ -52,7 +53,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions 7/jre8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ RUN set -x \
&& nativeBuildDir="$(mktemp -d)" \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& nativeBuildDeps=" \
dpkg-dev \
gcc \
libapr1-dev \
libssl-dev \
Expand All @@ -73,7 +74,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions 8.0/jre7-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ RUN set -x \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& apk add --no-cache --virtual .native-build-deps \
apr-dev \
dpkg-dev dpkg \
gcc \
libc-dev \
make \
Expand All @@ -52,7 +53,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions 8.0/jre7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ RUN set -x \
&& nativeBuildDir="$(mktemp -d)" \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& nativeBuildDeps=" \
dpkg-dev \
gcc \
libapr1-dev \
libssl-dev \
Expand All @@ -73,7 +74,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions 8.0/jre8-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ RUN set -x \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& apk add --no-cache --virtual .native-build-deps \
apr-dev \
dpkg-dev dpkg \
gcc \
libc-dev \
make \
Expand All @@ -52,7 +53,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions 8.0/jre8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ RUN set -x \
&& nativeBuildDir="$(mktemp -d)" \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& nativeBuildDeps=" \
dpkg-dev \
gcc \
libapr1-dev \
libssl-dev \
Expand All @@ -73,7 +74,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions 8.5/jre8-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ RUN set -x \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& apk add --no-cache --virtual .native-build-deps \
apr-dev \
dpkg-dev dpkg \
gcc \
libc-dev \
make \
Expand All @@ -52,7 +53,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions 8.5/jre8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ RUN set -x \
&& nativeBuildDir="$(mktemp -d)" \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& nativeBuildDeps=" \
dpkg-dev \
gcc \
libapr1-dev \
libssl-dev \
Expand All @@ -73,7 +74,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions 9.0/jre8-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ RUN set -x \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& apk add --no-cache --virtual .native-build-deps \
apr-dev \
dpkg-dev dpkg \
gcc \
libc-dev \
make \
Expand All @@ -52,7 +53,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions 9.0/jre8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ RUN set -x \
&& nativeBuildDir="$(mktemp -d)" \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& nativeBuildDeps=" \
dpkg-dev \
gcc \
libapr1-dev \
libssl-dev \
Expand All @@ -73,7 +74,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile-alpine.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ RUN set -x \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& apk add --no-cache --virtual .native-build-deps \
apr-dev \
dpkg-dev dpkg \
gcc \
libc-dev \
make \
Expand All @@ -52,7 +53,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ RUN set -x \
&& nativeBuildDir="$(mktemp -d)" \
&& tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1 \
&& nativeBuildDeps=" \
dpkg-dev \
gcc \
libapr1-dev \
libssl-dev \
Expand All @@ -73,7 +74,9 @@ RUN set -x \
&& ( \
export CATALINA_HOME="$PWD" \
&& cd "$nativeBuildDir/native" \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
&& ./configure \
--build="$gnuArch" \
--libdir="$TOMCAT_NATIVE_LIBDIR" \
--prefix="$CATALINA_HOME" \
--with-apr="$(which apr-1-config)" \
Expand Down

0 comments on commit 6bf4db2

Please sign in to comment.