diff --git a/.travis.yml b/.travis.yml index 2183b06e5..be4508a97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ env: - POSTGRESQL_PWD: root123 - POSTGRESQL_DATABASE: registry - ADMINSERVER_URL: http://127.0.0.1:8888 - - DOCKER_COMPOSE_VERSION: 1.22.0 + - DOCKER_COMPOSE_VERSION: 1.23.0 - HARBOR_ADMIN: admin - HARBOR_ADMIN_PASSWD: Harbor12345 - CORE_SECRET: tempString diff --git a/README.md b/README.md index 7e0264fa4..2d9e562e1 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.18.0+ . +**On a Linux host:** docker 17.06.0-ce+ and docker-compose 1.23.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 30743b1d1..0dfd33fa0 100644 --- a/docs/compile_guide.md +++ b/docs/compile_guide.md @@ -4,14 +4,13 @@ This guide provides instructions for developers to build and run Harbor from sou ## Step 1: Prepare for a build environment for Harbor -Harbor is deployed as several Docker containers and most of the code is written in Go language. The build environment requires Python, Docker, Docker Compose and golang development environment. Please install the below prerequisites: +Harbor is deployed as several Docker containers and most of the code is written in Go language. The build environment requires Docker, Docker Compose and golang development environment. Please install the below prerequisites: Software | Required Version ----------------------|-------------------------- docker | 17.05 + -docker-compose | 1.11.0 + -python | 2.7 + +docker-compose | 1.23.0 + git | 1.9.1 + make | 3.81 + golang* | 1.7.3 + diff --git a/docs/installation_guide.md b/docs/installation_guide.md index 687beb094..9d0084799 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.18.0 or higher|For installation instructions, please refer to: [docker compose doc](https://docs.docker.com/compose/install/)| +|Docker Compose|version 1.23.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 f8acf0f2d..9fa16038b 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.18.0+) by yourself first and run this script again." + error "Need to install docker-compose(1.23.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 18 ]) + if [ "$docker_compose_version_part1" -lt 1 ] || ([ "$docker_compose_version_part1" -eq 1 ] && [ "$docker_compose_version_part2" -lt 23 ]) then - error "Need to upgrade docker-compose package to 1.18.0+." + error "Need to upgrade docker-compose package to 1.23.0+." exit 1 else note "docker-compose version: $docker_compose_version"