orchestration 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04b4a99bc763cd0a467762c2299d15ba5ce96f16e2f6a49b0f084457b64ae79f
-  data.tar.gz: 5f1ddcbef2c012e7b6f2016e54c05e111df88b91e6983635991880b7f9b18cbd
+  metadata.gz: b0e5ee806929f885562e72f8d9b646a2c4b349ea9d43efc8d40185de8fc1bd21
+  data.tar.gz: 22d24ea9b0ac4bf3ee4764c74f52bd4721dbb7b96b12de94fd8509998cb6df78
 SHA512:
-  metadata.gz: 50f67324c925ff8339fe43efe4d81ffa091a4e15c5cab207c1abf55ce8546f32cea14644ac04f4852d3a8ee3cb1606d21d4e8fb8ac4c4d3ff61a2bf98a1c48e4
-  data.tar.gz: af6f8845919db0b4d8f6c0ad980879357bd2946e8c34fcbeef479fd2b4e92dc1e25a238af98961ea68cc9325f0d2958ee1fae4b695488a0ed32f19ac436d7913
+  metadata.gz: f2c0b88548df5da741069990629bfa2d02c6439cdf2c68cc7e9addc8f0d6dbe4074d0ec107f10f7ac235f440c4a422cb6c68eb7d57829c41263cd3ca556edc32
+  data.tar.gz: 63a5b30a5674aef12c730c67cc19e04b64470ae1724516f3bcb9e9fc39bfcc70291c8af1389d1930b4e8dd0fceb844656191d2ee324d50b6ed3aeb0b0f3c1390

data/README.md

@@ -35,7 +35,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.4.5'
+gem 'orchestration', '~> 0.4.6'
 ```
 
 Install:
@@ -184,6 +184,14 @@ Note that _Orchestration_ will wait for all services to become fully available (
 
 _(See [sidecar containers](#sidecar-containers) if you are running your test/development server inside _Docker_)_.
 
+### (Local) Production
+
+Run a production environment locally to simulate your deployment platform:
+
+```
+make start env=production
+```
+
 ### Deployment to Docker Swarm
 
 To deploy your application to a local _Docker Swarm_ use:
@@ -207,6 +215,14 @@ To override this default, pass the `project_name` parameter:
 make deploy project_name=acme_anvil_production
 ```
 
+This variable will also be available as `COMPOSE_PROJECT_NAME` for use within your `docker-compose.yml`. e.g. to explicitly name a network after the project name:
+
+```yaml
+networks:
+  myapp:
+    name: "${COMPOSE_PROJECT_NAME}"
+```
+
 #### Use a custom `.env` file
 
 Specify a path to a local `.env` file (see [Docker Compose documentation](https://docs.docker.com/compose/environment-variables/#the-env-file)):

data/lib/orchestration/service_check.rb

@@ -16,6 +16,8 @@ module Orchestration
     end
 
     def run
+      return echo_missing unless @service.configuration.configured?
+
       echo_start
       success = attempt_connection
       echo_ready if success
@@ -37,6 +39,14 @@ module Orchestration
       false
     end
 
+    def echo_missing
+      @terminal.write(
+        @service_name.to_sym,
+        "#{@service.configuration.error} (skipping)",
+        :error
+      )
+    end
+
     def echo_start
       @terminal.write(@service_name.to_sym, '', :status)
     end

data/lib/orchestration/services/mixins/configuration_base.rb

@@ -3,7 +3,7 @@
 module Orchestration
   module Services
     module ConfigurationBase
-      attr_reader :service_name, :env
+      attr_reader :service_name, :env, :error
 
       def self.included(base)
         base.extend(ClassMethods)
@@ -33,6 +33,14 @@ module Orchestration
         @service_name
       end
 
+      def configured?
+        port
+        true
+      rescue KeyError => error
+        @error = error
+        false
+      end
+
       def port
         return @env.app_port if @service_name == 'app'
 

data/lib/orchestration/templates/Dockerfile.erb

@@ -3,7 +3,10 @@ ARG BUNDLE_BITBUCKET__ORG
 ARG BUNDLE_GITHUB__COM
 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
  && apt-get update \
- && apt-get install -y nodejs gosu sendmail \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+      nodejs \
+      gosu \
+      sendmail \
  && rm -rf /var/lib/apt/lists/* \
  && gem install bundler \
  && mkdir /app<%if defined?(Webpacker) %> \

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

@@ -1,7 +1,6 @@
 #!/bin/sh
-set -ue
-echo "Host user ID: ${HOST_UID}"
-set +u
+HOST_UID=${HOST_UID:-$(id -u)}
+set -e
 id owner >/dev/null 2>&1 || useradd -u ${HOST_UID} -m -o owner
 mkdir -p /app/tmp/pids
 chown -Rf owner:owner /app/tmp /app/log /app/db

data/lib/orchestration/templates/mongoid.yml.erb

@@ -1,16 +1,12 @@
 development:
   clients:
     default:
-      hosts:
-        - 127.0.0.1:<%= compose.call('development').local_port('mongo') %>
-      database: development_db
+      uri: <%= "#{'<' + '%' + '='} ENV.fetch('MONGO_URL', 'mongodb://127.0.0.1:#{compose.call('development').local_port('mongo')}/development_db') #{'%' + '>'}" %>
 
 test:
   clients:
     default:
-      hosts:
-        - 127.0.0.1:<%= compose.call('test').local_port('mongo') %>
-      database: test_db
+      uri: <%= "#{'<' + '%' + '='} ENV.fetch('MONGO_URL', 'mongodb://127.0.0.1:#{compose.call('test').local_port('mongo')}/test_db') #{'%' + '>'}" %>
 
 production:
   clients:

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

@@ -39,11 +39,15 @@ endif
 docker_organization=$(shell bash ${orchestration_dir}/yaml.bash docker_organization)
 docker_repository=$(shell bash ${orchestration_dir}/yaml.bash docker_repository)
 
+ifeq (,$(project_name))
+  project_name = ${docker_repository}_${env}
+endif
+
 compose_base=env HOST_UID=$(shell id -u) \
              DOCKER_ORGANIZATION="${docker_organization}" \
              DOCKER_REPOSITORY="${docker_repository}" \
+             COMPOSE_PROJECT_NAME="${project_name}" \
              docker-compose \
-             -p "${docker_repository}_${env}" \
              -f "${orchestration_dir}/docker-compose.yml"
 
 git_branch ?= $(if $(branch),$(branch),$(shell git rev-parse --abbrev-ref HEAD))
@@ -68,7 +72,7 @@ endif
 start: _clean-logs
 	@$(call print,'${yellow}Starting containers${reset} ...')
 ifeq (${env},$(filter ${env},test development))
-	@${compose} up -d --force-recreate ${services} ${log} || ${fail}
+	@${compose} up --detach --force-recreate --renew-anon-volumes ${services} ${log} || ${fail}
 	@[ -n '${sidecar}' ] && \
          ( \
            docker network connect '${network}' '$(shell hostname)' ${log} \
@@ -77,7 +81,7 @@ ifeq (${env},$(filter ${env},test development))
          ) \
          || ( [ -z '${sidecar}' ] || ${fail} )
 else
-	@${compose} up -d --scale app=$${instances:-1} ${services} ${log} || ${fail}
+	@${compose} up --detach --scale app=$${instances:-1} ${services} ${log} || ${fail}
 endif
 	@$(call printrawln,' ${green}started${reset} ${tick}')
 	@$(call println,'${yellow}Waiting for services to become available${reset} ...')
@@ -207,9 +211,6 @@ endif
 ifndef manager
 	@$(call println_error,'Missing `manager` parameter: `make deploy manager=swarm-manager.example.com`')
 endif
-ifeq (,${project_name})
-deploy: project_name = ${docker_repository}_${env}
-endif
 deploy: path := $(shell mktemp -d)
 deploy: RAILS_ENV := ${env}
 deploy: RACK_ENV := ${env}

data/lib/orchestration/templates/rabbitmq.yml.erb

@@ -1,11 +1,11 @@
 <% if compose.call('development').services.key?('rabbitmq') %>
 development:
-  url: amqp://127.0.0.1:<%= compose.call('development').local_port('rabbitmq') %>
+  url: <%= "#{'<' + '%' + '='} ENV.fetch('RABBITMQ_URL', 'amqp://127.0.0.1:#{compose.call('development').local_port('rabbitmq')}') #{'%' + '>'}" %>
 <% end %>
 
 <% if compose.call('test').services.key?('rabbitmq') %>
 test:
-  url: amqp://127.0.0.1:<%= compose.call('test').local_port('rabbitmq') %>
+  url: <%= "#{'<' + '%' + '='} ENV.fetch('RABBITMQ_URL', 'amqp://127.0.0.1:#{compose.call('test').local_port('rabbitmq')}') #{'%' + '>'}" %>
 <% end %>
 
 production:

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-22 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url