orchestration 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 776a11504e5b33803ff0375a1d168b08567b8e97
-  data.tar.gz: 52a848059b2fb338222b72cc00590f6d3760ae13
+  metadata.gz: 13a569a8391d7110efc2606ba1d486e29e342080
+  data.tar.gz: c5eed32f638f89dce179cd93c8f634504fe628d2
 SHA512:
-  metadata.gz: a549fe23607afe2b5b0e46e28956a64f0dde1f43fcd900b6458cad298a0f05073c6aa1899908aaf8e978de940beb19414d3374471b2edfe8a4c1729ae50b97b0
-  data.tar.gz: be3f1f287527ae67f1ca236aba5d1e2acd68cf34136916943c6a284e634330b1bea89c81aabcc6b3b5936c90e882f4e33fbb4cbd18cfc80d998d2033f03ea1de
+  metadata.gz: 91481f33e8f48bfabe18ab3c36fab7381060c631a62da15f3806197f7ec3ef08815a93790d132cf8431606eb6d110792f86c26fe3b7783a2e347a61f6e05a0cc
+  data.tar.gz: 32f5222a028460e9d5bb5b4477dae935a83692d7f50dae1e62d0b24b19fb3fb4db5c38453f2a1f9a787502868bb45d0a0284d9a99d331507c7cef9278ef7f7ac

data/.gitignore

@@ -19,8 +19,7 @@ spec/dummy/log/*
 !spec/dummy/log/.keep
 spec/dummy/.gitignore
 spec/dummy/Makefile
-spec/dummy/docker/*
-spec/dummy/docker-compose.yml
+spec/dummy/orchestration/*
 spec/dummy/config/unicorn.rb
 
 orchestration-*.gem

data/.strong_versions.yml

@@ -0,0 +1,2 @@
+ignore:
+  - i18n

data/Makefile

@@ -3,3 +3,4 @@
 test:
 	./bin/rspec
 	./bin/rubocop
+	./bin/strong_versions

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.8'
+gem 'orchestration', '~> 0.3.0'
 ```
 
 And then build your bundle:
@@ -32,11 +32,14 @@ $ bundle install
 
 A _Rake_ task is provided to generate the following files:
 
-* `Makefile` - provides easy access to all _Orchestration_ utilities.
 * `.gitignore` - ensures any unwanted files created by _Orchestration_ do not clutter your project's version control system.
-* `docker/Dockerfile` - a ready-to-use _Docker_ build script which should need minimal (if any) modification to build your _Rails_ project.
-* `docker-compose.yml` - a custom-made set of services to allow you to run your application's dependencies locally.
 * `.orchestration.yml` - _Orchestration_ internal configuration, e.g. _Docker_ username.
+* `Makefile` - Adds `orchestration/Makefile` as an `include` to avoid clobbering any existing _make_ commands.
+* `orchestration/docker-compose.yml` - a custom-made set of services to allow you to run your application's dependencies locally.
+* `orchestration/Dockerfile` - a ready-to-use _Docker_ build script which should need minimal (if any) modification to build your _Rails_ project.
+* `orchestration/entrypoint.sh` - Container setup for your Docker application.
+* `orchestration/Makefile` - provides easy access to all _Orchestration_ utilities.
+* `orchestration/yaml.bash` - A _bash_ _YAML_ parser (used by _make_ utilities).
 
 ### Building and pushing your project as a _Docker_ image
 
@@ -47,7 +50,7 @@ If your project has any dependencies on private  _Git_ repositories then you wil
 * [GitHub](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/)
 * [Bitbucket](https://confluence.atlassian.com/bitbucket/app-passwords-828781300.html)
 
-Create a file named `.env` in the same directory as your `docker-compose.yml` and add one or both of the following (note that _Bitbucket_ and _GitHub_ use a different format):
+Create a file named `.env` in your project's root directory and add one or both of the following (note that _Bitbucket_ and _GitHub_ use a different format):
 
 ```bash
 BUNDLE_BITBUCKET__ORG=<bitbucket-username>:<app-password>

data/TODO

@@ -1,15 +1,19 @@
-Be aware of yarn and include build steps in Dockerfile if present. Use dashboard
-front end as a reference.
-
 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
+
+Stop supporting development mode. Provide a docker-compose.yml for loading
+development and test dependencies and expect user to run Rails application
+locally.
+
+Build a docker-compose.production.yml for running application in
+production (i.e. including application as a service and removing local port
+bindings).
+
+Make docker-compose file additive - detect existing services and add new ones
+rather than overwriting.

data/bin/strong_versions

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'strong_versions' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("strong_versions", "strong_versions")

data/config/locales/en.yml

@@ -1,6 +1,7 @@
 en:
   orchestration:
     attempt_limit: "Unable to reconnect after %{limit} attempts. Aborting."
+    default: "default"
 
     application:
       waiting: "Waiting for application: %{config}"
@@ -27,8 +28,15 @@ en:
       waiting: "Waiting for [%{service}]: %{config}"
       ready: "[%{service}] is ready."
 
-    docker:
-      username_request: "Enter your Docker registry username (used for tagging images)"
+    settings:
+      docker:
+        username:
+          description: "Docker registry username"
+          prompt: "username"
+
+        repository:
+          description: "Project name (will be used as Docker registry repository)"
+          prompt: "project name"
 
     rake:
       docker:

data/lib/orchestration/docker_compose/application_service.rb

@@ -9,22 +9,17 @@ module Orchestration
 
       def definition
         {
-          'image' => image,
-          'entrypoint' => '/entrypoint.sh',
-          'command' => %w[
-            bundle exec unicorn -c /application/config/unicorn.rb
-          ],
+          'image' => '${DOCKER_USERNAME}/${DOCKER_REPOSITORY}',
           'environment' => environment,
-          'expose' => [8080]
+          'expose' => [8080],
+          'volumes' => [
+            "#{@config.env.public_volume}:/app/public/:ro"
+          ]
         }
       end
 
       private
 
-      def image
-        "#{@config.docker_username}/#{@config.application_name}"
-      end
-
       def environment
         {
           'DATABASE_URL' => @config.database_url,

data/lib/orchestration/docker_compose/nginx_proxy_service.rb

@@ -9,9 +9,12 @@ module Orchestration
 
       def definition
         {
-          'image' => 'jwilder/nginx-proxy',
+          'image' => 'rubyorchestration/nginx-proxy',
           'ports' => %w[3000:80],
-          'volumes' => ['/var/run/docker.sock:/tmp/docker.sock:ro']
+          'volumes' => [
+            '/var/run/docker.sock:/tmp/docker.sock:ro',
+            "#{@config.env.public_volume}:/var/www/public/:ro"
+          ]
         }
       end
     end

data/lib/orchestration/docker_compose/services.rb

@@ -3,7 +3,8 @@
 module Orchestration
   module DockerCompose
     class Services
-      def initialize(options = {})
+      def initialize(env, options = {})
+        @env = env
         @configurations = {
           'application' => options.fetch(:application, nil),
           'database' => options.fetch(:database, nil),
@@ -14,7 +15,13 @@ module Orchestration
       end
 
       def structure
-        { 'version' => '3.7', 'services' => services }
+        {
+          'version' => '3.7',
+          'services' => services,
+          'volumes' => {
+            @env.public_volume => nil
+          }
+        }
       end
 
       def services

data/lib/orchestration/environment.rb

@@ -33,7 +33,7 @@ module Orchestration
     end
 
     def docker_compose_configuration_path
-      root.join('docker-compose.yml')
+      orchestration_root.join('docker-compose.yml')
     end
 
     def docker_compose_config
@@ -44,10 +44,14 @@ module Orchestration
       docker_compose_configuration_path.file?
     end
 
-    def application_name
+    def default_application_name
       Rails.application.class.parent.name.underscore
     end
 
+    def application_name
+      settings.get('docker.repository')
+    end
+
     def settings
       Settings.new(orchestration_configuration_path)
     end
@@ -57,5 +61,17 @@ module Orchestration
 
       Pathname.new(Dir.pwd)
     end
+
+    def orchestration_root
+      root.join(orchestration_dir_name)
+    end
+
+    def orchestration_dir_name
+      'orchestration'
+    end
+
+    def public_volume
+      "#{application_name}_public"
+    end
   end
 end

data/lib/orchestration/file_helpers.rb

@@ -4,45 +4,56 @@ module Orchestration
   module FileHelpers
     private
 
+    def orchestration_dir
+      path = @env.orchestration_root
+      FileUtils.mkdir(path) unless Dir.exist?(path)
+
+      path
+    end
+
     def template(template_name, context = {})
       Erubis::Eruby.new(read_template(template_name))
                    .result(context)
     end
 
-    def delete_and_inject_after(path, pattern, replacement)
-      return write_file(path, pattern + replacement) unless File.exist?(path)
-
-      input = File.read(path)
-      index = append_index(pattern, input)
-      output = input[0...index] + pattern + replacement
-
-      return @terminal.write(:identical, relative_path(path)) if input == output
-
-      update_file(path, output)
-    end
-
-    def append_index(pattern, input)
-      return 0 if input.empty?
+    def inject_if_missing(path, content, index = 0)
+      lines = File.exist?(path) ? File.readlines(path).map(&:chomp) : []
+      if lines.any? { |line| line == content }
+        return @terminal.write(:skip, relative_path(path))
+      end
 
-      index = input.index(pattern)
-      index.nil? ? (input.size + 1) : index
+      lines.insert(index, content)
+      update_file(path, lines.join("\n"))
     end
 
     def relative_path(path)
       path.relative_path_from(Rails.root).to_s
     end
 
+    def simple_copy(template_name, dest)
+      update_file(dest, template(template_name))
+    end
+
     def write_file(path, content, options = {})
       relpath = relative_path(path)
       overwrite = options.fetch(:overwrite, true)
-      return @terminal.write(:skip, relpath) if File.exist?(path) && !overwrite
+      present = File.exist?(path)
+      return @terminal.write(:skip, relpath) if present && !overwrite
 
       File.write(path, content)
       @terminal.write(:create, relative_path(path))
     end
 
     def update_file(path, content)
+      present = File.exist?(path)
+      return write_file(path, content) unless present
+
+      previous_content = File.read(path) if present
       File.write(path, content)
+      if present && previous_content == content
+        return @terminal.write(:skip, relative_path(path))
+      end
+
       @terminal.write(:update, relative_path(path))
     end
 

data/lib/orchestration/install_generator.rb

@@ -11,63 +11,61 @@ module Orchestration
       super
       @env = Environment.new
       @terminal ||= Terminal.new
+      @settings = Settings.new(@env.orchestration_configuration_path)
     end
 
     def orchestration_configuration
       path = @env.orchestration_configuration_path
-      settings = Settings.new(path)
-      docker_username(settings)
+      ask_setting('docker.username')
+      ask_setting('docker.repository', @env.default_application_name)
       relpath = relative_path(path)
-      return @terminal.write(:create, relpath) unless settings.exist?
-      return @terminal.write(:update, relpath) if settings.dirty?
+      return @terminal.write(:create, relpath) unless @settings.exist?
+      return @terminal.write(:update, relpath) if @settings.dirty?
 
       @terminal.write(:skip, relpath)
     end
 
     def makefile
-      environment = {
-        app_id: @env.application_name,
-        wait_commands: wait_commands
-      }
+      environment = { env: @env, wait_commands: wait_commands }
       content = template('Makefile', environment)
-      path = @env.root.join('Makefile')
-      delete_and_inject_after(path, "\n#!!orchestration\n", content)
+      path = @env.orchestration_root.join('Makefile')
+      path.exist? ? update_file(path, content) : write_file(path, content)
+      inject_if_missing(
+        @env.root.join('Makefile'),
+        'include orchestration/Makefile'
+      )
     end
 
     def dockerfile
       content = template('Dockerfile', ruby_version: RUBY_VERSION)
-      write_file(docker_dir.join('Dockerfile'), content, overwrite: false)
+      write_file(
+        orchestration_dir.join('Dockerfile'),
+        content,
+        overwrite: false
+      )
     end
 
     def entrypoint
       content = template('entrypoint.sh')
-      path = docker_dir.join('entrypoint.sh')
+      path = orchestration_dir.join('entrypoint.sh')
       write_file(path, content, overwrite: false)
       FileUtils.chmod('a+x', path)
     end
 
     def gitignore
       path = @env.root.join('.gitignore')
-      entries = [
-        'docker/.build/',
-        'docker/Gemfile',
-        'docker/Gemfile.lock',
-        'docker/*.gemspec'
-      ]
+      entries = %w[.build/ Gemfile Gemfile.lock *.gemspec].map do |entry|
+        "#{@env.orchestration_dir_name}/#{entry}"
+      end
+
       ensure_lines_in_file(path, entries)
     end
 
     def docker_compose
-      path = @env.root.join('docker-compose.yml')
+      path = @env.orchestration_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),
-        nginx_proxy: configuration(:nginx_proxy)
-      )
+      docker_compose = DockerCompose::Services.new(@env, service_configurations)
       write_file(path, docker_compose.structure.to_yaml)
     end
 
@@ -77,8 +75,24 @@ module Orchestration
       write_file(path, content, overwrite: false)
     end
 
+    def yaml_bash
+      simple_copy('yaml.bash', @env.orchestration_root.join('yaml.bash'))
+    end
+
     private
 
+    def t(key)
+      I18n.t("orchestration.#{key}")
+    end
+
+    def service_configurations
+      Hash[
+        %i[application database mongo rabbitmq nginx_proxy].map do |key|
+          [key, configuration(key)]
+        end
+      ]
+    end
+
     def configuration(service)
       {
         application: Services::Application::Configuration,
@@ -99,18 +113,12 @@ module Orchestration
       ].compact.join(' ')
     end
 
-    def docker_username(settings)
-      return unless settings.get('docker.username').nil?
-
-      @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)
+    def ask_setting(setting, default = nil)
+      return unless @settings.get(setting).nil?
 
-      path
+      @terminal.write(:setup, t("settings.#{setting}.description"))
+      prompt = t("settings.#{setting}.prompt")
+      @settings.set(setting, @terminal.read(prompt, default))
     end
   end
 end

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

@@ -18,7 +18,7 @@ module Orchestration
         end
 
         def application_name
-          @env.application_name
+          @env.settings.get('docker.repository')
         end
 
         def friendly_config

data/lib/orchestration/services/configuration_base.rb

@@ -3,7 +3,7 @@
 module Orchestration
   module Services
     module ConfigurationBase
-      attr_reader :settings, :service_name
+      attr_reader :settings, :service_name, :env
 
       def self.included(base)
         base.extend(ClassMethods)

data/lib/orchestration/templates/Dockerfile.erb

@@ -5,9 +5,20 @@ RUN apt-get update \
  && apt-get install -y node.js gosu sendmail \
  && rm -rf /var/lib/apt/lists/* \
  && gem install bundler \
- && mkdir /application
-WORKDIR /application
-COPY Gemfile Gemfile.lock ./
-RUN bundle install --deployment
+ && mkdir /app<%if defined?(Webpacker) %> \
+ && curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash \
+ && . /root/.bashrc \
+ && nvm install 10.11.0 \
+ && npm install -g yarn<% end %>
+WORKDIR /app
+COPY .build/Gemfile .build/Gemfile.lock ./
+RUN bundle install --without development test --deployment
+<% if defined?(Webpacker) %>
+COPY .build/package.json .build/yarn.lock ./
+RUN . /root/.bashrc && yarn install
+<% end %>
 COPY entrypoint.sh /
 ADD .build/context.tar.gz .
+<% if defined?(Webpacker) %>RUN . /root/.bashrc && yarn install && bundle exec rake assets:precompile<% else %>RUN bundle exec rake assets:precompile<% end %>
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["bundle", "exec", "unicorn", "-c", "/app/config/unicorn.rb"]

data/lib/orchestration/templates/Makefile.erb

@@ -1,20 +1,10 @@
-
-# Do not edit this file below this point. Any changes will be overwritten.
-#
-# Example `test` command which will start and wait for all services before
-# running tests:
-#
-# test: start wait
-# 	bundle exec rspec
-# 	yarn test app/javascript
-# 	bundle exec rubocop
-# 	yarn run eslint app/javascript
-#
-.PHONY: start stop migrate docker build push start <%= wait_commands %>
+.PHONY: start stop migrate docker build push start logs compose config <%= wait_commands %>
 
 ### Container management commands ###
 
-COMPOSE:=HOST_UID=$(shell id -u) docker-compose
+DOCKER_USERNAME:=$(shell bash ./<%= env.orchestration_dir_name %>/yaml.bash docker_username)
+DOCKER_REPOSITORY:=$(shell bash ./<%= env.orchestration_dir_name %>/yaml.bash docker_repository)
+COMPOSE:=HOST_UID=$(shell id -u) DOCKER_USERNAME=${DOCKER_USERNAME} DOCKER_REPOSITORY=${DOCKER_REPOSITORY} docker-compose -p $(shell bash ./<%= env.orchestration_dir_name %>/yaml.bash docker_repository) -f orchestration/docker-compose.yml
 
 start:
 	@echo "Starting containers..."
@@ -32,6 +22,15 @@ start-application:
 	@make wait-nginx-proxy wait-application
 	@echo "Application started."
 
+logs:
+	@${COMPOSE} logs
+
+config:
+	@${COMPOSE} config
+
+compose:
+	@${COMPOSE} $$cmd
+
 ### Database utility commands ###
 
 migrate: wait-database
@@ -67,19 +66,21 @@ GIT_BRANCH:=$(if $(BRANCH),$(BRANCH),$(shell git rev-parse --abbrev-ref HEAD))
 
 build:
 	@echo "Preparing build from ${GIT_BRANCH}"
-	@mkdir -p ./docker/.build
-	@git show ${GIT_BRANCH}:./Gemfile > ./docker/Gemfile
-	@git show ${GIT_BRANCH}:./Gemfile.lock > ./docker/Gemfile.lock
+	@mkdir -p ./<%= env.orchestration_dir_name %>/.build
+	@git show ${GIT_BRANCH}:./Gemfile > ./<%= env.orchestration_dir_name %>/.build/Gemfile
+	@git show ${GIT_BRANCH}:./Gemfile.lock > ./<%= env.orchestration_dir_name %>/.build/Gemfile.lock
+	<% if defined?(Webpacker) %>@git show ${GIT_BRANCH}:./package.json > ./<%= env.orchestration_dir_name %>/.build/package.json<% end %>
+	<% if defined?(Webpacker) %>@git show ${GIT_BRANCH}:./yarn.lock > ./<%= env.orchestration_dir_name %>/.build/yarn.lock<% end %>
 	@echo "Building..."
-	@git archive --format tar.gz -o docker/.build/context.tar.gz ${GIT_BRANCH}
+	@git archive --format tar.gz -o ./<%= env.orchestration_dir_name %>/.build/context.tar.gz ${GIT_BRANCH}
 	@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 ${GIT_BRANCH}) \
-		     ./docker/
+		     -t ${DOCKER_USERNAME}/${DOCKER_REPOSITORY} \
+		     -t ${DOCKER_USERNAME}/${DOCKER_REPOSITORY}:$(shell git rev-parse --short --verify ${GIT_BRANCH}) \
+		     ./<%= env.orchestration_dir_name %>/
 	@echo "Build complete."
 
 push: VERSION := $(shell git rev-parse --short --verify ${GIT_BRANCH})
 push:
-	docker push $(shell bin/rake orchestration:docker:username)/<%= app_id %>:${VERSION}
+	docker push ${DOCKER_USERNAME}/${DOCKER_REPOSITORY}:${VERSION}

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

@@ -1,7 +1,9 @@
 #!/bin/sh
 set -u
 id owner >/dev/null 2>&1 || useradd -u ${HOST_UID} -m -o owner
-mkdir -p /application/tmp/pids
-chown -R owner:owner /application/tmp /application/log /application/db
-rm -f /application/tmp/pids/unicorn.pid
+mkdir -p /app/tmp/pids
+chown -R owner:owner /app/tmp /app/log /app/db
+rm -f /app/tmp/pids/unicorn.pid
+mkdir -p /var/www/public/
+ln -nfs /app/public/* /var/www/public/
 exec gosu owner "$@"

data/lib/orchestration/templates/nginx.tmpl.erb

@@ -0,0 +1,364 @@
+{{ $CurrentContainer := where $ "ID" .Docker.CurrentContainerID | first }}
+
+{{ define "upstream" }}
+	{{ if .Address }}
+		{{/* If we got the containers from swarm and this container's port is published to host, use host IP:PORT */}}
+		{{ if and .Container.Node.ID .Address.HostPort }}
+			# {{ .Container.Node.Name }}/{{ .Container.Name }}
+			server {{ .Container.Node.Address.IP }}:{{ .Address.HostPort }};
+		{{/* If there is no swarm node or the port is not published on host, use container's IP:PORT */}}
+		{{ else if .Network }}
+			# {{ .Container.Name }}
+			server {{ .Network.IP }}:{{ .Address.Port }};
+		{{ end }}
+	{{ else if .Network }}
+		# {{ .Container.Name }}
+		{{ if .Network.IP }}
+			server {{ .Network.IP }} down;
+		{{ else }}
+			server 127.0.0.1 down;
+		{{ end }}
+	{{ end }}
+	
+{{ end }}
+
+# If we receive X-Forwarded-Proto, pass it through; otherwise, pass along the
+# scheme used to connect to this server
+map $http_x_forwarded_proto $proxy_x_forwarded_proto {
+  default $http_x_forwarded_proto;
+  ''      $scheme;
+}
+
+# If we receive X-Forwarded-Port, pass it through; otherwise, pass along the
+# server port the client connected to
+map $http_x_forwarded_port $proxy_x_forwarded_port {
+  default $http_x_forwarded_port;
+  ''      $server_port;
+}
+
+# If we receive Upgrade, set Connection to "upgrade"; otherwise, delete any
+# Connection header that may have been passed to this server
+map $http_upgrade $proxy_connection {
+  default upgrade;
+  '' close;
+}
+
+# Apply fix for very long server names
+server_names_hash_bucket_size 128;
+
+# Default dhparam
+{{ if (exists "/etc/nginx/dhparam/dhparam.pem") }}
+ssl_dhparam /etc/nginx/dhparam/dhparam.pem;
+{{ end }}
+
+# Set appropriate X-Forwarded-Ssl header
+map $scheme $proxy_x_forwarded_ssl {
+  default off;
+  https on;
+}
+
+gzip_types text/plain text/css application/javascript application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+log_format vhost '$host $remote_addr - $remote_user [$time_local] '
+                 '"$request" $status $body_bytes_sent '
+                 '"$http_referer" "$http_user_agent"';
+
+access_log off;
+
+{{ if $.Env.RESOLVERS }}
+resolver {{ $.Env.RESOLVERS }};
+{{ end }}
+
+{{ if (exists "/etc/nginx/proxy.conf") }}
+include /etc/nginx/proxy.conf;
+{{ else }}
+# HTTP 1.1 support
+proxy_http_version 1.1;
+proxy_buffering off;
+proxy_set_header Host $http_host;
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Connection $proxy_connection;
+proxy_set_header X-Real-IP $remote_addr;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
+proxy_set_header X-Forwarded-Ssl $proxy_x_forwarded_ssl;
+proxy_set_header X-Forwarded-Port $proxy_x_forwarded_port;
+
+# Mitigate httpoxy attack (see README for details)
+proxy_set_header Proxy "";
+{{ end }}
+
+{{ $enable_ipv6 := eq (or ($.Env.ENABLE_IPV6) "") "true" }}
+server {
+	server_name _; # This is just an invalid value which will never trigger on a real hostname.
+	listen 80;
+	{{ if $enable_ipv6 }}
+	listen [::]:80;
+	{{ end }}
+	access_log /var/log/nginx/access.log vhost;
+	return 503;
+}
+
+{{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }}
+server {
+	server_name _; # This is just an invalid value which will never trigger on a real hostname.
+	listen 443 ssl http2;
+	{{ if $enable_ipv6 }}
+	listen [::]:443 ssl http2;
+	{{ end }}
+	access_log /var/log/nginx/access.log vhost;
+	return 503;
+
+	ssl_session_tickets off;
+	ssl_certificate /etc/nginx/certs/default.crt;
+	ssl_certificate_key /etc/nginx/certs/default.key;
+}
+{{ end }}
+
+{{ range $host, $containers := groupByMulti $ "Env.VIRTUAL_HOST" "," }}
+
+{{ $host := trim $host }}
+{{ $is_regexp := hasPrefix "~" $host }}
+{{ $upstream_name := when $is_regexp (sha1 $host) $host }}
+
+# {{ $host }}
+upstream {{ $upstream_name }} {
+
+{{ range $container := $containers }}
+	{{ $addrLen := len $container.Addresses }}
+
+	{{ range $knownNetwork := $CurrentContainer.Networks }}
+		{{ range $containerNetwork := $container.Networks }}
+			{{ if (and (ne $containerNetwork.Name "ingress") (or (eq $knownNetwork.Name $containerNetwork.Name) (eq $knownNetwork.Name "host"))) }}
+				## Can be connected with "{{ $containerNetwork.Name }}" network
+
+				{{/* If only 1 port exposed, use that */}}
+				{{ if eq $addrLen 1 }}
+					{{ $address := index $container.Addresses 0 }}
+					{{ template "upstream" (dict "Container" $container "Address" $address "Network" $containerNetwork) }}
+				{{/* If more than one port exposed, use the one matching VIRTUAL_PORT env var, falling back to standard web port 80 */}}
+				{{ else }}
+					{{ $port := coalesce $container.Env.VIRTUAL_PORT "80" }}
+					{{ $address := where $container.Addresses "Port" $port | first }}
+					{{ template "upstream" (dict "Container" $container "Address" $address "Network" $containerNetwork) }}
+				{{ end }}
+			{{ else }}
+				# Cannot connect to network of this container
+				server 127.0.0.1 down;
+			{{ end }}
+		{{ end }}
+	{{ end }}
+{{ end }}
+}
+
+{{ $default_host := or ($.Env.DEFAULT_HOST) "" }}
+{{ $default_server := index (dict $host "" $default_host "default_server") $host }}
+
+{{/* Get the VIRTUAL_PROTO defined by containers w/ the same vhost, falling back to "http" */}}
+{{ $proto := trim (or (first (groupByKeys $containers "Env.VIRTUAL_PROTO")) "http") }}
+
+{{/* Get the NETWORK_ACCESS defined by containers w/ the same vhost, falling back to "external" */}}
+{{ $network_tag := or (first (groupByKeys $containers "Env.NETWORK_ACCESS")) "external" }}
+
+{{/* Get the HTTPS_METHOD defined by containers w/ the same vhost, falling back to "redirect" */}}
+{{ $https_method := or (first (groupByKeys $containers "Env.HTTPS_METHOD")) "redirect" }}
+
+{{/* Get the SSL_POLICY defined by containers w/ the same vhost, falling back to "Mozilla-Intermediate" */}}
+{{ $ssl_policy := or (first (groupByKeys $containers "Env.SSL_POLICY")) "Mozilla-Intermediate" }}
+
+{{/* Get the HSTS defined by containers w/ the same vhost, falling back to "max-age=31536000" */}}
+{{ $hsts := or (first (groupByKeys $containers "Env.HSTS")) "max-age=31536000" }}
+
+{{/* Get the VIRTUAL_ROOT By containers w/ use fastcgi root */}}
+{{ $vhost_root := or (first (groupByKeys $containers "Env.VIRTUAL_ROOT")) "/var/www/public" }}
+
+
+{{/* Get the first cert name defined by containers w/ the same vhost */}}
+{{ $certName := (first (groupByKeys $containers "Env.CERT_NAME")) }}
+
+{{/* Get the best matching cert  by name for the vhost. */}}
+{{ $vhostCert := (closest (dir "/etc/nginx/certs") (printf "%s.crt" $host))}}
+
+{{/* vhostCert is actually a filename so remove any suffixes since they are added later */}}
+{{ $vhostCert := trimSuffix ".crt" $vhostCert }}
+{{ $vhostCert := trimSuffix ".key" $vhostCert }}
+
+{{/* Use the cert specified on the container or fallback to the best vhost match */}}
+{{ $cert := (coalesce $certName $vhostCert) }}
+
+{{ $is_https := (and (ne $https_method "nohttps") (ne $cert "") (exists (printf "/etc/nginx/certs/%s.crt" $cert)) (exists (printf "/etc/nginx/certs/%s.key" $cert))) }}
+
+{{ if $is_https }}
+
+{{ if eq $https_method "redirect" }}
+server {
+	server_name {{ $host }};
+	listen 80 {{ $default_server }};
+	{{ if $enable_ipv6 }}
+	listen [::]:80 {{ $default_server }};
+	{{ end }}
+	access_log /var/log/nginx/access.log vhost;
+	return 301 https://$host$request_uri;
+}
+{{ end }}
+
+server {
+	server_name {{ $host }};
+	listen 443 ssl http2 {{ $default_server }};
+	{{ if $enable_ipv6 }}
+	listen [::]:443 ssl http2 {{ $default_server }};
+	{{ end }}
+	access_log /var/log/nginx/access.log vhost;
+
+	{{ if eq $network_tag "internal" }}
+	# Only allow traffic from internal clients
+	include /etc/nginx/network_internal.conf;
+	{{ end }}
+
+	{{ if eq $ssl_policy "Mozilla-Modern" }}
+	ssl_protocols TLSv1.2 TLSv1.3;
+	ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256';
+	{{ else if eq $ssl_policy "Mozilla-Intermediate" }}
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+	ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:!DSS';
+	{{ else if eq $ssl_policy "Mozilla-Old" }}
+	ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+	ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:DES-CBC3-SHA:HIGH:SEED:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!RSAPSK:!aDH:!aECDH:!EDH-DSS-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA:!SRP';
+	{{ else if eq $ssl_policy "AWS-TLS-1-2-2017-01" }}
+	ssl_protocols TLSv1.2 TLSv1.3;
+	ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:AES128-GCM-SHA256:AES128-SHA256:AES256-GCM-SHA384:AES256-SHA256';
+	{{ else if eq $ssl_policy "AWS-TLS-1-1-2017-01" }}
+	ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
+	ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA';
+	{{ else if eq $ssl_policy "AWS-2016-08" }}
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+	ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA';
+	{{ else if eq $ssl_policy "AWS-2015-05" }}
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+	ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:DES-CBC3-SHA';
+	{{ else if eq $ssl_policy "AWS-2015-03" }}
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+	ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:DHE-DSS-AES128-SHA:DES-CBC3-SHA';
+	{{ else if eq $ssl_policy "AWS-2015-02" }}
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+	ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:DHE-DSS-AES128-SHA';
+	{{ end }}
+
+	ssl_prefer_server_ciphers on;
+	ssl_session_timeout 5m;
+	ssl_session_cache shared:SSL:50m;
+	ssl_session_tickets off;
+
+	ssl_certificate /etc/nginx/certs/{{ (printf "%s.crt" $cert) }};
+	ssl_certificate_key /etc/nginx/certs/{{ (printf "%s.key" $cert) }};
+
+	{{ if (exists (printf "/etc/nginx/certs/%s.dhparam.pem" $cert)) }}
+	ssl_dhparam {{ printf "/etc/nginx/certs/%s.dhparam.pem" $cert }};
+	{{ end }}
+
+	{{ if (exists (printf "/etc/nginx/certs/%s.chain.pem" $cert)) }}
+	ssl_stapling on;
+	ssl_stapling_verify on;
+	ssl_trusted_certificate {{ printf "/etc/nginx/certs/%s.chain.pem" $cert }};
+	{{ end }}
+
+	{{ if (and (ne $https_method "noredirect") (ne $hsts "off")) }}
+	add_header Strict-Transport-Security "{{ trim $hsts }}" always;
+	{{ end }}
+
+	{{ if (exists (printf "/etc/nginx/vhost.d/%s" $host)) }}
+	include {{ printf "/etc/nginx/vhost.d/%s" $host }};
+	{{ else if (exists "/etc/nginx/vhost.d/default") }}
+	include /etc/nginx/vhost.d/default;
+	{{ end }}
+
+        root /var/www/public;
+        try_files $uri @application;
+
+	location @application {
+		{{ if eq $proto "uwsgi" }}
+		include uwsgi_params;
+		uwsgi_pass {{ trim $proto }}://{{ trim $upstream_name }};
+		{{ else if eq $proto "fastcgi" }}
+		root   {{ trim $vhost_root }};
+		include fastcgi.conf;
+		fastcgi_pass {{ trim $upstream_name }};
+		{{ else }}
+		proxy_pass {{ trim $proto }}://{{ trim $upstream_name }};
+		{{ end }}
+
+		{{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }}
+		auth_basic	"Restricted {{ $host }}";
+		auth_basic_user_file	{{ (printf "/etc/nginx/htpasswd/%s" $host) }};
+		{{ end }}
+		{{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }}
+		include {{ printf "/etc/nginx/vhost.d/%s_location" $host}};
+		{{ else if (exists "/etc/nginx/vhost.d/default_location") }}
+		include /etc/nginx/vhost.d/default_location;
+		{{ end }}
+	}
+}
+
+{{ end }}
+
+{{ if or (not $is_https) (eq $https_method "noredirect") }}
+
+server {
+	server_name {{ $host }};
+	listen 80 {{ $default_server }};
+	{{ if $enable_ipv6 }}
+	listen [::]:80 {{ $default_server }};
+	{{ end }}
+	access_log /var/log/nginx/access.log vhost;
+
+	{{ if eq $network_tag "internal" }}
+	# Only allow traffic from internal clients
+	include /etc/nginx/network_internal.conf;
+	{{ end }}
+
+	{{ if (exists (printf "/etc/nginx/vhost.d/%s" $host)) }}
+	include {{ printf "/etc/nginx/vhost.d/%s" $host }};
+	{{ else if (exists "/etc/nginx/vhost.d/default") }}
+	include /etc/nginx/vhost.d/default;
+	{{ end }}
+
+        root /var/www/public;
+        try_files $uri @application;
+
+	location @application {
+		{{ if eq $proto "uwsgi" }}
+		include uwsgi_params;
+		uwsgi_pass {{ trim $proto }}://{{ trim $upstream_name }};
+		{{ else if eq $proto "fastcgi" }}
+		root   {{ trim $vhost_root }};
+		include fastcgi.conf;
+		fastcgi_pass {{ trim $upstream_name }};
+		{{ else }}
+		proxy_pass {{ trim $proto }}://{{ trim $upstream_name }};
+		{{ end }}
+
+		{{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }}
+		include {{ printf "/etc/nginx/vhost.d/%s_location" $host}};
+		{{ else if (exists "/etc/nginx/vhost.d/default_location") }}
+		include /etc/nginx/vhost.d/default_location;
+		{{ end }}
+	}
+}
+
+{{ if (and (not $is_https) (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }}
+server {
+	server_name {{ $host }};
+	listen 443 ssl http2 {{ $default_server }};
+	{{ if $enable_ipv6 }}
+	listen [::]:443 ssl http2 {{ $default_server }};
+	{{ end }}
+	access_log /var/log/nginx/access.log vhost;
+	return 500;
+
+	ssl_certificate /etc/nginx/certs/default.crt;
+	ssl_certificate_key /etc/nginx/certs/default.key;
+}
+{{ end }}
+
+{{ end }}
+{{ end }}

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

@@ -1,6 +1,6 @@
 listen '0.0.0.0:8080', :tcp_nopush => true
 
-pid '/application/tmp/pids/unicorn.pid'
+pid '/app/tmp/pids/unicorn.pid'
 
 preload_app ENV.fetch('UNICORN_PRELOAD_APP', '1') == '1'
 

data/lib/orchestration/templates/yaml.bash.erb

@@ -0,0 +1,22 @@
+# https://stackoverflow.com/a/21189044 - thanks.
+function parse_yaml {
+   local prefix=$2
+   local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034')
+   sed -ne "s|^\($s\):|\1|" \
+        -e "s|^\($s\)\($w\)$s:$s[\"']\(.*\)[\"']$s\$|\1$fs\2$fs\3|p" \
+        -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p"  $1 |
+   awk -F$fs '{
+      indent = length($1)/2;
+      vname[indent] = $2;
+      for (i in vname) {if (i > indent) {delete vname[i]}}
+      if (length($3) > 0) {
+         vn=""; for (i=0; i<indent; i++) {vn=(vn)(vname[i])("_")}
+         printf("%s%s%s=\"%s\"\n", "'$prefix'",vn, $2, $3);
+      }
+   }'
+}
+
+eval $(parse_yaml ./.orchestration.yml)
+
+set -u
+echo -n "$(eval echo \$$1)"

data/lib/orchestration/terminal.rb

@@ -8,7 +8,6 @@ module Orchestration
     ready: :green,
     create: :green,
     update: :yellow,
-    identical: :blue,
     status: :blue,
     setup: :blue,
     input: :red,
@@ -21,13 +20,22 @@ module Orchestration
       STDOUT.print colorize(desc, output, color_name)
     end
 
-    def read(message)
-      write(:input, message + ' ', nil, false)
-      STDIN.gets.chomp
+    def read(message, default = nil)
+      write(:input, prompt(message, default), nil, false)
+      result = STDIN.gets.chomp.strip
+      return default if result.empty?
+
+      result
     end
 
     private
 
+    def prompt(message, default)
+      return "(#{message}): " if default.nil?
+
+      "(#{message}) [#{I18n.t('orchestration.default')}: #{default}]: "
+    end
+
     def colorize(desc, message, color_name)
       color = if color_name.nil?
                 COLOR_MAP.fetch(desc)

data/lib/orchestration/version.rb

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

data/orchestration.gemspec

@@ -42,5 +42,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-its', '~> 1.2'
   spec.add_development_dependency 'rubocop', '~> 0.59.2'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
+  spec.add_development_dependency 'strong_versions', '~> 0.3.1'
   spec.add_development_dependency 'webmock', '~> 3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-16 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -248,6 +248,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: strong_versions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -270,12 +284,14 @@ executables:
 - rspec
 - rubocop
 - setup
+- strong_versions
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".strong_versions.yml"
 - ".travis.yml"
 - Gemfile
 - Makefile
@@ -286,6 +302,7 @@ files:
 - bin/rspec
 - bin/rubocop
 - bin/setup
+- bin/strong_versions
 - config/locales/en.yml
 - lib/Rakefile
 - lib/orchestration.rb
@@ -331,7 +348,9 @@ files:
 - lib/orchestration/templates/Dockerfile.erb
 - lib/orchestration/templates/Makefile.erb
 - lib/orchestration/templates/entrypoint.sh.erb
+- lib/orchestration/templates/nginx.tmpl.erb
 - lib/orchestration/templates/unicorn.rb.erb
+- lib/orchestration/templates/yaml.bash.erb
 - lib/orchestration/terminal.rb
 - lib/orchestration/version.rb
 - lib/tasks/orchestration.rake