Commit: cc305fbd16292f3b1c209e64ea07a2105fbd9184 - Meghsingh (git)

Never give up

Commit MetaInfo

• Révision: cc305fbd16292f3b1c209e64ea07a2105fbd9184 (tree)
• l'heure: 2016-10-05 21:32:49
• Auteur: HMML <hmml3939@gmai...>
• Commiter: HMML

Message de Log

Add docker deploy settings.

Change Summary

• modified: Dockerfile
• modified: config/deploy/docker-test.rb
• modified: config/deploy/docker.rb
• add: runapp

Modification

--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,8 @@ RUN apt -y full-upgrade
 RUN apt -y install file sox libsox-fmt-mp3 libsox-fmt-base
 RUN apt -y install libsqlite3-dev
 RUN apt-get clean
-RUN adduser --system --disabled-password --uid 3000 --group --home /var/local/app rails
+RUN adduser --system --disabled-password --uid 3000 --group --home /app rails
 RUN gem install bundler --no-rdoc --no-ri
-USER rails
-ENV BUNDLE_APP_CONFIG /var/local/app/.bundle
-CMD cd /var/local/app/current && exec bin/rails server
+ADD runapp /
+ENV BUNDLE_APP_CONFIG /app/.bundle
+CMD /runapp

--- a/config/deploy/docker-test.rb
+++ b/config/deploy/docker-test.rb
@@ -1,9 +1,10 @@
 set :sshkit_backend, SSHKit::Backend::Docker
 set :stage, :development
 set :branch, 'master'
-set :deploy_to, '/var/local/app'
+set :deploy_to, '/app'
 set :repo_url, '/src'
-fetch(:default_env).merge!(rails_env: :development, SECRET_KEY_BASE: 'dummy', DEVISE_SECRET_KEY: 'dummy')
+fetch(:default_env).merge!(rails_env: :development, RAILS_SERVE_STATIC_FILES: 1,
+                           SECRET_KEY_BASE: 'dummy', DEVISE_SECRET_KEY: 'dummy')
 set :bundle_without, 'test'
 
 fetch(:linked_dirs, []).clear

--- a/config/deploy/docker.rb
+++ b/config/deploy/docker.rb
@@ -1,15 +1,18 @@
 set :sshkit_backend, SSHKit::Backend::Docker
 set :stage, :development
 set :branch, 'master'
-set :deploy_to, '/var/local/app'
-fetch(:default_env).merge!(rails_env: :production, SECRET_KEY_BASE: 'dummy', DEVISE_SECRET_KEY: 'dummy')
-
-fetch(:linked_dirs, []).clear
-fetch(:linked_files, []).clear
+set :deploy_to, '/app'
+fetch(:default_env).merge!(rails_env: :production, RAILS_SERVE_STATIC_FILES: 1,
+                           SECRET_KEY_BASE: 'dummy', DEVISE_SECRET_KEY: 'dummy',
+                           DATABASE_URL: 'mysql2://0/change-this-in-real-production')
+#set :linked_dirs, %w()
+set :linked_files, %w()
+Rake::Task["deploy:set_linked_dirs"].clear # Save assets on each releases dir (not under shared)
 
 server docker: {
   image: 'nvc-base',
   commit: 'nvc',
+  env: {RAILS_SERVE_STATIC_FILES: 1},
 }, user: 'rails:rails', roles: %w{web app}
 
 Rake::Task["passenger:restart"].clear

--- /dev/null
+++ b/runapp
@@ -0,0 +1,19 @@
+#!/bin/bash
+: ${APP_HOME_DIR:=/app}
+: ${APP_CURRENT_DIR:=/app/current}
+: ${APP_UID:=3000}
+: ${APP_GID:=3000}
+: ${APP_SERVER_CMD:=exec bin/rails server -b0}
+
+find "${APP_HOME_DIR}" -xdev -print0 | xargs -r0 chown -h "${RAILS_UID}:${RAILS_GID}"
+
+if [ "$(id -g rails)" -ne "${APP_GID}" ]; then
+  groupmod --non-unique --gid "${APP_GID}" rails
+fi
+if [ "$(id -u rails)" -ne "${APP_UID}" ]; then
+  usermod --non-unique --uid "${APP_UID}" rails
+fi
+
+rm -f "${APP_CURRENT_DIR}"/tmp/pids/*
+cd "${APP_CURRENT_DIR}"
+exec su -p -s /bin/bash -c "${APP_SERVER_CMD}" rails