Merge pull request #123 from steven-gueguen/master

Install FoundationDB only for Ubuntu x86_64 image

ubuntu/Dockerfile

@@ -100,15 +100,18 @@ RUN set -eux; \
   unzip ${WARP10_HOME}/lib/warp10-ext-hfstore-${HFSTORE_VERSION}.jar hfstore -d ${WARP10_HOME}/bin; \
   mkdir ${WARP10_HOME}/hfiles; \
 ##
-## Install FoundationDB client and server
-##
-  cd /var/tmp; \
-  wget -q ${FOUNDATIONDB_URL}/${FDBCLI_PKG}; \
-  echo "${FDBCLI_SHA256}  ${FDBCLI_PKG}" | sha256sum -c; \
-  wget -q ${FOUNDATIONDB_URL}/${FDBSERVER_PKG}; \
-  echo "${FDBSERVER_SHA256}  ${FDBSERVER_PKG}" | sha256sum -c; \
-  dpkg -i ${FDBCLI_PKG} ${FDBSERVER_PKG}; \
-  rm -f /var/tmp/*.deb; \
+## Install FoundationDB client and server only on x86_64
+##
+  target=$(uname -m); \
+  if [ "x86_64" = "${target}" ]; then \
+    cd /var/tmp; \
+    wget -q ${FOUNDATIONDB_URL}/${FDBCLI_PKG}; \
+    echo "${FDBCLI_SHA256}  ${FDBCLI_PKG}" | sha256sum -c; \
+    wget -q ${FOUNDATIONDB_URL}/${FDBSERVER_PKG}; \
+    echo "${FDBSERVER_SHA256}  ${FDBSERVER_PKG}" | sha256sum -c; \
+    dpkg -i ${FDBCLI_PKG} ${FDBSERVER_PKG}; \
+    rm -f /var/tmp/*.deb; \
+  fi; \
 ##
 ## Fix permissions
 ##

utils/generate-alpine-files.sh

@@ -36,5 +36,5 @@ sed \
   -e 's/groupadd --system --gid=942 warp10/addgroup -S -g 942 warp10/' \
   -e 's@useradd --system --gid warp10 --uid=942 --home-dir=${WARP10_HOME} --shell=/bin/bash warp10@adduser -S -u 942 -D -G warp10 -H -h ${WARP10_HOME} -s /bin/bash warp10@' \
   -e 's@\./docker-entrypoint.sh@\./alpine/docker-entrypoint.sh@' \
-  -e 's/dpkg -i/#dpkg -i/' \
+  -e 's/target=$(uname -m);/target=disabled;/' \
   ./ubuntu/Dockerfile > ./alpine/Dockerfile