orchestration 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89c669c1e10aec69b7b61b51e683badb050ee64352f67e0a1be7f44efcdd16f4
-  data.tar.gz: bd6525302ab21aaceec8a07bdb1381e5599b401e120e128880c6ce8476ddeb33
+  metadata.gz: ff7499be14d897dc5d5385c55f9879e3e0f4a5d8e26ff2b1900da4bdf89ac8d1
+  data.tar.gz: '00181ce547be977794bd8fc168adda7e846402bb8a0d0ee26495efc9f731c892'
 SHA512:
-  metadata.gz: 151fd08a7f0f01b5612123a083537e8d410b17fffd0c8ab74640fd91338f6a6a054aeaa6838889c4dbe0b16a3d7e64ad2aa136f45f1bf7e5d94c94f9e95f3a16
-  data.tar.gz: f31f18aff4138549dd0bd46546ec4b02e168298cc60b99f95b00d1a86193a6ae17c90a361630e2faa1bcbf0bc96d3d71e2ce4a58c86e679eed9f16353cea8374
+  metadata.gz: 6d903f4a1ebadb2f58d4ad227257596895213f9a837b35a6eed340ca73a4d731c1e0a3a5665592b070acbec11b2b56bfb342dcec22a4ee59f3cb117391a010b3
+  data.tar.gz: 4bf720ae1e9fa003dabe45590b6a7099778327e0c4a62a16e7873407b14a6a822e77a04b127374573592729a833b75fbf73ceb82e9e367854444ff192aae3639

data/README.md

@@ -11,7 +11,7 @@ _Orchestration_ is a toolkit for testing, building, and deploying _Ruby_ (includ
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.3.14'
+gem 'orchestration', '~> 0.3.15'
 ```
 
 Install:

data/lib/orchestration/docker_compose.rb

@@ -11,5 +11,4 @@ require 'orchestration/docker_compose/configuration'
 require 'orchestration/docker_compose/app_service'
 require 'orchestration/docker_compose/database_service'
 require 'orchestration/docker_compose/mongo_service'
-require 'orchestration/docker_compose/haproxy_service'
 require 'orchestration/docker_compose/rabbitmq_service'

data/lib/orchestration/docker_compose/app_service.rb

@@ -11,7 +11,8 @@ module Orchestration
       def definition
         {
           'image' => '${DOCKER_ORGANIZATION}/${DOCKER_REPOSITORY}',
-          'environment' => environment
+          'environment' => environment,
+          'ports' => ports
         }
       end
 
@@ -23,8 +24,7 @@ module Orchestration
           'RAILS_SERVE_STATIC_FILES' => '1',
           'UNICORN_PRELOAD_APP' => '1',
           'UNICORN_TIMEOUT' => '60',
-          'UNICORN_WORKER_PROCESSES' => '8',
-          'SERVICE_PORTS' => '8080'
+          'UNICORN_WORKER_PROCESSES' => '8'
         }.merge(inherited_environment)
       end
 
@@ -33,10 +33,13 @@ module Orchestration
           'DATABASE_URL' => nil,
           'HOST_UID' => nil,
           'RAILS_ENV' => nil,
-          'SECRET_KEY_BASE' => nil,
-          'VIRTUAL_HOST' => nil
+          'SECRET_KEY_BASE' => nil
         }
       end
+
+      def ports
+        ['${LISTEN_PORT}:8080']
+      end
     end
   end
 end

data/lib/orchestration/docker_compose/configuration.rb

@@ -28,8 +28,7 @@ module Orchestration
           app: AppService,
           database: DatabaseService,
           mongo: MongoService,
-          rabbitmq: RabbitMQService,
-          haproxy: HAProxyService
+          rabbitmq: RabbitMQService
         }
       end
 

data/lib/orchestration/docker_compose/install_generator.rb

@@ -83,7 +83,7 @@ module Orchestration
         when :test, :development
           %i[database mongo rabbitmq]
         when :production
-          %i[haproxy app database mongo rabbitmq]
+          %i[app database mongo rabbitmq]
         when :local, nil
           []
         else
@@ -102,8 +102,7 @@ module Orchestration
           app: Orchestration::Services::App::Configuration,
           database: Orchestration::Services::Database::Configuration,
           mongo: Orchestration::Services::Mongo::Configuration,
-          rabbitmq: Orchestration::Services::RabbitMQ::Configuration,
-          haproxy: Orchestration::Services::HAProxy::Configuration
+          rabbitmq: Orchestration::Services::RabbitMQ::Configuration
         }.fetch(service).new(@env)
       end
 

data/lib/orchestration/services.rb

@@ -12,5 +12,4 @@ require 'orchestration/services/app'
 require 'orchestration/services/database'
 require 'orchestration/services/listener'
 require 'orchestration/services/mongo'
-require 'orchestration/services/haproxy'
 require 'orchestration/services/rabbitmq'

data/lib/orchestration/services/configuration_base.rb

@@ -32,13 +32,11 @@ module Orchestration
       end
 
       def local_port
-        key = @service_name == 'app' ? 'haproxy' : @service_name
-
-        return ENV.fetch('LISTEN_PORT', '3000').to_i if key == 'haproxy'
+        return ENV.fetch('LISTEN_PORT', '3000').to_i if @service_name == 'app'
 
         @env.docker_compose_config
             .fetch('services')
-            .fetch(key)
+            .fetch(@service_name)
             .fetch('ports')
             .first
             .partition(':')

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

@@ -53,16 +53,22 @@ module Orchestration
         def url_config
           return nil unless ENV.key?('MONGO_URL')
 
-          host, _, port = ENV['MONGO_URL'].partition(':')
-          { host: host, port: port.empty? ? '27017' : port }
+          host, _, port = ENV['MONGO_URL'].rpartition('/').first.partition(':')
+          _, _, database = ENV['MONGO_URL'].rpartition('/')
+          { host: host, port: port.empty? ? '27017' : port, database: database }
         end
 
         def database
+          return url_config[:database] unless url_config.nil?
+
           env_config = config.fetch(@env.environment)
           return env_config.fetch('database') if env_config.key?('database')
 
           bad_config_error if clients_key.nil?
+          merged_config(env_config)
+        end
 
+        def merged_config(env_config)
           env_config
             .fetch(clients_key)
             .fetch('default')

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

@@ -14,12 +14,17 @@ module Orchestration
           return unless defined?(RabbitMQ)
           return unless File.exist?(@env.rabbitmq_configuration_path)
 
+          if ENV.key?('RABBITMQ_URL')
+            @settings = from_url
+            return
+          end
+
           @settings = config.fetch(@env.environment)
           @settings.merge!('port' => PORT) unless @settings.key?('port')
         end
 
         def friendly_config
-          "[bunny] amqp://#{host}:#{local_port}"
+          "[bunny] amqp://#{host}:#{port}"
         end
 
         private
@@ -27,6 +32,19 @@ module Orchestration
         def config
           yaml(File.read(@env.rabbitmq_configuration_path))
         end
+
+        def host
+          @settings.fetch('host')
+        end
+
+        def port
+          @settings.fetch('port')
+        end
+
+        def from_url
+          uri = URI.parse(ENV.fetch('RABBITMQ_URL'))
+          { 'host' => uri.host, 'port' => uri.port || 5672 }
+        end
       end
     end
   end

data/lib/orchestration/templates/deploy.mk.erb

@@ -8,10 +8,6 @@ else ifneq (,$(RACK_ENV))
 endif
 
 verify-environment:
-ifndef VIRTUAL_HOST
-  @$(error `VIRTUAL_HOST` must be defined in environment)
-endif
-
 ifndef LISTEN_PORT
   @$(error `LISTEN_PORT` must be defined in environment)
 endif

data/lib/orchestration/templates/orchestration.mk.erb

@@ -46,6 +46,9 @@ endif
 start:
 	@echo "Starting containers..."
 ifeq (${env},$(filter ${env},test development))
+	@# If our hostname is also known to Docker as a container ID then join
+	@# the same network as our dependencies. This allows us to run side-car
+	@# dependencies if we are running in a container (e.g. in Jenkins).
 	@(docker ps --format "{{.ID}}" | grep -q $(shell hostname) && ${compose} up -d && docker network connect ${docker_repository}_${env}_default $(shell hostname)) || ${compose} up -d
 else
 	@${compose} up -d --scale app=$${instances:-1}
@@ -55,6 +58,7 @@ endif
 .PHONY: stop
 stop:
 	@echo "Stopping containers..."
+	@(docker ps --format "{{.ID}}" | grep -q $(shell hostname) && docker network disconnect ${docker_repository}_${env}_default $(shell hostname))
 	@${compose} down
 	@echo "All containers stopped."
 
@@ -165,20 +169,6 @@ ifeq (${env},$(filter ${env},test development))
 	@${rake} orchestration:rabbitmq:wait
 endif
 
-## Production wait commands
-
-.PHONY: wait-haproxy
-wait-haproxy:
-ifneq (${env},$(filter ${env},test development))
-	@${rake} orchestration:haproxy:wait LISTEN_PORT=${LISTEN_PORT}
-endif
-
-.PHONY: wait-app
-wait-app:
-ifneq (${env},$(filter ${env},test development))
-	@${rake} orchestration:app:wait LISTEN_PORT=${LISTEN_PORT}
-endif
-
 ### Docker build commands ###
 
 .PHONY: build

data/lib/orchestration/version.rb

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

data/lib/tasks/orchestration.rake

@@ -29,13 +29,6 @@ namespace :orchestration do
     end
   end
 
-  namespace :haproxy do
-    desc I18n.t('orchestration.rake.haproxy.wait')
-    task :wait do
-      Orchestration::Services::HAProxy::Healthcheck.start
-    end
-  end
-
   namespace :rabbitmq do
     desc I18n.t('orchestration.rake.rabbitmq.wait')
     task :wait do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -337,7 +337,6 @@ files:
 - lib/orchestration/docker_compose/app_service.rb
 - lib/orchestration/docker_compose/configuration.rb
 - lib/orchestration/docker_compose/database_service.rb
-- lib/orchestration/docker_compose/haproxy_service.rb
 - lib/orchestration/docker_compose/install_generator.rb
 - lib/orchestration/docker_compose/mongo_service.rb
 - lib/orchestration/docker_compose/rabbitmq_service.rb
@@ -359,9 +358,6 @@ files:
 - lib/orchestration/services/database/adapters/sqlite3.rb
 - lib/orchestration/services/database/configuration.rb
 - lib/orchestration/services/database/healthcheck.rb
-- lib/orchestration/services/haproxy.rb
-- lib/orchestration/services/haproxy/configuration.rb
-- lib/orchestration/services/haproxy/healthcheck.rb
 - lib/orchestration/services/healthcheck_base.rb
 - lib/orchestration/services/listener.rb
 - lib/orchestration/services/listener/configuration.rb

data/lib/orchestration/docker_compose/haproxy_service.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Orchestration
-  module DockerCompose
-    class HAProxyService
-      def initialize(config, environment)
-        @environment = environment
-        @config = config
-      end
-
-      def definition
-        {
-          'deploy' => {
-            'placement' => { 'constraints' => ['node.role == manager'] }
-          },
-          'image' => 'dockercloud/haproxy',
-          'ports' => %w[${LISTEN_PORT}:80],
-          'volumes' => [
-            '/var/run/docker.sock:/var/run/docker.sock:ro'
-          ]
-        }
-      end
-    end
-  end
-end

data/lib/orchestration/services/haproxy.rb

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

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

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Orchestration
-  module Services
-    module HAProxy
-      class Configuration
-        include ConfigurationBase
-
-        self.service_name = 'haproxy'
-
-        def initialize(env, service_name = nil)
-          super
-          @settings = {}
-        end
-
-        def friendly_config
-          "[haproxy] #{host}:#{local_port}"
-        end
-      end
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Orchestration
-  module Services
-    module HAProxy
-      class Healthcheck
-        include HealthcheckBase
-
-        def connect
-          Net::HTTP.start('localhost', @configuration.local_port)
-        end
-
-        def connection_errors
-          [Errno::ECONNREFUSED]
-        end
-      end
-    end
-  end
-end