From 3daf7cfec2449c6416cc8ca5c8b4bf9d996b2743 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
Date: Thu, 6 Apr 2017 20:29:43 +0200
Subject: [PATCH] =?UTF-8?q?renamed=20Docker=20image=20to=20=E2=80=9Avillas?=
 =?UTF-8?q?-node=E2=80=98=20(#79)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml         | 18 +++++++++---------
 packaging/Makefile.inc |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ddfc274d7..210c5ae21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,9 +20,9 @@ docker-dev:
     - docker info
   script:
     - docker pull fedora:latest
-    - make docker-dev
-    - docker tag -f villas-dev $DOCKER_REGISTRY/villas-dev:latest
-    - docker push $DOCKER_REGISTRY/villas-dev:latest
+    - docker build -f Dockerfile.dev -t villas-node-dev .
+    - docker tag -f villas-node-dev $DOCKER_REGISTRY/villas-node-dev:latest
+    - docker push $DOCKER_REGISTRY/villas-node-dev:latest
   tags:
     - shell
     - linux
@@ -39,7 +39,7 @@ build:
     name: "${CI_PROJECT_NAME}-${CI_BUILD_REF}"
     paths:
       - build/release/
-  image: $DOCKER_REGISTRY/villas-dev
+  image: $DOCKER_REGISTRY/villas-node-dev
   tags:
     - docker
 
@@ -51,7 +51,7 @@ docs:
       - build/release/doc/
   script:
     - make doc
-  image: $DOCKER_REGISTRY/villas-dev
+  image: $DOCKER_REGISTRY/villas-node-dev
   tags:
     - docker
 
@@ -71,7 +71,7 @@ packages:
     paths:
       - build/release/packaging/*.tar.gz
       - build/release/packaging/rpm/RPMS/
-  image: $DOCKER_REGISTRY/villas-dev
+  image: $DOCKER_REGISTRY/villas-node-dev
   tags:
     - docker
 
@@ -89,7 +89,7 @@ coverage:
       - build/release-coverage/coverage/
       - build/release-coverage/coverage.txt
       - build/release-coverage/coverage.xml
-  image: $DOCKER_REGISTRY/villas-dev
+  image: $DOCKER_REGISTRY/villas-node-dev
   coverage: '/lines: (\d+\.\d+\%)/'
   tags:
     - docker
@@ -100,7 +100,7 @@ unit:
     - build
   script:
     - make run-unit-tests
-  image: $DOCKER_REGISTRY/villas-dev
+  image: $DOCKER_REGISTRY/villas-node-dev
   tags:
     - docker
 
@@ -117,7 +117,7 @@ integration:
     when: always
     paths:
       - build/release/tests/integration/
-  image: $DOCKER_REGISTRY/villas-dev
+  image: $DOCKER_REGISTRY/villas-node-dev
   tags:
     - docker
 
diff --git a/packaging/Makefile.inc b/packaging/Makefile.inc
index bc01c156f..732724e5f 100644
--- a/packaging/Makefile.inc
+++ b/packaging/Makefile.inc
@@ -24,13 +24,13 @@ deploy-rpm:
 
 # Docker targets
 run-docker-dev:
-	docker run -it -p 80:80 -p 443:443 -p 1234:1234 --privileged --security-opt seccomp:unconfined -v $(PWD):/villas villas-dev
+	docker run -it -p 80:80 -p 443:443 -p 1234:1234 --privileged --security-opt seccomp:unconfined -v $(PWD):/villas villas-node-dev
 
 docker-dev:
-	docker build -f Dockerfile.dev -t villas-dev $(SRCDIR)
+	docker build -f Dockerfile.dev -t villas-node-dev $(SRCDIR)
 	
 docker:
-	docker build -f Dockerfile -t villas $(SRCDIR)
+	docker build -f Dockerfile -t villas-node $(SRCDIR)
 	
 clean-packaging:
 	rm -f $(BUILDDIR)/packaging/villas-node-$(VERSION_NUM).tar.gz