Skip to content

Commit 6881340

Browse files
committed
Use 20.10 release branch for upstream engine resources
The 20.10 release branch now exists, and "master" will be used for Docker Engine 21.xx development. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 734e868 commit 6881340

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Diff for: Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
ARG JEKYLL_ENV=development
1515

1616
# Engine
17-
# TODO change to 20.10 branch, once created
18-
ARG ENGINE_BRANCH="master"
17+
ARG ENGINE_BRANCH="20.10"
1918

2019
# Distribution
2120
ARG DISTRIBUTION_BRANCH="release/2.7"

Diff for: _scripts/fetch-upstream-resources.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fi
2525
# Directories to get via SVN. We use this because you can't use git to clone just a portion of a repository
2626
svn co "https://github.com/docker/cli/${engine_svn_branch}/docs/extend" ./engine/extend || (echo "Failed engine/extend download" && exit 1)
2727
svn co "https://github.com/docker/docker/${engine_svn_branch}/docs/api" ./engine/api || (echo "Failed engine/api download" && exit 1)
28-
svn co "https://github.com/docker/compose-cli/${compose_cli_svn_branch}/docs" ./cloud || (echo "Failed compose-cli/docs download" && exit 1)
28+
svn co "https://github.com/docker/compose-cli/${compose_cli_svn_branch}/docs" ./cloud || (echo "Failed compose-cli/docs download" && exit 1)
2929
svn co "https://github.com/docker/distribution/${distribution_svn_branch}/docs/spec" ./registry/spec || (echo "Failed registry/spec download" && exit 1)
3030
svn co "https://github.com/mirantis/compliance/trunk/docs/compliance" ./compliance || (echo "Failed docker/compliance download" && exit 1)
3131

0 commit comments

Comments
 (0)