From 1ff13385b548fd1c2cc8920b3c6de7969c4334e5 Mon Sep 17 00:00:00 2001
From: Dimitris Rozakis <dimrozakis@gmail.com>
Date: Wed, 6 Jun 2018 17:55:34 +0300
Subject: [PATCH] Api dockerfile changes to be able to install submodules

---
 .gitlab-ci.yml                        | 2 +-
 .gitmodules                           | 8 ++++----
 docker/api/Dockerfile => Dockerfile   | 0
 docker/api/defaults.py => defaults.py | 0
 docker-compose.override.yml           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename docker/api/Dockerfile => Dockerfile (100%)
 rename docker/api/defaults.py => defaults.py (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28efa069ad..1738de6729 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -163,7 +163,7 @@ build api:
           --build-arg FROM_IMAGE=$SRC_IMG \
           --build-arg MIST_VERSION_SHA=$CI_COMMIT_SHA \
           --build-arg MIST_VERSION_NAME=$CI_COMMIT_REF_NAME \
-          docker/api
+          .
     - docker_push $CI_PROJECT_NAME/api:$CI_COMMIT_SHA api
 
 
diff --git a/.gitmodules b/.gitmodules
index c1d72b9ff9..925859235d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "api"]
 	path = api
-	url = ../../mistio/mist.api.git
+	url = ../mist.api.git
 [submodule "ui"]
 	path = ui
-	url = ../../mistio/mist.ui.git
+	url = ../mist.ui.git
 [submodule "landing"]
 	path = landing
-	url = ../../mistio/mist.landing.git
+	url = ../mist.landing.git
 [submodule "tests"]
 	path = tests
-	url = ../../mistio/mist.tests.git
+	url = ../mist.tests.git
diff --git a/docker/api/Dockerfile b/Dockerfile
similarity index 100%
rename from docker/api/Dockerfile
rename to Dockerfile
diff --git a/docker/api/defaults.py b/defaults.py
similarity index 100%
rename from docker/api/defaults.py
rename to defaults.py
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 3e5431c16f..c730392dd6 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -30,7 +30,7 @@ services:
 
   celery-prefork: &backend
     volumes:
-      - ./docker/api/defaults.py:$CONF_DIR/defaults.py:ro
+      - ./defaults.py:$CONF_DIR/defaults.py:ro
       - ./api:/mist.api:rw
       - ./keys:/keys
   celery-gevent: *backend