From 99377de7d2c48e25cb13928605c90ea40eab5b35 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Wed, 18 Sep 2013 19:41:08 -0500 Subject: [PATCH] Hack: update release checklist and reference it in REAMDE --- hack/README.md | 2 ++ hack/RELEASE-CHECKLIST.md | 12 +++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hack/README.md b/hack/README.md index 5f330bc281..a8ebdd5811 100644 --- a/hack/README.md +++ b/hack/README.md @@ -8,3 +8,5 @@ If you're a *contributor* or aspiring contributor, you should read CONTRIBUTORS. If you're a *maintainer* or aspiring maintainer, you should read MAINTAINERS.md. If you're a *packager* or aspiring packager, you should read PACKAGERS.md. + +If you're a maintainer in charge of a *release*, you should read RELEASE-CHECKLIST.md. diff --git a/hack/RELEASE-CHECKLIST.md b/hack/RELEASE-CHECKLIST.md index f01bb3a60b..578194b70b 100644 --- a/hack/RELEASE-CHECKLIST.md +++ b/hack/RELEASE-CHECKLIST.md @@ -55,11 +55,9 @@ EXAMPLES: ### 4. Run all tests -```bash -go test -``` +FIXME -### 5. Commit and create a pull request +### 5. Commit and create a pull request to the "release" branch ```bash git add CHANGELOG.md @@ -72,7 +70,7 @@ git push origin bump_$VERSION ### 7. Merge the pull request and apply tags ```bash -git checkout master +git checkout release git merge bump_$VERSION git tag -a v$VERSION # Don't forget the v! git tag -f -a latest @@ -87,13 +85,13 @@ Get them from [the infrastructure maintainers]( https://github.com/dotcloud/docker/blob/master/hack/infrastructure/MAINTAINERS). ```bash -docker build -t releasedocker . +docker build -t docker . docker run \ -e AWS_S3_BUCKET=get-nightly.docker.io \ -e AWS_ACCESS_KEY=$(cat ~/.aws/access_key) \ -e AWS_SECRET_KEY=$(cat ~/.aws/secret_key) \ -e GPG_PASSPHRASE=supersecretsesame \ - releasedocker + hack/make.sh release ``` It will build and upload the binaries on the specified bucket (you should