orchestration 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9dd4904167052dde3f1cbf5f441225f2719c42467204077d943534f73bb2873
-  data.tar.gz: 873bea476a74979aa917e87449c0da23a1c63128c1257a6c0ab40414e464a2ef
+  metadata.gz: a68a281672878086f5ebc086998c3e37aba04dabaff40b6d677144e59ee6ca4a
+  data.tar.gz: f601425345ad35f9b0e5478e62901fbddf91261b3f2f36071d07e365664ec794
 SHA512:
-  metadata.gz: bf66b2842c17ed6cb43d7a02045f9c35f7a4bf6fe70e8c7d4425ddee8c72c24a810ab64175fa00430da2c38b3c9e66dde62cedc31b65a68b5b51ba65e53c87c9
-  data.tar.gz: 4e3aa0a3ba1f8b2f9b7bd58e6a553a86924cbf0805657de8b5b6c63eeefc8ee38bea13a560f093410778690c5c0d9228359e9d8a0f38bd6e600b1c42e80bd253
+  metadata.gz: f33f122d8098d2eae2157e94e6c65b2b548d752d1339ab1f83170913264e09b01b2db8e835b5fbee8c48a1cad346622ca4875d0d253f5f0d946801164288a8f2
+  data.tar.gz: a34869f47a254f369ca41d487bc13186e367f4671c22d02d503f0a1b8f86557ce26faa712c7dff9db5f44ff7ab01cadbbc579b04670366fc17b986d8f2458d5f

data/README.md

@@ -27,7 +27,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.5.7'
+gem 'orchestration', '~> 0.5.8'
 ```
 
 Install:
@@ -227,7 +227,7 @@ To connect via _SSH_ to a remote swarm and deploy, pass the `manager` parameter:
 make deploy manager=user@manager.swarm.example.com
 ```
 
-The file `orchestration/docker-compose.production.yml` is created automatically. If your `RAILS_ENV` is set to something other than `production` then another file will need to be created (e.g. `orchestration/docker-compose.staging.yml`). In most cases this file can be a _symlink_ to the original `production` configuration and environment variables can be used to customise the content.
+The file `orchestration/docker-compose.production.yml` is created automatically. This file will always be used for deployment, regardless of _Rails_ environment. Other environments should be configured using a separate [`.env` file](#env-file) for each environment.
 
 #### Roll back a deployment
 
@@ -262,6 +262,7 @@ networks:
 ```
 
 #### Use a custom `.env` file
+<a name="env-file"></a>
 
 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/templates/orchestration.mk.erb

@@ -264,7 +264,7 @@ deploy: RAILS_ENV := ${env}
 deploy: RACK_ENV := ${env}
 deploy: DOCKER_TAG = ${git_version}
 deploy: base_vars = DOCKER_ORGANIZATION=${docker_organization} DOCKER_REPOSITORY=${docker_repository} DOCKER_TAG=${git_version}
-deploy: compose_deploy := ${base_vars} COMPOSE_PROJECT_NAME=${project_base} HOST_UID=$(shell id -u) docker-compose ${env_file_option} --project-name ${project_base} -f orchestration/docker-compose.${env}.yml
+deploy: compose_deploy := ${base_vars} COMPOSE_PROJECT_NAME=${project_base} HOST_UID=$(shell id -u) docker-compose ${env_file_option} --project-name ${project_base} -f orchestration/docker-compose.production.yml
 deploy: compose_config := ${compose_deploy} config
 deploy: deploy_cmd := echo "$${config}" | ssh "${manager}" "/bin/bash -lc 'cat | docker stack deploy --prune --with-registry-auth -c - ${project_base}'"
 deploy: out_of_sequence_error := rpc error: code = Unknown desc = update out of sequence
@@ -282,7 +282,7 @@ endif
              export config="$$(${compose_config} 2>${stderr})" ; \
              config_exit_code=$$? ; \
              if [[ "$${config_exit_code}" != "0" ]]; then exit ${config_exit_code}; fi ; \
-             output="$$(${deploy_cmd} | tee /dev/tty)" ; \
+             output="$$(${deploy_cmd} | tee)" ; \
              deploy_exit_code=$$? ; \
              if [[ "$${deploy_exit_code}" == 0 ]] ; then exit 0 ; fi ; \
              if ! echo "$${output}" | grep -q '${out_of_sequence_error}' ; then exit ${deploy_exit_code} ; fi ; \

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url