From 01392df557e16a30c9555defded2ff99df38e7d1 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 7 Jan 2018 18:56:20 +0100 Subject: [PATCH] better compatibility to other docker version results --- contrib/docker/build.sh | 2 +- contrib/docker/update.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/docker/build.sh b/contrib/docker/build.sh index 5c07ae87..e5d68f95 100755 --- a/contrib/docker/build.sh +++ b/contrib/docker/build.sh @@ -9,7 +9,7 @@ set -e echo "creating debian image..." docker run --rm -it -v `pwd`/../..:/build ebusd-buildenv ./make_debian.sh export EBUSD_VERSION=`cat ../../VERSION` -export EBUSD_ARCH=`docker version|grep -i "Arch[^:]*server"|head -n 1|sed -e 's#^.*/##'` +export EBUSD_ARCH=`docker version|grep -i "Arch[^:]*:"|tail -n 1|sed -e 's#^.*/##'` mv ../../ebusd-${EBUSD_VERSION}_${EBUSD_ARCH}_mqtt1.deb runtime/ echo "building docker image..." (cd runtime && docker build -t ebusd .) diff --git a/contrib/docker/update.sh b/contrib/docker/update.sh index c47e512e..9112abaf 100755 --- a/contrib/docker/update.sh +++ b/contrib/docker/update.sh @@ -1,5 +1,6 @@ #!/bin/sh set -e export EBUSD_VERSION=`cat ../../VERSION` -export EBUSD_ARCH=`docker version|grep -i "Arch[^:]*server"|head -n 1|sed -e 's#^.*/##'` -sed -i -e "s#^ENV EBUSD_VERSION .*\$#ENV EBUSD_VERSION ${EBUSD_VERSION}#" -e "s#^ENV EBUSD_ARCH .*\$#ENV EBUSD_ARCH ${EBUSD_ARCH}#" runtime/Dockerfile +export EBUSD_ARCH=`docker version|grep -i "Arch[^:]*:"|tail -n 1|sed -e 's#^.*/##'` +sed -i -e "s#^ENV EBUSD_VERSION .*\$#ENV EBUSD_VERSION ${EBUSD_VERSION}#" -e "s#^ENV EBUSD_ARCH .*\$#ENV EBUSD_ARCH ${EBUSD_ARCH}#" Dockerfile release/Dockerfile runtime/Dockerfile +