Commit 8675a623 by Joel Barciauskas

Make devstack-style behavior the default and launch with that

parent b5e2b083
......@@ -95,3 +95,4 @@ ENV/
.idea/
.dev/
.docker-sync/
name=$1
port=$2
docker-compose up -d $name
docker-compose $DOCKER_FILES up -d $name
echo -e "${GREEN}Installing requirements for ${name}...${NC}"
docker exec -t edx.devstack.${name} bash -c 'source /edx/app/$1/$1_env && cd /edx/app/$1/$1/ && make requirements' -- "$name"
......
......@@ -3,7 +3,7 @@
./load-db.sh edxapp_csmh
# Bring the rest of the services online
docker-compose up -d lms
docker-compose $DOCKER_FILES up -d lms
# Run edxapp migrations first since they are needed for the service users and OAuth clients
docker exec -t edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver install_prereqs'
......
......@@ -17,8 +17,20 @@ GREEN='\033[0;32m'
YELLOW='\033[0;33m'
NC='\033[0m' # No Color
if [[ "$OSTYPE" == "darwin"* ]]; then
set +e
docker-sync-daemon start
set -e
DOCKER_FILES=''
else
DOCKER_FILES='-f docker-compose.yml -f docker-compose-host.yml'
fi
export DOCKER_FILES
echo $DOCKER_FILES
# Bring the databases online.
docker-compose up -d mysql mongo
docker-compose $DOCKER_FILES up -d mysql mongo
# Ensure the MySQL server is online and usable
echo "Waiting for MySQL"
......@@ -41,7 +53,7 @@ docker exec -i edx.devstack.mongo mongo < mongo-provision.js
./provision-lms.sh
# Nothing special needed for studio
docker-compose up -d studio
docker-compose $DOCKER_FILES up -d studio
./provision-ecommerce.sh
#./provision-discovery.sh
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment