From 668a803d89ad83e65e6950d24aff83a10fe71248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= <balkian@gmail.com>
Date: Mon, 27 Feb 2017 20:38:55 +0100
Subject: [PATCH] Will anything break this time? We shall see

---
 .gitlab-ci.yml | 4 ----
 Makefile       | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 720550e..4021873 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,28 +44,24 @@ push-3.5:
   variables:
     PYTHON_VERSION: "3.5"
     VERSION: $CI_BUILD_TAG
-    IMAGENAME: $CI_REGISTRY_IMAGE
 
 push-2.7:
   <<: *image_definition
   variables:
     PYTHON_VERSION: "2.7"
     VERSION: $CI_BUILD_TAG
-    IMAGENAME: $CI_REGISTRY_IMAGE
 
 push-main:
   <<: *image_definition
   variables:
     PYTHON_VERSION: main
     VERSION: $CI_BUILD_TAG
-    IMAGENAME: $CI_REGISTRY_IMAGE
 
 push-latest:
   <<: *image_definition
   variables:
     PYTHON_VERSION: latest
     VERSION: $CI_BUILD_TAG
-    IMAGENAME: $CI_REGISTRY_IMAGE
   only:
     - master
     - tags
diff --git a/Makefile b/Makefile
index 03cde7a..819d6d9 100644
--- a/Makefile
+++ b/Makefile
@@ -98,11 +98,11 @@ push-latest: build-$(PYMAIN)
 	docker push '$(IMAGENAME)'
 	docker push '$(IMAGEWTAG)'
 
-push-%: build-%
-	docker push $(IMAGE):$(VERSION)-python$*
-
 push-main: push-$(PYMAIN)
 
+push-%: build-%
+	docker push $(IMAGENAME):$(VERSION)-python$*
+
 ci:
 	gitlab-runner exec docker --docker-volumes /var/run/docker.sock:/var/run/docker.sock --env CI_PROJECT_NAME=$(NAME) ${action}