Skip to content

Conversation

@thaJeztah
Copy link
Member

Backporting #2168 to the bump_18.03 branch

ping @fcrisciani @selansen PTAL

selansen and others added 2 commits June 26, 2018 12:59
This commit will allow us to use newer version of CircleCI.

Signed-off-by: selansen <elango.siva@docker.com>
(cherry picked from commit 2df9b0a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
- cleaned the make check
- local build do not require context

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
(cherry picked from commit 27aa67c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Copy link

@fcrisciani fcrisciani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fcrisciani
Copy link

Thanks @thaJeztah

@fcrisciani fcrisciani merged commit 1ca6032 into moby:bump_18.03 Jun 26, 2018
@thaJeztah thaJeztah deleted the 18.03-circle2.0 branch June 26, 2018 16:43
@selansen
Copy link
Contributor

@fcrisciani brought back .dockerginore file back to libnetwork in another PR. we may need to back port it .

@thaJeztah
Copy link
Member Author

Ah, yes; my main concern was making sure that CI would continue to work on the release branch, but if you have time to do a cherry pick 👍

@selansen
Copy link
Contributor

CI will work without Flavio's commit. but we are doing lot of cleanup. I will do it tomorrow.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants