orchestration 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7371c8d7691770e73a17feb1c67095e5ff6d4f68
-  data.tar.gz: 6438dc68182cf8673c25137ac3b9676f69284fe7
+  metadata.gz: 776a11504e5b33803ff0375a1d168b08567b8e97
+  data.tar.gz: 52a848059b2fb338222b72cc00590f6d3760ae13
 SHA512:
-  metadata.gz: '0888c846560554ea5b5d767b764af902c60902344501b18786283d033050d96f76a6a4ecc5906da48c00e959c22a3f8d1c318a1c3ee25651538fad932285d841'
-  data.tar.gz: 313e67474a01c8a3f9014fa914af1be67df44c94ec947b5dfd5c62bf62a109cd06964117764c6193cce940d079bf06e2a579b98926d7e2dd6fc5e97ac24533a1
+  metadata.gz: a549fe23607afe2b5b0e46e28956a64f0dde1f43fcd900b6458cad298a0f05073c6aa1899908aaf8e978de940beb19414d3374471b2edfe8a4c1729ae50b97b0
+  data.tar.gz: be3f1f287527ae67f1ca236aba5d1e2acd68cf34136916943c6a284e634330b1bea89c81aabcc6b3b5936c90e882f4e33fbb4cbd18cfc80d998d2033f03ea1de

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.7'
+gem 'orchestration', '~> 0.2.8'
 ```
 
 And then build your bundle:

data/lib/orchestration/environment.rb

@@ -40,6 +40,10 @@ module Orchestration
       YAML.safe_load(File.read(docker_compose_configuration_path))
     end
 
+    def docker_compose_config?
+      docker_compose_configuration_path.file?
+    end
+
     def application_name
       Rails.application.class.parent.name.underscore
     end

data/lib/orchestration/install_generator.rb

@@ -49,11 +49,11 @@ module Orchestration
     def gitignore
       path = @env.root.join('.gitignore')
       entries = [
-        'docker/.build/context.tar.gz',
+        'docker/.build/',
         'docker/Gemfile',
         'docker/Gemfile.lock',
         'docker/*.gemspec'
-      ].map { |entry| "#{entry} # Orchestration" }
+      ]
       ensure_lines_in_file(path, entries)
     end
 

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

@@ -37,7 +37,7 @@ module Orchestration
           database = settings.fetch('database')
           username = settings.fetch('username')
           password = settings.fetch('password')
-          port = settings.fetch('port')
+          port = DockerCompose::DatabaseService::PORT
           host = Database::Configuration.service_name
 
           "#{scheme}://#{username}:#{password}@#{host}:#{port}/#{database}"

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

@@ -37,6 +37,7 @@ module Orchestration
                             'scheme' => base['adapter'],
                             'port' => DockerCompose::DatabaseService::PORT
                           )
+          @settings.merge!('port' => local_port) if @env.docker_compose_config?
         end
 
         def parse(content)

data/lib/orchestration/templates/Dockerfile.erb

@@ -2,10 +2,9 @@ FROM ruby:<%= ruby_version %>
 ARG BUNDLE_BITBUCKET__ORG
 ARG BUNDLE_GITHUB__COM
 RUN apt-get update \
- && apt-get install -y node.js gosu \
+ && apt-get install -y node.js gosu sendmail \
  && rm -rf /var/lib/apt/lists/* \
  && gem install bundler \
- && gem install unicorn \
  && mkdir /application
 WORKDIR /application
 COPY Gemfile Gemfile.lock ./

data/lib/orchestration/templates/Makefile.erb

@@ -26,6 +26,12 @@ stop:
 	@${COMPOSE} down
 	@echo "All containers stopped."
 
+start-application:
+	@echo "Starting containers..."
+	@${COMPOSE} up -d --scale application=$${INSTANCES:-1} nginx-proxy application
+	@make wait-nginx-proxy wait-application
+	@echo "Application started."
+
 ### Database utility commands ###
 
 migrate: wait-database

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2018-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize