diff --git a/bin/start_server b/bin/start_server index 902eb00..5430f9c 100644 --- a/bin/start_server +++ b/bin/start_server @@ -1,7 +1,7 @@ #!/bin/bash -e # Install gems -bundle install --jobs=4 --path=/bundle +bundle install --jobs=4 # Wait for MySQL staring until mysqladmin ping -h${MYSQL_HOSTNAME} -u${MYSQL_ROOT_USER} -p${MYSQL_ROOT_PASSWORD} --silent; do @@ -12,7 +12,7 @@ done if [ -e /app/tmp/pids/*.pid ]; then rm /app/tmp/pids/*.pid; fi # Setup database -bundle exec rails db:migrate 2>/dev/null || bundle exec rails db:setup +rails db:migrate 2>/dev/null || rails db:setup # Execute the given or default command -exec "$@" \ No newline at end of file +exec "$@" diff --git a/root/docker-compose.yml b/root/docker-compose.yml index 095c702..00b2011 100644 --- a/root/docker-compose.yml +++ b/root/docker-compose.yml @@ -24,7 +24,7 @@ services: dockerfile: ./docker/web/Dockerfile volumes: - node_modules:/app/node_modules - - bundle:/bundle + - bundle:/usr/local/bundle - .:/app env_file: ./docker/.env environment: @@ -43,4 +43,4 @@ volumes: bundle: driver: local binlog: - driver: local \ No newline at end of file + driver: local