From ee4613c449f11b4e6100248b151479e15a153ec5 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Fri, 7 Jun 2019 18:44:45 -0700 Subject: [PATCH 1/2] Update sonic-quagga submodule --- src/sonic-quagga | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-quagga b/src/sonic-quagga index 2e192c06b8f..6397c2c9b58 160000 --- a/src/sonic-quagga +++ b/src/sonic-quagga @@ -1 +1 @@ -Subproject commit 2e192c06b8f526cab6fce710ab5da0223b0ba2b1 +Subproject commit 6397c2c9b588a2271aaf3f4d7383111db16d090a From bb249eb9ca6c3ed7695ee61137f7e4681c728099 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Mon, 22 Jul 2019 16:53:22 -0700 Subject: [PATCH 2/2] Fix detecting docker version --- Makefile.work | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.work b/Makefile.work index cd867a46ef5..6bd3612750d 100644 --- a/Makefile.work +++ b/Makefile.work @@ -46,7 +46,7 @@ endif # Note: Using the greater of CE (17.05.0) and EE (17.06.1) versions that support ARG before FROM docker_min := 17.06.1 docker_min_ver := $(shell echo "$(docker_min)" | awk -F. '{printf("%d%03d%03d\n",$$1,$$2,$$3);}' 2>/dev/null) -docker_ver := $(shell docker info 2>/dev/null | grep -i "server version" | cut -d' ' -f3 | awk -F. '{printf("%d%03d%03d\n",$$1,$$2,$$3);}' 2>/dev/null) +docker_ver := $(shell docker info 2>/dev/null | grep -i "server version" | rev | cut -d' ' -f1 | rev | awk -F. '{printf("%d%03d%03d\n",$$1,$$2,$$3);}' 2>/dev/null) docker_is_valid := $(shell if [ $(docker_ver) -lt $(docker_min_ver) ] ; then echo "0"; else echo "1"; fi) ifeq (0,$(docker_is_valid)) $(error SONiC requires Docker version $(docker_min) or later)