Skip to content

Conversation

@thaJeztah
Copy link
Member

Various changes in this PR:

  • remove the VERSION from the Jenkinsfile, as it was just to set a default (which is already defined in the Makefile)
  • use upstream https://github.com/docker/docker (https://github.com/moby/moby) repository to fetch the source, and add Makefile variables to allow overriding the repository and reference (branch/tag/commit) to build from
  • Add DOCKER_CLI_REPO, DOCKER_ENGINE_REPO, REF, DOCKER_CLI_REF and DOCKER_ENGINE_REF make variables to allow overriding the repository and reference to build from.
  • if an ENGINE_DIR or CLI_DIR is specified, copy the source instead of cloning (to keep the source in a fixed location)

@thaJeztah thaJeztah force-pushed the switch_to_upstream branch 3 times, most recently from 2acd047 to d1f5c41 Compare April 23, 2020 15:04
@thaJeztah

This comment has been minimized.

@thaJeztah thaJeztah force-pushed the switch_to_upstream branch 2 times, most recently from f61c9fa to 648a2cc Compare April 24, 2020 13:40
@thaJeztah thaJeztah marked this pull request as ready for review April 24, 2020 13:59
@thaJeztah thaJeztah force-pushed the switch_to_upstream branch from 648a2cc to 2e55093 Compare April 30, 2020 16:39
@thaJeztah thaJeztah force-pushed the switch_to_upstream branch from 2e55093 to 7263b38 Compare April 30, 2020 17:09
@thaJeztah thaJeztah changed the title Fetch source from upstream docker/docker repository [master] fetch source from upstream docker/docker repository Apr 30, 2020
@thaJeztah thaJeztah force-pushed the switch_to_upstream branch from 7263b38 to 1aa74b7 Compare May 1, 2020 21:04
@AkihiroSuda
Copy link
Contributor

Needs rebase

thaJeztah added 3 commits May 28, 2020 16:10
A default version is already set in the Makefile itself

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the switch_to_upstream branch 2 times, most recently from 0b06bc6 to ebe9dc7 Compare May 28, 2020 14:19
@thaJeztah
Copy link
Member Author

moved the "shallow clone" commit to a separate PR as it may need some more work; #473

@AkihiroSuda
Copy link
Contributor

@silvin-lubecki @tiborvass PTAL?

@thaJeztah
Copy link
Member Author

@silvin-lubecki @glours @tiborvass PTAL

Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@AkihiroSuda
Copy link
Contributor

@tiborvass @glours LGTY?

@silvin-lubecki silvin-lubecki merged commit d589f47 into docker:master Jun 11, 2020
@thaJeztah thaJeztah deleted the switch_to_upstream branch July 9, 2021 09:18
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