Merge pull request #252 from mediadepot/develop

Better Docker support

Author: GabeIsman

DOCKER.md

@@ -5,11 +5,7 @@
 1. Run the following commands:
 
 ```
-docker-compose up -d database
-docker-compose build app
-docker-compose run app rake db:create db:migrate
-docker-compose run app rake users:create_admin
-docker-compose up app
+docker-compose up
 open http://localhost:3000
 ```
 

Dockerfile

@@ -13,4 +13,16 @@ RUN bundle install
 COPY . /usr/src/app
 
 EXPOSE 3000
-CMD ["bundle", "exec", "puma", "-C", "config/puma.rb"]
+
+# install s6overlay so that we can run cron inside this container as well.
+ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz /tmp/
+RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C / \
+    && mkdir /config \
+    && apt-get update \
+    && apt-get install -y cron \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY rootfs/ /
+VOLUME ["/config"]
+
+ENTRYPOINT ["/init"]

config/environments/production.rb

@@ -29,7 +29,7 @@
   # config.assets.css_compressor = :sass
 
   # Do not fall back to locating/compiling missing assets.
-  config.assets.compile = false
+  config.assets.compile = (ENV.fetch('KLAXON_COMPILE_ASSETS', 'false').to_s.downcase == 'true')
 
   # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.
@@ -42,7 +42,7 @@
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  config.force_ssl = true
+  config.force_ssl = (ENV.fetch('KLAXON_FORCE_SSL', 'true').to_s.downcase == 'true')
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.

docker-compose.override.yml

@@ -1,10 +1,6 @@
 version: '2.2'
 
 services:
-
-  database:
-    image: "postgres:9.6"
-
   app:
     ports: ["3000:3000"]
     environment:

docker-compose.yml

@@ -1,8 +1,20 @@
 version: '2.2'
 
 services:
+  database:
+    image: "postgres:9.6"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
   app:
+    links:
+    - database
+    depends_on:
+      database:
+        condition: service_healthy
     build: .
     environment:
       RACK_ENV:

rootfs/etc/cont-init.d/10-config.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/with-contenv bash
+
+# run klaxon startup commands
+cd /usr/src/app
+bundle exec rake db:create db:migrate || true
+bundle exec rake users:create_admin || true
+
+
+
+# Setup cron to run klaxon every 15 mins.
+mkdir -p /config
+
+if [[ ! -f /config/klaxon-cron ]]; then
+
+cat > /config/klaxon-cron <<DELIM
+#!/usr/bin/with-contenv bash
+
+echo "running klaxon check.."
+
+cd /usr/src/app
+bundle exec rake check:all
+DELIM
+
+chmod +x /config/klaxon-cron
+
+fi
+
+if [[ ! -f /config/klaxon-crontab ]]; then
+
+echo "*/15 * * * * root /config/klaxon-cron > /proc/1/fd/1 2>&1" > /etc/cron.d/klaxon-crontab
+ln -s /config/klaxon-crontab /etc/cron.d/klaxon-crontab
+
+fi

rootfs/etc/services.d/cron/finish

@@ -0,0 +1,4 @@
+#!/usr/bin/execlineb -S0
+
+echo "crond exiting"
+s6-svscanctl -t /var/run/s6/services

rootfs/etc/services.d/cron/run

@@ -0,0 +1,8 @@
+#!/usr/bin/with-contenv bash
+
+echo "starting cron"
+
+#fix link-count, as cron is being a pain, and docker is making hardlink count >0 (very high)
+touch /etc/crontab /etc/cron.*/*
+
+exec cron -L 8 -f

rootfs/etc/services.d/klaxon/finish

@@ -0,0 +1,4 @@
+#!/usr/bin/execlineb -S0
+
+echo "klaxon exiting"
+s6-svscanctl -t /var/run/s6/services

rootfs/etc/services.d/klaxon/run

@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+
+echo "starting klaxon"
+cd /usr/src/app
+bundle exec puma -C "config/puma.rb"