Refine development setup

Development with compose now uses the same Dockerfile. We also wait for
MySQL at startup so the entire setup is more robust.

.env.db

@@ -1,8 +1,6 @@
 MYSQL_USER=commit_watcher
-MYSQL_DATABASE=commit_watcher_production
+MYSQL_DATABASE=commit_watcher_development
+MYSQL_PASSWORD=changeme123
 
 # Not used but should set one for security.
 MYSQL_ROOT_PASSWORD=changeme123
-
-# This is for the commit_watcher user.
-MYSQL_PASSWORD=changeme123

.env.web

@@ -1,4 +1,4 @@
-RAILS_ENV=production
+RAILS_ENV=development
 REDIS_URL=redis://redis:6379/12
 RAILS_SERVE_STATIC_FILES=true
-COMMIT_WATCHER_DATABASE_PASSWORD=changeme123
+COMMIT_WATCHER_DATABASE_HOST=db

Dockerfile

@@ -11,3 +11,5 @@ RUN gem install bundler && bundle install
 RUN mkdir /myapp
 ADD . /myapp
 WORKDIR /myapp
+
+ENTRYPOINT scripts/deploy

config/database.yml

@@ -2,13 +2,13 @@ default: &default
   adapter: mysql2
   encoding: utf8
   pool: 5
-  username: root
-  password:
+  username: commit_watcher
+  password: changeme123
   # Use this for local mysql instances
-  socket: /tmp/mysql.sock
+  # socket: /tmp/mysql.sock
 
   # Use this for Docker
-  #host: db
+  host: db
 
   # Use this for External RDS
   #host: <%= ENV['COMMIT_WATCHER_EXTERNAL_DATABASE_URL'] %>

config/sidekiq.yml

@@ -1,10 +1,8 @@
 ---
 :concurrency: 5
-staging:
-  :concurrency: 5
+:logfile: ./log/sidekiq.log
 production:
   :concurrency: 10
-  :logfile: ./log/sidekiq.log
 :queues:
   - audit_commits
   - collect_commits

docker-compose.yml

@@ -10,16 +10,6 @@ web:
   env_file:
     - '.env.web'
   command: scripts/deploy
-sidekiq:
-  build: .
-  volumes:
-    - .:/myapp
-  links:
-    - db
-    - redis
-  env_file:
-    - '.env.web'
-  command: bundle exec sidekiq
 db:
   image: library/mysql:5.6.22
   ports:

scripts/deploy

@@ -1,5 +1,11 @@
 #!/bin/sh
 
+echo 'Waiting for MySQL to be available...'
+while ! mysqladmin ping -h"$COMMIT_WATCHER_DATABASE_HOST" --silent; do
+  sleep 2
+done
+echo 'MySQL is up!'
+
 bundle exec rake assets:precompile --trace
 
 export SECRET_KEY_BASE=$(rake secret)