From 3f85ab2690d6248d8436fae3ac448ecbadc38c9f Mon Sep 17 00:00:00 2001 From: Roman Kuzmichev Date: Thu, 9 Jun 2016 16:34:51 +0300 Subject: [PATCH] Revert "Simplified using custom profiles" This reverts commit bf04f60c08658ac995ad15a94c51e497894b1960. --- .gitignore | 1 - docker-compose.yml | 9 +-------- docker/main-launch.sh | 6 +----- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 2e861512b..b1b563a52 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,3 @@ yasp.sql Procfile.dev docker-compose.override.yml -profiles/custom.json diff --git a/docker-compose.yml b/docker-compose.yml index 45b14c618..64b9106ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,5 @@ # Does not set up Cassandra -# You don't usually need to edit this file. -# If it does not fit your personal use case, docker-compose.override.yml is a preferred way to go. - version: '2' services: db: @@ -15,11 +12,7 @@ services: network_mode: host web: build: . - # 'basic' to launch basic configuration as in profiles/basic.json - # 'everything' to launch all the services as in profiles/everything.json - # 'custom-profile' to launch all services as in profiles/custom.json (you'll have to provide it) - # or just override the whole command with your script if existing does not fit your needs - command: ./docker/main-launch.sh basic + command: ./docker/main-launch.sh basic # change 'basic' to 'everything' to launch all services ports: - "5000" volumes: diff --git a/docker/main-launch.sh b/docker/main-launch.sh index bdb16c2de..cb3459573 100755 --- a/docker/main-launch.sh +++ b/docker/main-launch.sh @@ -2,7 +2,7 @@ # main-launch.sh # Script run in the main container -# If this script exits, so does the main container +# If this scripts exits, so does the main container npm run build @@ -14,10 +14,6 @@ case $1 in 'everything') pm2 start profiles/everything.json ;; - 'custom-profile') - # To use this option you'll have to provide your custom.json profile. It's gitignored. - pm2 start profiles/custom.json - ;; *) pm2 start profiles/everything.json ;;