From 483433ff60d3f74102cfc05958accac9b1208023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Wed, 8 Aug 2018 08:40:48 +0200
Subject: [PATCH] Ginkgo release branch

Now that Hawthorn.1 was released, the latest tag is no longer Ginkgo.
However, Ginkgo support will continue in branch release/ginkgo.
---
 .travis.yml | 2 +-
 Makefile    | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dc653b6..bf4bac6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,4 +11,4 @@ deploy:
   provider: script
   script: make push
   on:
-    branch: master
+    branch: release/ginkgo
diff --git a/Makefile b/Makefile
index 295c3a9..9290e5f 100644
--- a/Makefile
+++ b/Makefile
@@ -109,16 +109,13 @@ android-dockerhub: android-build android-push
 
 build:
 	# We need to build with docker, as long as docker-compose cannot push to dockerhub
-	docker build -t regis/openedx:latest -t regis/openedx:ginkgo openedx/
-	docker build -t regis/openedx-forum:latest -t regis/openedx-forum:ginkgo forum/
-	docker build -t regis/openedx-xqueue:latest -t regis/openedx-xqueue:ginkgo xqueue/
+	docker build -t regis/openedx:ginkgo openedx/
+	docker build -t regis/openedx-forum:ginkgo forum/
+	docker build -t regis/openedx-xqueue:ginkgo xqueue/
 
 push:
 	docker push regis/openedx:ginkgo
-	docker push regis/openedx:latest
 	docker push regis/openedx-forum:ginkgo
-	docker push regis/openedx-forum:latest
 	docker push regis/openedx-xqueue:ginkgo
-	docker push regis/openedx-xqueue:latest
 
 dockerhub: build push
-- 
GitLab