orchestration 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8ceff8fc2dd990496a6de51dddca57caa2e7000
-  data.tar.gz: dd0507265efb67c67ea5164cb2a7ff8b22675f0d
+  metadata.gz: 1ff223f91a5979874db88e7e55a788b9c7a645f5
+  data.tar.gz: d910c778ab54470515efdfa2f514853a91f5f0ea
 SHA512:
-  metadata.gz: 6f254e30b288a9d20aba6b55abd7fc01fd8973690bb31f430904f870a40088a6b0b7b4c5f7677c81c1cf02c6ed99c2fc8552a3a2ead211ed3bf877757dccea80
-  data.tar.gz: fc397b5f3341a7f6b2eda9e3231159c5fa5460a9feb3b5059472c5ea21de94796a3f55a4b7ad18571ef6a99eeb1ba3c3896efa7868024ccc577679777ae621fb
+  metadata.gz: e03236d51bfd3476b89cbe27a3811f2e4455c1c50b741901bd98a9db539cd029df39d8bdd0547228279b532252a1a484e7716f37c0f86a82c162847ff48a293a
+  data.tar.gz: 1538b05bdf17e1ecb6478992aff82ededd06cbfcf23b87dec959f2a8afc66cc408f5171de36539d9ba148b0b66372e57126c7f7023c0b135fbbefff881b6853d

data/.gitignore

@@ -21,5 +21,6 @@ spec/dummy/.gitignore
 spec/dummy/Makefile
 spec/dummy/docker/*
 spec/dummy/docker-compose.yml
+spec/dummy/config/unicorn.rb
 
 .byebug_history

data/README.md

@@ -18,7 +18,7 @@ Containers are automatically created for the following dependencies:
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.2.2'
+gem 'orchestration', '~> 0.2.3'
 ```
 
 And then build your bundle:

data/TODO

@@ -1,9 +1,15 @@
 Be aware of yarn and include build steps in Dockerfile if present. Use dashboard
 front end as a reference.
 
-Create a production docker-compose.yml and set:
-  - RAILS_ENV
-  - SECRET_KEY_BASE
-  - DATABASE_URL (from config/database.yml)
-
 Provide volumes for databases and mount appropriate directories for adapter
+
+Refactor docker-compose services - these really belong in
+lib/orchestration/services/<service-name>/docker_compose.rb
+
+Add a note to README to handle `RAILS_LOG_TO_STDOUT` in development -
+unfortunately Rails ignores this value in development mode. (It's configured in
+config/environments/production.rb)
+
+Standardise on log formats - by policy or recommendation ?
+
+Redis support

data/config/locales/en.yml

@@ -2,15 +2,27 @@ en:
   orchestration:
     unknown_scheme: "Unrecognised database adapter for URL scheme: %{scheme}"
     attempt_limit: "Unable to reconnect after %{limit} attempts. Aborting."
+
+    application:
+      waiting: "Waiting for application: %{config}"
+      ready: "Application is ready."
+      connection_error: "Error attempting to connect to application: received status code %{code}"
+
     database:
       waiting: "Waiting for database: %{config}"
       ready: "Database is ready."
-      missing_default: "database.yml must define a `default` section."
+
     mongo:
       waiting: "Waiting for Mongo: %{config}"
       ready: "Mongo is ready."
+
+    nginxproxy:
+      waiting: "Waiting for Nginx proxy: %{config}"
+      ready: "Nginx proxy is ready."
+
     rabbitmq:
       waiting: "Waiting for RabbitMQ: %{config}"
       ready: "RabbitMQ is ready."
+
     docker:
       username_request: "Enter your Docker registry username (used for tagging images)"

data/lib/Rakefile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'orchestration'
+
+import Orchestration.root.join('lib', 'tasks', 'orchestration.rake')

data/lib/orchestration/docker_compose/application_service.rb

@@ -3,48 +3,46 @@
 module Orchestration
   module DockerCompose
     class ApplicationService
-      PORT = 3000
-
       def initialize(config)
         @config = config
-        @env = config.environment
       end
 
       def definition
         {
           'image' => image,
+          'entrypoint' => '/entrypoint.sh',
+          'command' => %w[
+            bundle exec unicorn -c /application/config/unicorn.rb
+          ],
           'environment' => environment,
-          'ports' => ["#{PORT}:#{PORT}"]
+          'expose' => [8080]
         }
       end
 
       private
 
       def image
-        "#{@env.settings.get('docker.username')}/#{@env.application_name}"
+        "#{@config.docker_username}/#{@config.application_name}"
       end
 
       def environment
         {
-          # `nil` values will inherit from environment or `.env` file.
-          'RAILS_ENV' => nil,
-          'SECRET_KEY_BASE' => nil,
-          'DATABASE_URL' => database_url,
-          'RAILS_LOG_TO_STDOUT' => '1'
-        }
+          'DATABASE_URL' => @config.database_url,
+          'RAILS_LOG_TO_STDOUT' => '1',
+          'UNICORN_PRELOAD_APP' => '1',
+          'UNICORN_TIMEOUT' => '60',
+          'UNICORN_WORKER_PROCESSES' => '8',
+          'VIRTUAL_PORT' => '8080',
+          'VIRTUAL_HOST' => 'localhost'
+        }.merge(inherited_environment)
       end
 
-      def database_url
-        settings = @config.database_settings
-        return nil if settings.fetch('adapter') == 'sqlite3'
-
-        scheme = settings.fetch('scheme')
-        database = settings.fetch('database')
-        username = settings.fetch('username')
-        password = settings.fetch('password')
-        port = DatabaseService::PORT
-
-        "#{scheme}://#{username}:#{password}@database:#{port}/#{database}"
+      def inherited_environment
+        {
+          'HOST_UID' => nil,
+          'RAILS_ENV' => nil,
+          'SECRET_KEY_BASE' => nil
+        }
       end
     end
   end

data/lib/orchestration/docker_compose/mongo_service.rb

@@ -10,18 +10,27 @@ module Orchestration
       def definition
         return nil if @config.settings.nil?
 
-        # REVIEW: If the host application defines multiple mongo hosts then we
-        # create one service instance and point them all at the same service.
-        # Instead we should probably create a separate service for each.
-        ports = @config.ports.map do |port|
-          "#{port}:#{Orchestration::Services::Mongo::PORT}"
-        end
-
         {
           'image' => 'library/mongo',
-          'ports' => ports
+          'ports' => ["#{local_port}:#{remote_port}"]
         }
       end
+
+      private
+
+      def local_port
+        _host, _, port = @config.settings
+                                .fetch('clients')
+                                .fetch('default')
+                                .fetch('hosts')
+                                .first
+                                .partition(':')
+        port.empty? ? remote_port : port
+      end
+
+      def remote_port
+        Orchestration::Services::Mongo::PORT
+      end
     end
   end
 end

data/lib/orchestration/docker_compose/nginx_proxy_service.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module DockerCompose
+    class NginxProxyService
+      def initialize(config)
+        @config = config
+      end
+
+      def definition
+        {
+          'image' => 'jwilder/nginx-proxy',
+          'ports' => %w[3000:80],
+          'volumes' => ['/var/run/docker.sock:/tmp/docker.sock:ro']
+        }
+      end
+    end
+  end
+end

data/lib/orchestration/docker_compose/services.rb

@@ -8,7 +8,8 @@ module Orchestration
           'application' => options.fetch(:application, nil),
           'database' => options.fetch(:database, nil),
           'mongo' => options.fetch(:mongo, nil),
-          'rabbitmq' => options.fetch(:rabbitmq, nil)
+          'rabbitmq' => options.fetch(:rabbitmq, nil),
+          'nginx-proxy' => options.fetch(:nginx_proxy, nil)
         }
       end
 
@@ -31,7 +32,8 @@ module Orchestration
           { name: 'application', class: ApplicationService },
           { name: 'database', class: DatabaseService },
           { name: 'mongo', class: MongoService },
-          { name: 'rabbitmq', class: RabbitMQService }
+          { name: 'rabbitmq', class: RabbitMQService },
+          { name: 'nginx-proxy', class: NginxProxyService }
         ]
       end
 

data/lib/orchestration/docker_compose.rb

@@ -10,4 +10,5 @@ require 'orchestration/docker_compose/services'
 require 'orchestration/docker_compose/application_service'
 require 'orchestration/docker_compose/database_service'
 require 'orchestration/docker_compose/mongo_service'
+require 'orchestration/docker_compose/nginx_proxy_service'
 require 'orchestration/docker_compose/rabbitmq_service'

data/lib/orchestration/environment.rb

@@ -32,6 +32,14 @@ module Orchestration
       root.join('.orchestration.yml')
     end
 
+    def docker_compose_configuration_path
+      root.join('docker-compose.yml')
+    end
+
+    def docker_compose_config
+      YAML.safe_load(File.read(docker_compose_configuration_path))
+    end
+
     def application_name
       Rails.application.class.parent.name.underscore
     end
@@ -41,7 +49,9 @@ module Orchestration
     end
 
     def root
-      Rails.root
+      return Rails.root if defined?(Rails) && Rails.root
+
+      Pathname.new(Dir.pwd)
     end
   end
 end

data/lib/orchestration/errors.rb

@@ -2,6 +2,8 @@
 
 module Orchestration
   class OrchestrationError < StandardError; end
+
+  class ApplicationConnectionError < OrchestrationError; end
   class DatabaseConfigurationError < OrchestrationError; end
   class MongoConfigurationError < OrchestrationError; end
 end

data/lib/orchestration/file_helpers.rb

@@ -4,9 +4,9 @@ module Orchestration
   module FileHelpers
     private
 
-    def template(template_name, environment = {})
+    def template(template_name, context = {})
       Erubis::Eruby.new(read_template(template_name))
-                   .result(environment)
+                   .result(context)
     end
 
     def delete_and_inject_after(path, pattern, replacement)
@@ -82,7 +82,7 @@ module Orchestration
     end
 
     def read_template(template)
-      File.read(templates_path.join("#{template}.tt"))
+      File.read(templates_path.join("#{template}.erb"))
     end
   end
 end

data/lib/orchestration/install_generator.rb

@@ -35,15 +35,19 @@ module Orchestration
     end
 
     def dockerfile
-      docker_dir = Rails.root.join('docker')
-      path = docker_dir.join('Dockerfile')
       content = template('Dockerfile', ruby_version: RUBY_VERSION)
-      FileUtils.mkdir(docker_dir) unless Dir.exist?(docker_dir)
+      write_file(docker_dir.join('Dockerfile'), content, overwrite: false)
+    end
+
+    def entrypoint
+      content = template('entrypoint.sh')
+      path = docker_dir.join('entrypoint.sh')
       write_file(path, content, overwrite: false)
+      FileUtils.chmod('a+x', path)
     end
 
     def gitignore
-      path = Rails.root.join('.gitignore')
+      path = @env.root.join('.gitignore')
       entries = [
         'docker/.build',
         'docker/Gemfile',
@@ -54,18 +58,25 @@ module Orchestration
     end
 
     def docker_compose
-      path = Rails.root.join('docker-compose.yml')
+      path = @env.root.join('docker-compose.yml')
       return if File.exist?(path)
 
       docker_compose = DockerCompose::Services.new(
         application: configuration(:application),
         database: configuration(:database),
         mongo: configuration(:mongo),
-        rabbitmq: configuration(:rabbitmq)
+        rabbitmq: configuration(:rabbitmq),
+        nginx_proxy: configuration(:nginx_proxy)
       )
       write_file(path, docker_compose.structure.to_yaml)
     end
 
+    def unicorn
+      content = template('unicorn.rb')
+      path = @env.root.join('config', 'unicorn.rb')
+      write_file(path, content, overwrite: false)
+    end
+
     private
 
     def configuration(service)
@@ -73,7 +84,8 @@ module Orchestration
         application: Services::Application::Configuration,
         database: Services::Database::Configuration,
         mongo: Services::Mongo::Configuration,
-        rabbitmq: Services::RabbitMQ::Configuration
+        rabbitmq: Services::RabbitMQ::Configuration,
+        nginx_proxy: Services::NginxProxy::Configuration
       }.fetch(service).new(@env)
     end
 
@@ -81,7 +93,9 @@ module Orchestration
       [
         configuration(:database).settings.nil? ? nil : 'wait-database',
         configuration(:mongo).settings.nil? ? nil : 'wait-mongo',
-        configuration(:rabbitmq).settings.nil? ? nil : 'wait-rabbitmq'
+        configuration(:rabbitmq).settings.nil? ? nil : 'wait-rabbitmq',
+        'wait-nginx-proxy',
+        'wait-application'
       ].compact.join(' ')
     end
 
@@ -91,5 +105,12 @@ module Orchestration
       @terminal.write(:setup, I18n.t('orchestration.docker.username_request'))
       settings.set('docker.username', @terminal.read('[username]:'))
     end
+
+    def docker_dir
+      path = @env.root.join('docker')
+      FileUtils.mkdir(path) unless Dir.exist?(path)
+
+      path
+    end
   end
 end

data/lib/orchestration/service_check.rb

@@ -64,7 +64,7 @@ module Orchestration
     def echo_failure
       @terminal.write(
         :failure,
-        I18n.t('orchestration.attempt_limit', limit: ATTEMPT_LIMIT)
+        I18n.t('orchestration.attempt_limit', limit: @attempt_limit)
       )
     end
 

data/lib/orchestration/services/application/configuration.rb

@@ -4,17 +4,44 @@ module Orchestration
   module Services
     module Application
       class Configuration
+        include ConfigurationBase
+
+        self.service_name = 'application'
+
         def initialize(env)
           @env = env
+          @settings = {} # Included for interface consistency; currently unused.
+        end
+
+        def docker_username
+          @env.settings.get('docker.username')
+        end
+
+        def application_name
+          @env.application_name
         end
 
-        def environment
-          @env
+        def friendly_config
+          "[#{application_name}] #{host}:#{local_port}"
         end
 
         def database_settings
           Database::Configuration.new(@env).settings
         end
+
+        def database_url
+          settings = database_settings
+          return nil if settings.fetch('adapter') == 'sqlite3'
+
+          scheme = settings.fetch('scheme')
+          database = settings.fetch('database')
+          username = settings.fetch('username')
+          password = settings.fetch('password')
+          port = settings.fetch('port')
+          host = Database::Configuration.service_name
+
+          "#{scheme}://#{username}:#{password}@#{host}:#{port}/#{database}"
+        end
       end
     end
   end

data/lib/orchestration/services/application/healthcheck.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module Services
+    module Application
+      class Healthcheck
+        include HealthcheckBase
+
+        def initialize(env)
+          @configuration = Configuration.new(env)
+        end
+
+        def connect
+          response = Net::HTTP.get_response(
+            URI("http://localhost:#{@configuration.local_port}")
+          )
+          connection_error(response.code) if connection_error?(response.code)
+        end
+
+        def connection_errors
+          [Errno::ECONNREFUSED, ApplicationConnectionError]
+        end
+
+        private
+
+        def connection_error(code)
+          raise ApplicationConnectionError,
+                I18n.t('orchestration.application.connection_error', code: code)
+        end
+
+        def connection_error?(code)
+          %w[502 503 500].include?(code)
+        end
+      end
+    end
+  end
+end

data/lib/orchestration/services/application.rb

@@ -7,4 +7,7 @@ module Orchestration
   end
 end
 
+require 'net/http'
+
 require 'orchestration/services/application/configuration'
+require 'orchestration/services/application/healthcheck'

data/lib/orchestration/services/configuration_base.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module Services
+    module ConfigurationBase
+      attr_reader :settings
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def service_name=(val)
+          @service_name = val
+        end
+
+        def service_name
+          return @service_name unless @service_name.nil?
+
+          raise ArgumentError,
+                "Must call `self.name=` on #{self.class.service_name}"
+        end
+      end
+
+      def host
+        'localhost'
+      end
+
+      def local_port
+        name = self.class.service_name
+        key = name == 'application' ? 'nginx-proxy' : name
+
+        @env.docker_compose_config
+            .fetch('services')
+            .fetch(key)
+            .fetch('ports')
+            .first
+            .partition(':')
+            .first
+            .to_i
+      end
+    end
+  end
+end

data/lib/orchestration/services/database/configuration.rb

@@ -4,7 +4,11 @@ module Orchestration
   module Services
     module Database
       class Configuration
-        attr_reader :adapter, :settings
+        include ConfigurationBase
+
+        self.service_name = 'database'
+
+        attr_reader :adapter
 
         def initialize(env)
           @env = env
@@ -13,28 +17,24 @@ module Orchestration
           return unless defined?(ActiveRecord)
           return unless File.exist?(@env.database_configuration_path)
 
+          @environments = parse(File.read(@env.database_configuration_path))
           setup
         end
 
         def friendly_config
-          adapter = @settings['adapter']
-          host = @settings['host']
-          port = @settings['port']
+          adapter = @settings.fetch('adapter')
           return "[#{adapter}]" if adapter == 'sqlite3'
-          return "[#{adapter}] #{host}" unless port.present?
 
-          "[#{adapter}] #{host}:#{port}"
+          "[#{adapter}] #{host}:#{local_port}"
         end
 
         private
 
         def setup
-          environments = parse(File.read(@env.database_configuration_path))
-          base = base_config(environments)
           @adapter = adapter_object(base['adapter'])
           @settings = base.merge(@adapter.credentials)
                           .merge('scheme' => scheme_name(base['adapter']))
-          @settings.merge!(default_port) unless @settings.key?('port')
+          @settings.merge!(default_port) if @settings['port'].nil?
         end
 
         def parse(content)
@@ -57,15 +57,18 @@ module Orchestration
           }.fetch(name).new
         end
 
-        def base_config(environments)
-          missing_default unless environments.key?('default')
+        def environment
+          @environments[@env.environment]
+        end
 
-          host = url_config['host'] || environments[@env.environment]['host']
+        def base
+          environment.merge(url_config).merge('host' => host)
+        end
 
-          environments
-            .fetch('default')
-            .merge(url_config)
-            .merge('host' => host)
+        def host
+          return nil if @adapter.is_a?(adapters::Sqlite3)
+
+          super
         end
 
         def adapters
@@ -109,11 +112,6 @@ module Orchestration
           Hash[URI.decode_www_form(uri.query)]
         end
 
-        def missing_default
-          raise DatabaseConfigurationError,
-                I18n.t('orchestration.database.missing_default')
-        end
-
         def adapter_mapping
           {
             'mysql' => 'mysql2',

data/lib/orchestration/services/database/healthcheck.rb

@@ -6,6 +6,8 @@ module Orchestration
       class Healthcheck
         include HealthcheckBase
 
+        dependencies 'active_record'
+
         def initialize(env)
           @configuration = Configuration.new(env)
         end

data/lib/orchestration/services/healthcheck_base.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module Services
+    module HealthcheckBase
+      attr_reader :configuration
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def start(env = nil, terminal = nil, options = {})
+          load_dependencies
+          exit_on_error = options.fetch(:exit_on_error, true)
+          options.delete(:exit_on_error)
+          env ||= Environment.new
+          terminal ||= Terminal.new
+          check = ServiceCheck.new(new(env), terminal, options)
+
+          exit 1 if !check.run && exit_on_error
+        end
+
+        def dependencies(*args)
+          @dependencies = args
+        end
+
+        private
+
+        def load_dependencies
+          return if @dependencies.nil?
+
+          @dependencies.map { |dependency| require dependency }
+        end
+      end
+    end
+  end
+end

data/lib/orchestration/services/mongo/configuration.rb

@@ -4,7 +4,9 @@ module Orchestration
   module Services
     module Mongo
       class Configuration
-        attr_reader :settings
+        include ConfigurationBase
+
+        self.service_name = 'mongo'
 
         def initialize(env)
           @env = env
@@ -15,16 +17,8 @@ module Orchestration
           @settings = config.fetch(@env.environment)
         end
 
-        def ports
-          hosts_and_ports.map { |_host, port| port }
-        end
-
         def friendly_config
-          hosts_string = hosts_and_ports.map do |host, port|
-            "#{host}:#{port}"
-          end.join(', ')
-
-          "[mongoid] #{hosts_string}"
+          "[mongoid] #{host}:#{local_port}"
         end
 
         private
@@ -34,21 +28,6 @@ module Orchestration
             File.read(@env.mongoid_configuration_path), [], [], true
           )
         end
-
-        def clients
-          # 'sessions' and 'clients' are synonymous but vary between versions of
-          # Mongoid: https://github.com/mongoid/mongoid/commit/657650bc4befa001c0f66e8788e9df6a1af37e84
-          key = @settings.key?('sessions') ? 'sessions' : 'clients'
-
-          @settings.fetch(key)
-        end
-
-        def hosts_and_ports
-          clients.fetch('default').fetch('hosts').map do |host_string|
-            host, _, port = host_string.partition(':')
-            [host, (port.empty? ? PORT : port)]
-          end
-        end
       end
     end
   end

data/lib/orchestration/services/mongo/healthcheck.rb

@@ -6,6 +6,8 @@ module Orchestration
       class Healthcheck
         include HealthcheckBase
 
+        dependencies 'mongoid'
+
         def initialize(env)
           @configuration = Configuration.new(env)
         end
@@ -20,14 +22,6 @@ module Orchestration
           Mongoid.load_configuration(@configuration.settings)
           !Mongoid.default_client.database_names.empty?
         end
-
-        private
-
-        def clients
-          return Mongoid.sessions if Mongoid.respond_to?(:sessions)
-
-          Mongoid.clients
-        end
       end
     end
   end

data/lib/orchestration/services/nginx_proxy/configuration.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module Services
+    module NginxProxy
+      class Configuration
+        include ConfigurationBase
+
+        self.service_name = 'nginx-proxy'
+
+        def initialize(env)
+          @env = env
+        end
+
+        def friendly_config
+          "[nginx-proxy] #{host}:#{local_port}"
+        end
+      end
+    end
+  end
+end

data/lib/orchestration/services/nginx_proxy/healthcheck.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module Services
+    module NginxProxy
+      class Healthcheck
+        include HealthcheckBase
+
+        def initialize(env)
+          @configuration = Configuration.new(env)
+        end
+
+        def connect
+          Net::HTTP.start('localhost', 3000)
+        end
+
+        def connection_errors
+          [Errno::ECONNREFUSED]
+        end
+      end
+    end
+  end
+end

data/lib/orchestration/services/nginx_proxy.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module Services
+    module NginxProxy
+    end
+  end
+end
+
+require 'orchestration/services/nginx_proxy/configuration'
+require 'orchestration/services/nginx_proxy/healthcheck'

data/lib/orchestration/services/rabbitmq/configuration.rb

@@ -4,7 +4,9 @@ module Orchestration
   module Services
     module RabbitMQ
       class Configuration
-        attr_reader :settings
+        include ConfigurationBase
+
+        self.service_name = 'rabbitmq'
 
         def initialize(env)
           @env = env
@@ -17,10 +19,7 @@ module Orchestration
         end
 
         def friendly_config
-          host = @settings.fetch('host')
-          port = @settings.fetch('port')
-
-          "[bunny] amqp://#{host}:#{port}"
+          "[bunny] amqp://#{host}:#{local_port}"
         end
 
         private

data/lib/orchestration/services/rabbitmq/healthcheck.rb

@@ -6,6 +6,8 @@ module Orchestration
       class Healthcheck
         include HealthcheckBase
 
+        dependencies 'bunny'
+
         def initialize(env)
           @configuration = Configuration.new(env)
         end
@@ -18,10 +20,9 @@ module Orchestration
         end
 
         def connect
-          host = @configuration.settings.fetch('host')
-          port = @configuration.settings.fetch('port')
+          port = @configuration.local_port
 
-          connection = Bunny.new("amqp://#{host}:#{port}", log_file: devnull)
+          connection = Bunny.new("amqp://localhost:#{port}", log_file: devnull)
           connection.start
           connection.stop
         end

data/lib/orchestration/services.rb

@@ -5,7 +5,11 @@ module Orchestration
   end
 end
 
+require 'orchestration/services/configuration_base'
+require 'orchestration/services/healthcheck_base'
+
 require 'orchestration/services/application'
 require 'orchestration/services/database'
 require 'orchestration/services/mongo'
+require 'orchestration/services/nginx_proxy'
 require 'orchestration/services/rabbitmq'

data/lib/orchestration/templates/{Dockerfile.tt → Dockerfile.erb}

@@ -1,11 +1,14 @@
 FROM ruby:<%= ruby_version %>
 ARG BUNDLE_BITBUCKET__ORG
+ARG BUNDLE_GITHUB__COM
 RUN apt-get update \
- && apt-get install -y node.js \
+ && apt-get install -y node.js gosu \
+ && rm -rf /var/lib/apt/lists/* \
  && gem install bundler \
+ && gem install unicorn \
  && mkdir /application
 WORKDIR /application
 COPY Gemfile Gemfile.lock ./
 RUN bundle install --deployment
+COPY entrypoint.sh /
 ADD .build/context.tar.gz .
-CMD ["bundle", "exec", "rails", "server", "-p", "3000", "-b", "0.0.0.0"]

data/lib/orchestration/templates/{Makefile.tt → Makefile.erb}

@@ -10,21 +10,27 @@
 # 	bundle exec rubocop
 # 	yarn run eslint app/javascript
 #
-.PHONY: docker docker-build docker-push wait-database start
+.PHONY: start stop migrate docker build push start <%= wait_commands %>
 
 ### Container management commands ###
 
+COMPOSE:=HOST_UID=$(shell id -u) docker-compose
+
 start:
-	docker-compose up -d
+	@echo "Starting containers..."
+	@${COMPOSE} up -d --scale application=$${INSTANCES:-1}
+	@make wait
 
 stop:
-	docker-compose down
+	@echo "Stopping containers..."
+	@${COMPOSE} down
+	@echo "All containers stopped."
 
 ### Database utility commands ###
 
 migrate: wait-database
 	@echo "Running migrations..."
-	@docker-compose run application bundle exec rake db:migrate
+	@${COMPOSE} run application bundle exec rake db:migrate
 	@echo "Migrations complete."
 
 ### Service healthcheck commands ###
@@ -32,30 +38,40 @@ migrate: wait-database
 wait: <%= wait_commands %>
 	@echo "All Containers ready."
 
+wait-application:
+	@bin/rake orchestration:application:wait
+
 wait-database:
-	@bin/rake orchestration:db:wait
+	@bin/rake orchestration:database:wait
 
 wait-mongo:
 	@bin/rake orchestration:mongo:wait
 
+wait-nginx-proxy:
+	@bin/rake orchestration:nginx_proxy:wait
+
 wait-rabbitmq:
 	@bin/rake orchestration:rabbitmq:wait
 
 ### Docker build commands ###
 
-docker: docker-build docker-push
+docker: build push
 
-docker-build:
-	mkdir -p ./docker/.build
-	git show master:./Gemfile > ./docker/Gemfile
-	git show master:./Gemfile.lock > ./docker/Gemfile.lock
-	git archive --format tar.gz -o docker/.build/context.tar.gz master
-	docker build --build-arg BUNDLE_GITHUB__COM \
+build:
+	@echo "Preparing build."
+	@mkdir -p ./docker/.build
+	@git show master:./Gemfile > ./docker/Gemfile
+	@git show master:./Gemfile.lock > ./docker/Gemfile.lock
+	@echo "Building..."
+	@git archive --format tar.gz -o docker/.build/context.tar.gz master
+	@docker build \
+	             --build-arg BUNDLE_GITHUB__COM \
 	             --build-arg BUNDLE_BITBUCKET__ORG \
 		     -t $(shell bin/rake orchestration:docker:username)/<%= app_id %> \
 		     -t $(shell bin/rake orchestration:docker:username)/<%= app_id %>:$(shell git rev-parse --short --verify master) \
 		     ./docker/
+	@echo "Build complete."
 
-docker-push: VERSION := $(shell git rev-parse --short --verify master)
-docker-push:
+push: VERSION := $(shell git rev-parse --short --verify master)
+push:
 	docker push $(shell bin/rake orchestration:docker:username)/<%= app_id %>:${VERSION}

data/lib/orchestration/templates/entrypoint.sh.erb

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -u
+useradd -u ${HOST_UID} -m -o owner
+mkdir -p /application/tmp/pids
+chown -R owner:owner /application/tmp /application/log /application/db
+exec gosu owner "$@"

data/lib/orchestration/templates/unicorn.rb.erb

@@ -0,0 +1,17 @@
+listen '0.0.0.0:8080', :tcp_nopush => true
+
+pid '/application/tmp/pids/unicorn.pid'
+
+preload_app ENV.fetch('UNICORN_PRELOAD_APP', '1') == '1'
+
+timeout ENV.fetch('UNICORN_TIMEOUT', 60).to_i
+
+worker_processes ENV.fetch('UNICORN_WORKER_PROCESSES', 8).to_i
+
+before_fork do |_server, _worker|
+  ActiveRecord::Base.connection.disconnect! if defined?(ActiveRecord)
+end
+
+after_fork do |_server, _worker|
+  ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+end

data/lib/orchestration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Orchestration
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/lib/orchestration.rb

@@ -12,7 +12,6 @@ require 'orchestration/docker_compose'
 require 'orchestration/environment'
 require 'orchestration/errors'
 require 'orchestration/file_helpers'
-require 'orchestration/healthcheck_base'
 require 'orchestration/install_generator'
 require 'orchestration/railtie'
 require 'orchestration/service_check'
@@ -25,4 +24,8 @@ module Orchestration
   def self.root
     Pathname.new(File.dirname(__dir__))
   end
+
+  def self.rakefile
+    root.join('lib', 'Rakefile')
+  end
 end

data/lib/tasks/orchestration.rake

@@ -8,7 +8,14 @@ namespace :orchestration do
     Orchestration::InstallGenerator.start
   end
 
-  namespace :db do
+  namespace :application do
+    desc 'Wait for application to become available'
+    task :wait do
+      Orchestration::Services::Application::Healthcheck.start
+    end
+  end
+
+  namespace :database do
     desc 'Wait for database to become available'
     task :wait do
       Orchestration::Services::Database::Healthcheck.start
@@ -22,6 +29,13 @@ namespace :orchestration do
     end
   end
 
+  namespace :nginx_proxy do
+    desc 'Wait for Nginx proxy to become available'
+    task :wait do
+      Orchestration::Services::NginxProxy::Healthcheck.start
+    end
+  end
+
   namespace :rabbitmq do
     desc 'Wait for database to become available'
     task :wait do

data/orchestration.gemspec

@@ -27,12 +27,15 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'colorize', '~> 0.8.1'
   spec.add_runtime_dependency 'erubis', '~> 2.7'
   spec.add_runtime_dependency 'i18n', '>= 0.5'
+  spec.add_runtime_dependency 'unicorn'
 
   spec.add_development_dependency 'activerecord', '~> 5.2'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'bunny', '~> 2.12'
   spec.add_development_dependency 'byebug', '~> 10.0'
   spec.add_development_dependency 'mongoid', '~> 7.0'
+  spec.add_development_dependency 'mysql2', '~> 0.5.2'
+  spec.add_development_dependency 'pg', '~> 1.1'
   spec.add_development_dependency 'rails', '~> 5.2'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: unicorn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -245,23 +287,26 @@ files:
 - bin/rubocop
 - bin/setup
 - config/locales/en.yml
+- lib/Rakefile
 - lib/orchestration.rb
 - lib/orchestration/docker_compose.rb
 - lib/orchestration/docker_compose/application_service.rb
 - lib/orchestration/docker_compose/database_service.rb
 - lib/orchestration/docker_compose/mongo_service.rb
+- lib/orchestration/docker_compose/nginx_proxy_service.rb
 - lib/orchestration/docker_compose/rabbitmq_service.rb
 - lib/orchestration/docker_compose/services.rb
 - lib/orchestration/environment.rb
 - lib/orchestration/errors.rb
 - lib/orchestration/file_helpers.rb
-- lib/orchestration/healthcheck_base.rb
 - lib/orchestration/install_generator.rb
 - lib/orchestration/railtie.rb
 - lib/orchestration/service_check.rb
 - lib/orchestration/services.rb
 - lib/orchestration/services/application.rb
 - lib/orchestration/services/application/configuration.rb
+- lib/orchestration/services/application/healthcheck.rb
+- lib/orchestration/services/configuration_base.rb
 - lib/orchestration/services/database.rb
 - lib/orchestration/services/database/adapters.rb
 - lib/orchestration/services/database/adapters/mysql2.rb
@@ -269,15 +314,21 @@ files:
 - lib/orchestration/services/database/adapters/sqlite3.rb
 - lib/orchestration/services/database/configuration.rb
 - lib/orchestration/services/database/healthcheck.rb
+- lib/orchestration/services/healthcheck_base.rb
 - lib/orchestration/services/mongo.rb
 - lib/orchestration/services/mongo/configuration.rb
 - lib/orchestration/services/mongo/healthcheck.rb
+- lib/orchestration/services/nginx_proxy.rb
+- lib/orchestration/services/nginx_proxy/configuration.rb
+- lib/orchestration/services/nginx_proxy/healthcheck.rb
 - lib/orchestration/services/rabbitmq.rb
 - lib/orchestration/services/rabbitmq/configuration.rb
 - lib/orchestration/services/rabbitmq/healthcheck.rb
 - lib/orchestration/settings.rb
-- lib/orchestration/templates/Dockerfile.tt
-- lib/orchestration/templates/Makefile.tt
+- lib/orchestration/templates/Dockerfile.erb
+- lib/orchestration/templates/Makefile.erb
+- lib/orchestration/templates/entrypoint.sh.erb
+- lib/orchestration/templates/unicorn.rb.erb
 - lib/orchestration/terminal.rb
 - lib/orchestration/version.rb
 - lib/tasks/orchestration.rake

data/lib/orchestration/healthcheck_base.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Orchestration
-  module HealthcheckBase
-    attr_reader :configuration
-
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      def start(env = nil, terminal = nil)
-        env ||= Environment.new
-        terminal ||= Terminal.new
-        check = ServiceCheck.new(new(env), terminal)
-
-        exit 1 unless check.run
-      end
-    end
-  end
-end