Merge upstream releases 1.5.3 and 1.5.4 #10
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit update the base photon image from vmware/photon:1.0 to photon:1.0 in 1.5 branch
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
Signed-off-by: wang yan <wangyan@vmware.com>
Signed-off-by: wang yan <wangyan@vmware.com>
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
…pick-1.5.0 Bump up clair cherrypick 1.5.0
This commit is to set dns search to null in the harbor containers, that means the dns search domains of docker host doesn't impact the network IO in the containers. If do not set this, Harbor notary-server and notary-signer are resolving the "mysql" alias to the resolv.conf search path instead of to "mysql." for the notary-db bridge IP, see goharbor#6031. According to docker official document, 'Use --dns-search=.' if you don't wish to set the search domain. https://docs.docker.com/v17.09/engine/userguide/networking/default_network/configure-dns/ Signed-off-by: wang yan <wangyan@vmware.com>
thequailman
approved these changes
Nov 12, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.