From e2ec8fdd17de10ca96658f57fb2e92d4ec3ad365 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 14 May 2017 10:32:57 +0200
Subject: [PATCH] fix GitLab CI

---
 .gitlab-ci.yml         | 1 -
 packaging/Makefile.inc | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e80713bc3..21b1fbfe4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,6 @@ docker-dev:
 #    - docker login -u $DOCKER_USER -p $DOCKER_PASS -e $DOCKER_EMAIL $DOCKER_REGISTRY
   script:
     - make docker-dev
-    - make deploy-docker-dev
   tags:
     - shell
     - linux
diff --git a/packaging/Makefile.inc b/packaging/Makefile.inc
index 38ea19588..ea908f619 100644
--- a/packaging/Makefile.inc
+++ b/packaging/Makefile.inc
@@ -28,7 +28,6 @@ DEPLOY_USER ?= root
 DEPLOY_HOST ?= villas.fein-aachen.org
 DEPLOY_PATH ?= /var/www/villas/node
 
-DOCKER_REGISTRY ?= docker.io
 DOCKER_IMAGE ?= villas/node
 
 deploy-docker-dev: DOCKER_IMAGE := $(DOCKER_IMAGE)-dev
@@ -52,8 +51,7 @@ deploy-rpm:
 	ssh $(DEPLOY_USER)@$(DEPLOY_HOST) createrepo $(DEPLOY_PATH)/../packages
 
 deploy-docker deploy-docker-dev:
-	docker tag $(DOCKER_IMAGE):$(GIT_BRANCH) $(DOCKER_REGISTRY)/$(DOCKER_IMAGE):$(GIT_BRANCH)
-	docker push $(DOCKER_REGISTRY)/$(DOCKER_IMAGE):$(GIT_BRANCH)
+	docker push $(DOCKER_IMAGE):$(GIT_BRANCH)
 
 # Docker targets
 run-docker-dev: docker-dev