From 5c02966c2a6bb1c9acf6ce4c77735551bb717e22 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
Date: Fri, 14 Oct 2016 01:08:57 -0400
Subject: [PATCH] build Docker image on octopus shell

---
 .gitlab-ci.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 380c9674d..4b34dfc63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,12 +31,15 @@ stages:
 docker-image:
   stage: prepare
   # Must match the docker version on the build machine!
-  image: stackbrew/docker:1.8.2
   before_script:
+    - git submodule update --init --recursive
     - docker info
   script:
     - docker build -t $DOCKER_REGISTRY/$DOCKER_IMAGE .
     - docker push $DOCKER_REGISTRY/$DOCKER_IMAGE
+  tags:
+    - shell
+    - linux
 
 # Stage: build
 ##############################################################################
@@ -49,6 +52,8 @@ build:
     name: "${CI_PROJECT_NAME}-${CI_BUILD_REF}"
     paths:
       - $PREFIX
+  tags:
+    - docker
 
 docs:
   stage: build
@@ -59,6 +64,9 @@ docs:
       - doc/latex/
   script:
     - make doc
+  tags:
+    - docker
+
 
 # Stage: test
 ##############################################################################
@@ -68,6 +76,8 @@ unit:
   script:
     - build/release/villas-node
     - build/release/testsuite
+  tags:
+    - docker
 
 integration:
   stage: test
@@ -75,6 +85,9 @@ integration:
     - build
   script:
     - "true"
+  tags:
+    - docker
+
 
 # Stage: deliver
 ##############################################################################
@@ -89,4 +102,6 @@ deliver:
     - develop
   dependencies:
    - docs
+  tags:
+    - docker