Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[build]: Fix comparing docker versions #3205

Merged
merged 10 commits into from
Jul 23, 2019
Merged

[build]: Fix comparing docker versions #3205

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ee4613c
Update sonic-quagga submodule
pavel-shirshov Jun 8, 2019
b12e064
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jun 10, 2019
b562508
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jun 14, 2019
11c2f0c
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jun 15, 2019
5995a0d
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jun 26, 2019
2357684
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jul 11, 2019
ece7357
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jul 17, 2019
771a990
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jul 18, 2019
ab8698c
Merge branch 'master' of https://github.com/Azure/sonic-buildimage
pavel-shirshov Jul 22, 2019
bb249eb
Fix detecting docker version
pavel-shirshov Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.work
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down