Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-27 04:35:16 +01:00
Code Issues Projects Releases Wiki Activity

Fix docker version to 20.10.10 (#19751)

Browse Source 
Signed-off-by: Yang Jiao <yang.jiao@broadcom.com>
Co-authored-by: Yang Jiao <yang.jiao@broadcom.com>
This commit is contained in:
Yang Jiao 2023-12-26 16:57:25 +08:00 committed by GitHub
parent 923295c990
commit e397e86478
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -55,7 +55,7 @@ For learning the architecture design of Harbor, check the document [Architecture
**System requirements:** **System requirements:**
**On a Linux host:** docker 17.06.0-ce+ and docker-compose 1.18.0+ . **On a Linux host:** docker 20.10.10-ce+ and docker-compose 1.18.0+ .
Download binaries of **[Harbor release ](https://github.com/vmware/harbor/releases)** and follow **[Installation & Configuration Guide](https://goharbor.io/docs/latest/install-config/)** to install Harbor. Download binaries of **[Harbor release ](https://github.com/vmware/harbor/releases)** and follow **[Installation & Configuration Guide](https://goharbor.io/docs/latest/install-config/)** to install Harbor.

6
make/common.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
#docker version: 17.06.0+ #docker version: 20.10.10+
#docker-compose version: 1.18.0+ #docker-compose version: 1.18.0+
#golang version: 1.12.0+ #golang version: 1.12.0+
@ -78,7 +78,7 @@ function check_golang {
function check_docker { function check_docker {
if ! docker --version &> /dev/null if ! docker --version &> /dev/null
then then
error "Need to install docker(17.06.0+) first and run this script again." error "Need to install docker(20.10.10+) first and run this script again."
exit 1 exit 1
fi fi
@ -93,7 +93,7 @@ function check_docker {
# the version of docker does not meet the requirement # the version of docker does not meet the requirement
if [ "$docker_version_part1" -lt 17 ] || ([ "$docker_version_part1" -eq 17 ] && [ "$docker_version_part2" -lt 6 ]) if [ "$docker_version_part1" -lt 17 ] || ([ "$docker_version_part1" -eq 17 ] && [ "$docker_version_part2" -lt 6 ])
then then
error "Need to upgrade docker package to 17.06.0+." error "Need to upgrade docker package to 20.10.10+."
exit 1 exit 1
fi fi
else else