From b150028a1c400b4eb02d0383b3072f9f34571656 Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Fri, 17 Jul 2015 16:33:16 -0700 Subject: [PATCH] Document branches and tags Signed-off-by: Arnaud Porterie Upstream-commit: e4c77b047d7b9e69b7d569b867f4dd314128feda Component: engine --- .../engine/project/BRANCHES-AND-TAGS.md | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 components/engine/project/BRANCHES-AND-TAGS.md diff --git a/components/engine/project/BRANCHES-AND-TAGS.md b/components/engine/project/BRANCHES-AND-TAGS.md new file mode 100644 index 0000000000..1c6f232524 --- /dev/null +++ b/components/engine/project/BRANCHES-AND-TAGS.md @@ -0,0 +1,35 @@ +Branches and tags +================= + +Note: details of the release process for the Engine are documented in the +[RELEASE-CHECKLIST](https://github.com/docker/docker/blob/master/project/RELEASE-CHECKLIST.md). + +# Branches + +The docker/docker repository should normally have only three living branches at all time, including +the regular `master` branch: + +## `docs` branch + +The `docs` branch supports documentation updates between product releases. This branch allow us to +decouple documentation releases from product releases. + +## `release` branch + +The `release` branch contains the last _released_ version of the code for the project. + +The `release` branch is only updated at each public release of the project. The mechanism for this +is that the release is materialized by a pull request against the `release` branch which lives for +the duration of the code freeze period. When this pull request is merged, the `release` branch gets +updated, and its new state is tagged accordingly. + +# Tags + +Any public release of a compiled binary, with the logical exception of nightly builds, should have +a corresponding tag in the repository. + +The general format of a tag is `vX.Y.Z[-suffix[N]]`: + +- All of `X`, `Y`, `Z` must be specified (example: `v1.0.0`) +- First release candidate for version `1.8.0` should be tagged `v1.8.0-rc1` +- Second alpha release of a product should be tagged `v1.0.0-alpha1`