Various improvements in the release documention. (#1961)v1.2.0

Releasing 1.2.0 uncovered some rough edges that need to be documented.
Also fix github-push target and docker login.

Signed-off-by: Miek Gieben <miek@miek.nl>

2 files changed, 18 insertions, 17 deletions

diff --git a/Makefile.release b/Makefile.release
index 9576bf80f..0d6f0b91c 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -18,12 +18,15 @@
 # * Send PR to get this merged.
 #
 # * Open an issue for this release
-# * In an issue give the command: /release
+# * In an issue give the command: /release: master
+# * (to test as release /release: -t master can be used.
 #
-# See coredns/release for the README on what needs to be setup for this to be automated (can still
-# be done by hand if needed). Especially what environment variables need to be set!
+# See github.com/coredns/release for documentation README on what needs to be setup for this to be
+# automated (can still be done by hand if needed). Especially what environment variables need to be
+# set!
 #
-# To release we run:
+# To release we run, where 'release' and 'docker' only locally build assets; these are the same
+# targets that get executed in case of testing.
 # * make release
 # * make github-push
 # * make docker
@@ -84,7 +87,7 @@ tar:
 	done
 
 .PHONY: github-push
-upload:
+github-push:
 	@echo Releasing: $(VERSION)
 	@$(eval RELEASE:=$(shell curl -s -d '{"tag_name": "v$(VERSION)", "name": "v$(VERSION)"}' "https://api.github.com/repos/$(GITHUB)/$(NAME)/releases?access_token=${GITHUB_ACCESS_TOKEN}" | grep -m 1 '"id"' | tr -cd '[[:digit:]]'))
 	@echo ReleaseID: $(RELEASE)
@@ -97,10 +100,10 @@ upload:
 
 .PHONY: docker-build
 docker-build: tar
-	# Steps:
-	# 1. Copy appropriate coredns binary to build/docker/linux/<arch>
-	# 2. Copy Dockerfile to build/docker/linux/<arch>
-	rm -rf build/docker
+	@# Steps:
+	@# 1. Copy appropriate coredns binary to build/docker/linux/<arch>
+	@# 2. Copy Dockerfile to build/docker/linux/<arch>
+	@rm -rf build/docker
 	for arch in $(LINUX_ARCH); do \
 	    mkdir -p build/docker/linux/$$arch ;\
 	    tar -xzf release/$(NAME)_$(VERSION)_linux_$$arch.tgz -C build/docker/linux/$$arch ;\
@@ -111,7 +114,7 @@ docker-build: tar
 
 .PHONY: docker-push
 docker-push:
-	@docker -u $(DOCKER_LOGIN) -p $(DOCKER_PASSWORD) || exit 1
+	@echo $(DOCKER_PASSWORD) | docker login -u $(DOCKER_LOGIN) --password-stdin
 	@echo Pushing: $(VERSION) to $(DOCKER_IMAGE_NAME)
 	for arch in $(LINUX_ARCH); do \
 	    docker push $(DOCKER_IMAGE_NAME):coredns-$$arch ;\
@@ -119,7 +122,6 @@ docker-push:
 	manifest-tool push from-args --platforms $(PLATFORMS) --template $(DOCKER_IMAGE_NAME):coredns-ARCH --target $(DOCKER_IMAGE_NAME):$(VERSION)
 	manifest-tool push from-args --platforms $(PLATFORMS) --template $(DOCKER_IMAGE_NAME):coredns-ARCH --target $(DOCKER_IMAGE_NAME):latest
 
-
 .PHONY: clean
 clean:
 	rm -rf release
diff --git a/README.md b/README.md
index 21781acf9..46a4fb234 100644
--- a/README.md
+++ b/README.md
@@ -189,12 +189,11 @@ More resources can be found:
 
 ## Deployment
 
-Examples for deployment via systemd and other use cases can be found in the
-[deployment repository](https://github.com/coredns/deployment).
+Examples for deployment via systemd and other use cases can be found in the [deployment
+repository](https://github.com/coredns/deployment).
 
 ## Security
 
-If you find a security vulnerability or any security related issues,
-please DO NOT file a public issue, instead send your report privately to
-`security@coredns.io`. Security reports are greatly appreciated and we
-will publicly thank you for it.
+If you find a security vulnerability or any security related issues, please DO NOT file a public
+issue, instead send your report privately to `security@coredns.io`. Security reports are greatly
+appreciated and we will publicly thank you for it.