diff --git a/README.md b/README.md index 2d9e562e1..7e0264fa4 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Harbor is hosted by the [Cloud Native Computing Foundation](https://cncf.io) (CN **System requirements:** -**On a Linux host:** docker 17.06.0-ce+ and docker-compose 1.23.0+ . +**On a Linux host:** docker 17.06.0-ce+ and docker-compose 1.18.0+ . Download binaries of **[Harbor release ](https://github.com/vmware/harbor/releases)** and follow **[Installation & Configuration Guide](docs/installation_guide.md)** to install Harbor. diff --git a/docs/compile_guide.md b/docs/compile_guide.md index 14609d29c..1d28daea5 100644 --- a/docs/compile_guide.md +++ b/docs/compile_guide.md @@ -9,20 +9,12 @@ Harbor is deployed as several Docker containers and most of the code is written | Software | Required Version | | -------------- | ---------------- | | docker | 17.05 + | -| docker-compose | 1.11.0 + | +| docker-compose | 1.18.0 + | | python | 2.7 + | | git | 1.9.1 + | | make | 3.81 + | | golang\* | 1.7.3 + | -Software | Required Version -----------------------|-------------------------- -docker | 17.05 + -docker-compose | 1.23.0 + -git | 1.9.1 + -make | 3.81 + -golang* | 1.7.3 + - \*optional, required only if you use your own Golang environment. ## Step 2: Getting the source code diff --git a/docs/installation_guide.md b/docs/installation_guide.md index ed8407405..33587d763 100644 --- a/docs/installation_guide.md +++ b/docs/installation_guide.md @@ -31,7 +31,7 @@ Harbor is deployed as several Docker containers, and, therefore, can be deployed |Software|Version|Description| |---|---|---| |Docker engine|version 17.06.0-ce+ or higher|For installation instructions, please refer to: [docker engine doc](https://docs.docker.com/engine/installation/)| -|Docker Compose|version 1.23.0 or higher|For installation instructions, please refer to: [docker compose doc](https://docs.docker.com/compose/install/)| +|Docker Compose|version 1.18.0 or higher|For installation instructions, please refer to: [docker compose doc](https://docs.docker.com/compose/install/)| |Openssl|latest is preferred|Generate certificate and keys for Harbor| ### Network ports diff --git a/make/install.sh b/make/install.sh index 9fa16038b..f8acf0f2d 100755 --- a/make/install.sh +++ b/make/install.sh @@ -117,7 +117,7 @@ function check_docker { function check_dockercompose { if ! docker-compose --version &> /dev/null then - error "Need to install docker-compose(1.23.0+) by yourself first and run this script again." + error "Need to install docker-compose(1.18.0+) by yourself first and run this script again." exit 1 fi @@ -129,9 +129,9 @@ function check_dockercompose { docker_compose_version_part2=${BASH_REMATCH[3]} # the version of docker-compose does not meet the requirement - if [ "$docker_compose_version_part1" -lt 1 ] || ([ "$docker_compose_version_part1" -eq 1 ] && [ "$docker_compose_version_part2" -lt 23 ]) + if [ "$docker_compose_version_part1" -lt 1 ] || ([ "$docker_compose_version_part1" -eq 1 ] && [ "$docker_compose_version_part2" -lt 18 ]) then - error "Need to upgrade docker-compose package to 1.23.0+." + error "Need to upgrade docker-compose package to 1.18.0+." exit 1 else note "docker-compose version: $docker_compose_version"