Skip to content

Commit 31ec1f1

Browse files
committed
Fixed refactored app paths
1 parent 0a75ce5 commit 31ec1f1

File tree

4 files changed

+3
-17
lines changed

4 files changed

+3
-17
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33
nbproject
44
/backup/*
55
/app/*
6-
/docker/sourcecode/code/*
76
/docker-compose.yml

bin/.config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fi
2525

2626
SCRIPT_DIR=$(dirname "$($READLINK -f "$0")")
2727
ROOT_DIR=$($READLINK -f "$SCRIPT_DIR/../")
28-
CODE_DIR=$($READLINK -f "$ROOT_DIR/code")
28+
CODE_DIR=$($READLINK -f "$ROOT_DIR/app")
2929

3030
BACKUP_DIR=$($READLINK -f "$ROOT_DIR/backup")
3131
BACKUP_SOLR_FILE='solr.cores.tbz2'

docker-compose.cloud.yml

+1-14
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
# etc/*
88
# provision/*
9-
# code/*
9+
# app/*
1010
#
1111
#######################################
1212
main:
@@ -26,7 +26,6 @@ main:
2626
- "8443:443"
2727
- "10022:22"
2828
volumes_from:
29-
- sourcecode
3029
- storage
3130
env_file:
3231
- etc/environment.yml
@@ -128,18 +127,6 @@ mysql:
128127
# - etc/environment.yml
129128
# - etc/environment.production.yml
130129

131-
#######################################
132-
# sourcecode
133-
#######################################
134-
sourcecode:
135-
build: .
136-
dockerfile: Dockerfile-Source
137-
volumes:
138-
- /docker/code/
139-
env_file:
140-
- etc/environment.yml
141-
- etc/environment.production.yml
142-
143130
#######################################
144131
# Storage
145132
#######################################

etc/environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ POSTGRES_PASSWORD=dev
4545
FTP_USER=dev
4646
FTP_PASSWORD=dev
4747
FTP_PATH=/storage/ftp/
48-
#FTP_PATH=/docker/code/
48+
#FTP_PATH=/app/

0 commit comments

Comments
 (0)