[18.03 backport] backport CI, Makefile and Dockerfile fixes and improvements #2393
Conversation
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
Containerize support.sh Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit 3aaa507) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Euan Harris <euan.harris@docker.com> (cherry picked from commit 78d9390) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
agent.pb.go is unchanged, but the files in networkdb and drivers are slightly different when regenerated using the current versions of protoc and gogoproto. This is probably because agent.pb.go was last regenerated quite recently, in February 2018, whereas networkdb.pb.go and overlay/overlay.pb.go were last changed in 2017, and windows/overlay/overlay.pb.go was last changed in 2016. Signed-off-by: Euan Harris <euan.harris@docker.com> (cherry picked from commit e12dd44) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
In order to support different branches create master tag Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit 68857a1) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This makes it possible to Ctrl-C tests and builds again. Zombie processes will also be reaped correctly. Signed-off-by: Euan Harris <euan.harris@docker.com> (cherry picked from commit f0265ad) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Add documentation and move protobuf target into Build section Signed-off-by: Euan Harris <euan.harris@docker.com> (cherry picked from commit fcdd600) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Outside the build container, run: make protobuf Inside the build container, run: make protobuf-local Signed-off-by: Euan Harris <euan.harris@docker.com> (cherry picked from commit 30ce4d7) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
'make check' will now fail if the files produced by re-running protoc differ from those which are checked into the repository. Signed-off-by: Euan Harris <euan.harris@docker.com> (cherry picked from commit b7cf819) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Euan Harris <euan.harris@docker.com> (cherry picked from commit f00ea14) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* addresses * assigned * at least * attachments * auxiliary * available * cleanup * communicate * communications * configuration * connection * connectivity * destination * encountered * endpoint * example * existing * expansion * expected * external * forwarded * gateway * implementations * implemented * initialize * internally * loses * message * network * occurred * operational * origin * overlapping * reaper * redirector * release * representation * resolver * retrieve * returns * sanbdox * sequence * succesful * synchronizing * update * validates Signed-off-by: Josh Soref <jsoref@gmail.com> (cherry picked from commit b10559f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Avoid printing the if condition Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit d36e08f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This avoids build failures when gogoprotobuf is changed upstream. Signed-off-by: Euan Harris <euan.harris@docker.com> (cherry picked from commit 52cb776) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit 29237c0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit a0c1f42) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Member
Author
|
ping @euanh @tiborvass @arkodg PTAL |
Member
Author
|
Not sure if this is related; Will have to dig if changes were made in that test somewhere |
thaJeztah
force-pushed
the
18.03_backport_fix_ci
branch
from
96078aa to
0a1bc97
Compare
This was referenced Jun 24, 2019
Also fixes issue reported by ineffassign Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit 23fc2c9) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
18.03_backport_fix_ci
branch
from
0a1bc97 to
e934548
Compare
euanh
approved these changes
Jun 24, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backports of;
I can drop the "spelling" fixes if needed; thought to include them to easily future backports, but they're not critical.