Merge branch 'rc-latest' into 'master'

Fix docker image pushing

- to :latest only stable releases are pushed
- to :rc rc and stable releases are pushed

@marin this should get picked to stable

Fix for #948 


See merge request !541

CHANGELOG.md

@@ -12,6 +12,7 @@ omnibus-gitlab repository.
 - Added lfs config settings 4e365f159e3c70aa1aa3a578bb7440e27fcdc179
 - Rename gitlab-git-http-server to gitlab-workhorse 47afb19142fcb68d5c35645a1efa637f367e6f84
 - gitlab-workhorse version 0.4.2 3b66c9be19e5718d3e92df3a32df4edaea0d85c2
+- Fix docker image pushing
 
 8.1.3
 

Makefile

@@ -92,8 +92,15 @@ docker_push:
 	docker push gitlab/$(RELEASE_PACKAGE):$(DOCKER_TAG)
 
 docker_push_latest:
+	# push as :rc tag first, if it's stable it overwrites the :rc
+	docker tag -f $(RELEASE_PACKAGE):latest gitlab/$(RELEASE_PACKAGE):rc
+	docker push gitlab/$(RELEASE_PACKAGE):rc
+
+ifeq (,$(findstring rc,$(RELEASE_VERSION)))
+	# push as :latest tag, the :latest is always the latest stable release
 	docker tag -f $(RELEASE_PACKAGE):latest gitlab/$(RELEASE_PACKAGE):latest
 	docker push gitlab/$(RELEASE_PACKAGE):latest
+endif
 
 do_docker_master: 
 ifdef NIGHTLY

doc/docker/README.md

@@ -6,6 +6,8 @@ The GitLab EE docker image is [available on Docker Hub](https://registry.hub.doc
 
 To use GitLab EE instead of GitLab CE replace image name to `gitlab/gitlab-ee:latest`.
 
+If you want to use latest RC image as image name use `gitlab/gitlab-ce:rc` or `gitlab/gitlab-ee:rc`.
+
 ## Run the image
 
 Run the image: