diff --git a/README.md b/README.md index 88d00b5a6..fdf9e102f 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,8 @@ Harbor is hosted by the [Cloud Native Computing Foundation](https://cncf.io) (CN * **Role based access control**: Users access different repositories through 'projects' and a user can have different permission for images or Helm charts under a project. * **Policy based replication**: Images and charts can be replicated (synchronized) between multiple registry instances based on policies with using filters (repository, tag and label). Harbor automatically retries a replication if it encounters any errors. This can be used to assist loadbalancing, achieve high availability, and facilitate multi-datacenter deployments in hybrid and multi-cloud scenarios. * **Vulnerability Scanning**: Harbor scans images regularly for vulnerabilities and has policy checks to prevent vulnerable images from being deployed. -* **LDAP/AD support**: Harbor integrates with existing enterprise LDAP/AD for user authentication and management, and supports importing LDAP groups into Harbor that can then be given permissions to specific projects. -* **OIDC support**: Harbor leverages OpenID Connect (OIDC) to verify the identity of users authenticated by an external authorization server or identity provider. Single sign-on can be enabled to log into the Harbor portal. +* **LDAP/AD support**: Harbor integrates with existing enterprise LDAP/AD for user authentication and management, and supports importing LDAP groups into Harbor that can then be given permissions to specific projects. +* **OIDC support**: Harbor leverages OpenID Connect (OIDC) to verify the identity of users authenticated by an external authorization server or identity provider. Single sign-on can be enabled to log into the Harbor portal. * **Image deletion & garbage collection**: System admin can run garbage collection jobs so that images(dangling manifests and unreferenced blobs) can be deleted and their space can be freed up periodically. * **Notary**: Support signing container images using Docker Content Trust (leveraging Notary) for guaranteeing authenticity and provenance. In addition, policies that prevent unsigned images from being deployed can also be activated. * **Graphical user portal**: User can easily browse, search repositories and manage projects. @@ -55,7 +55,7 @@ For learning the architecture design of Harbor, check the document [Architecture **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. @@ -77,8 +77,8 @@ The [compatibility list](https://goharbor.io/docs/edge/install-config/harbor-com ## Community -* **Twitter:** [@project_harbor](https://twitter.com/project_harbor) -* **User Group:** Join Harbor user email group: [harbor-users@lists.cncf.io](https://lists.cncf.io/g/harbor-users) to get update of Harbor's news, features, releases, or to provide suggestion and feedback. +* **Twitter:** [@project_harbor](https://twitter.com/project_harbor) +* **User Group:** Join Harbor user email group: [harbor-users@lists.cncf.io](https://lists.cncf.io/g/harbor-users) to get update of Harbor's news, features, releases, or to provide suggestion and feedback. * **Developer Group:** Join Harbor developer group: [harbor-dev@lists.cncf.io](https://lists.cncf.io/g/harbor-dev) for discussion on Harbor development and contribution. * **Slack:** Join Harbor's community for discussion and ask questions: [Cloud Native Computing Foundation](https://slack.cncf.io/), channel: [#harbor](https://cloud-native.slack.com/messages/harbor/) and [#harbor-dev](https://cloud-native.slack.com/messages/harbor-dev/) diff --git a/make/common.sh b/make/common.sh index e48b69bce..8628984ad 100644 --- a/make/common.sh +++ b/make/common.sh @@ -1,5 +1,5 @@ #!/bin/bash -#docker version: 17.06.0+ +#docker version: 20.10.10+ #docker-compose version: 1.18.0+ #golang version: 1.12.0+ @@ -78,7 +78,7 @@ function check_golang { function check_docker { if ! docker --version &> /dev/null 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 fi @@ -93,7 +93,7 @@ function check_docker { # 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 ]) then - error "Need to upgrade docker package to 17.06.0+." + error "Need to upgrade docker package to 20.10.10+." exit 1 fi else