Fixed refactored app paths

DoPaNik · Feb 28, 2016 · 31ec1f1 · 31ec1f1
1 parent 0a75ce5
commit 31ec1f1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,4 @@
 nbproject
 /backup/*
 /app/*
-/docker/sourcecode/code/*
 /docker-compose.yml
diff --git a/bin/.config.sh b/bin/.config.sh
@@ -25,7 +25,7 @@ fi
 
 SCRIPT_DIR=$(dirname "$($READLINK -f "$0")")
 ROOT_DIR=$($READLINK -f "$SCRIPT_DIR/../")
-CODE_DIR=$($READLINK -f "$ROOT_DIR/code")
+CODE_DIR=$($READLINK -f "$ROOT_DIR/app")
 
 BACKUP_DIR=$($READLINK -f "$ROOT_DIR/backup")
 BACKUP_SOLR_FILE='solr.cores.tbz2'

diff --git a/docker-compose.cloud.yml b/docker-compose.cloud.yml
@@ -6,7 +6,7 @@
 #
 # etc/*
 # provision/*
-# code/*
+# app/*
 #
 #######################################
 main:
@@ -26,7 +26,6 @@ main:
     - "8443:443"
     - "10022:22"
   volumes_from:
-    - sourcecode
     - storage
   env_file:
     - etc/environment.yml
@@ -128,18 +127,6 @@ mysql:
 #    - etc/environment.yml
 #    - etc/environment.production.yml
 
-#######################################
-# sourcecode
-#######################################
-sourcecode:
-  build: .
-  dockerfile: Dockerfile-Source
-  volumes:
-    - /docker/code/
-  env_file:
-    - etc/environment.yml
-    - etc/environment.production.yml
-
 #######################################
 # Storage
 #######################################

diff --git a/etc/environment.yml b/etc/environment.yml
@@ -45,4 +45,4 @@ POSTGRES_PASSWORD=dev
 FTP_USER=dev
 FTP_PASSWORD=dev
 FTP_PATH=/storage/ftp/
-#FTP_PATH=/docker/code/
+#FTP_PATH=/app/