From: Alexandru Antone <Alexandru.Antone@enea.com>
Date: Tue, 7 Jan 2020 10:44:41 +0000 (+0200)
Subject: Remove docker-binary mount. Use container binary
X-Git-Tag: 3.0.0~18
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=68de08ebfc5a37940cc30c64eebe70b3d4c8e237;p=validation.git

Remove docker-binary mount. Use container binary

The docker client binary mounted from the host is not compatible
with Alpine Linux for certain host distros.

Signed-off-by: Alexandru Antone <Alexandru.Antone@enea.com>
Change-Id: Iec10dea423adc32f2b9f651043e30a2aa02c7d76
---

diff --git a/bluval/Dockerfile b/bluval/Dockerfile
index f01deaa..7125c73 100644
--- a/bluval/Dockerfile
+++ b/bluval/Dockerfile
@@ -15,11 +15,12 @@
 ##############################################################################
 
 # ref: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#use-multi-stage-builds
-FROM python:3.6-alpine3.9
+FROM python:3.6-alpine3.10
 
 RUN apk --no-cache add --update \
         gcc \
         git \
+        docker-cli \
         libc6-compat \
         libc-dev \
         libffi \
diff --git a/bluval/blucon.sh b/bluval/blucon.sh
index 3cc1e5e..afe54db 100755
--- a/bluval/blucon.sh
+++ b/bluval/blucon.sh
@@ -52,7 +52,6 @@ set -x
 
 docker run --rm \
     -v /var/run/docker.sock:/var/run/docker.sock \
-    -v /usr/bin/docker:/usr/bin/docker \
     -v $AKRAINO_HOME/results:/opt/akraino/results \
     -v $AKRAINO_HOME/validation:/opt/akraino/validation \
     akraino/validation:blucon-$image_tag "$@"