This repository was archived by the owner on Oct 13, 2023. It is now read-only.
[18.06] Bump SwarmKit to 8852e88#32
Merged
Merged
Conversation
Relevant changes; - swarmkit moby#2593 agent: return error when failing to apply network key - swarmkit moby#2645 Replace deprecated grpc functions - swarmkit moby#2720 Test if error is nil before to log it - swarmkit moby#2712 [orchestrator] Fix task sorting - swarmkit moby#2677 [manager/orchestrator/reaper] Fix the condition used for skipping over running tasks Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 660fa12) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Member
Author
|
ping @anshulpundir @dperny |
andrewhsu
changed the title
anshulpundir
approved these changes
Aug 7, 2018
docker-jenkins
pushed a commit
that referenced
this pull request
May 3, 2019
1. There is no need to persist DOCKER_GITCOMMIT, as it's not needed for runtime, only for build. So, remove ENV. 2. In case $GITCOMMIT is not defined during build time (and it happens if .git directory is not present), we still need to have some value set, so set it to `undefined`. Otherwise we'll have something like > => ERROR [builder 2/3] RUN hack/make.sh build-integration-test-binary > ------ > > [builder 2/3] RUN hack/make.sh build-integration-test-binary: > #32 0.488 > #32 0.505 error: .git directory missing and DOCKER_GITCOMMIT not specified > #32 0.505 Please either build with the .git directory accessible, or specify the > #32 0.505 exact (--short) commit hash you are building using DOCKER_GITCOMMIT for > #32 0.505 future accountability in diagnosing build issues. Thanks! Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
andrewhsu
pushed a commit
that referenced
this pull request
May 14, 2019
1. There is no need to persist DOCKER_GITCOMMIT, as it's not needed for runtime, only for build. So, remove ENV. 2. In case $GITCOMMIT is not defined during build time (and it happens if .git directory is not present), we still need to have some value set, so set it to `undefined`. Otherwise we'll have something like > => ERROR [builder 2/3] RUN hack/make.sh build-integration-test-binary > ------ > > [builder 2/3] RUN hack/make.sh build-integration-test-binary: > #32 0.488 > #32 0.505 error: .git directory missing and DOCKER_GITCOMMIT not specified > #32 0.505 Please either build with the .git directory accessible, or specify the > #32 0.505 exact (--short) commit hash you are building using DOCKER_GITCOMMIT for > #32 0.505 future accountability in diagnosing build issues. Thanks! Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit c3b2494) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Backport of moby#37586 for 18.06
cherry-pick was clean; no conflicts
Full diff: moby/swarmkit@6826639...8852e88
Relevant changes;