From d2116720abfb794375875c1b41c0bc06e2f3e7db Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Wed, 15 Nov 2017 16:57:00 -0500 Subject: change to docker 1.12.6 from dockerproject.org Change-Id: Ic33efb5e204d63cfd870f47c4fd8fb8e1dbf7af1 Signed-off-by: Guo Ruijing --- src/cni/ovsdpdk/build.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/cni/ovsdpdk') diff --git a/src/cni/ovsdpdk/build.sh b/src/cni/ovsdpdk/build.sh index fad1abc..625c7cc 100644 --- a/src/cni/ovsdpdk/build.sh +++ b/src/cni/ovsdpdk/build.sh @@ -1,16 +1,23 @@ #!/bin/bash set -ex -HOME="$(dirname `readlink -f $0`)" +DIR="$(dirname `readlink -f $0`)" PWD="$(pwd)" -cd $HOME -sudo apt-get install -y docker.io +cd $DIR + +sudo apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D +sudo apt-key adv -k 58118E89F3A912897C070ADBF76221572C52609D +cat << EOF | sudo tee /etc/apt/sources.list.d/docker.list +deb [arch=amd64] https://apt.dockerproject.org/repo ubuntu-xenial main +EOF + +sudo apt-get install -y --allow-downgrades docker-engine=1.12.6-0~ubuntu-xenial sudo docker rmi -f cniovsdpdk.build || true sudo docker build -t cniovsdpdk.build . -f Dockerfile.build -sudo docker run -v $HOME/cni:/build -t cniovsdpdk.build cp /plugins/bin/ovsdpdk /build +sudo docker run -v $DIR/cni:/build -t cniovsdpdk.build cp /plugins/bin/ovsdpdk /build sudo docker build -t openretriever/cnicniovsdpdk . -f Dockerfile.cniovsdpdk -sudo rm -rf $HOME/cni/ovsdpdk +sudo rm -rf $DIR/cni/ovsdpdk echo git clone https://github.com/containernetworking/cni echo sudo CNI_PATH=$CNI_PATH ./priv-net-run.sh ifconfig echo sudo docker login openretriever/cnicniovsdpdk -u user -p password -- cgit 1.2.3-korg