Skip to content

Commit f5b64c4

Browse files
committed
data directory and travis fix
1 parent 540e006 commit f5b64c4

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
- docker
44

55
install:
6-
- scripts/venuepackage
6+
- scripts/venuepackage --clean
77
- scripts/venuestart
88

99
script:

client/app/config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
angular.module('config', [])
22

3-
.constant('ENV', 'development')
3+
.constant('ENV', 'test')
44

55
.constant('CAS_ENABLED', true)
66

7-
.constant('LOCAL_LOGIN_ENABLED', false)
7+
.constant('LOCAL_LOGIN_ENABLED', true)
88

9-
.constant('DEBUG_LOGIN_ENABLED', false)
9+
.constant('DEBUG_LOGIN_ENABLED', true)
1010

1111
;

scripts/docker/init-docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
if [ "$INTERNAL_MONGO" == "yes" ]; then
44
service mongodb start
5-
else
6-
service mongodb stop
75
fi
86
chmod +x /root # for nginx
7+
chmod +x /root/certs
8+
chmod +x /root/data
99
/root/venue/scripts/docker/generate-cert
1010
/root/venue/scripts/docker/configure-nginx
1111
/usr/sbin/nginx

scripts/venuestart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ if [ -z "$CERTS_DIRECTORY" ]; then
1010
exit 1
1111
fi
1212

13+
if [ -z "$DATA_DIRECTORY" ]; then
14+
echo "Please set \$DATA_DIRECTORY"
15+
exit 1
16+
fi
17+
1318
# This will pull from the server's environment variables
1419
docker run \
1520
-e DOMAIN \
@@ -31,4 +36,5 @@ docker run \
3136
-P \
3237
--net="host" \
3338
-v "$CERTS_DIRECTORY:/root/certs:rw" \
39+
-v "$DATA_DIRECTORY:/root/data:rw" \
3440
--name venue -dit rcos/venue

0 commit comments

Comments
 (0)