Api dockerfile changes to be able to install submodules

mistio · Jun 6, 2018 · 1ff1338 · 1ff1338
1 parent 09ba947
commit 1ff1338
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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 → Dockerfile b/docker/api/Dockerfile → Dockerfile
diff --git a/docker/api/defaults.py → defaults.py b/docker/api/defaults.py → defaults.py
diff --git 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