orchestration 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cb5ae60827d78174136105aa5d569442403e0c66fbd91b52dc1fa960d54b901
-  data.tar.gz: ebc464ac7f85474af8cd888571583f863d2a0ffe6629190e8a6d412e6abc20dd
+  metadata.gz: 73e3bd1a53561ff23639b91df25206eeba692032b889923c5f2c1bed31fdff79
+  data.tar.gz: e78fd68cbf8882b150a6299ef8c1beab516ed4e60e95fd25d28d08d45ca699a6
 SHA512:
-  metadata.gz: 20653aa7ed7ee911d562cab05df0184525655af43a156082840a2052ed687575cd46c8a34fc975721fb97eaea0899c4b7e9d0244e6af67531905f91f6fdef569
-  data.tar.gz: 9aa560232ac183ba7368c23109e17d382f6483c1f125fbf155f3f8a58eddf25f1cf626ac85581ca1dbe0b8e0dfb3110774b3ca549890a816c7e90e0c17423617
+  metadata.gz: c11c6c27f1cd7db3777115706eb83ff31a44a1a26074bfd0f91d95d4c0403dd4f474c0adfe390d3c4f9c6a1d55e273d0c7603e7eeed9697dbacac89e517593ce
+  data.tar.gz: d1a156ad2f061fa02dbd08665a47acc9de28f95002d470bd7a44379483516b87564aecaea35f1add0439a339a1907c6f230ed5a9d0dabb3ff38a6415c2315b93

data/README.md

@@ -29,7 +29,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.4.3'
+gem 'orchestration', '~> 0.4.4'
 ```
 
 Install:
@@ -178,14 +178,32 @@ Note that _Orchestration_ will wait for all services to become fully available (
 
 ### Deployment to Docker Swarm
 
-To deploy your application to _Docker Swarm_:
+To deploy your application to a local _Docker Swarm_ use:
+```
+make deploy
+```
+
+#### Deploy to a remote swarm
+
+To connect via _SSH_ to a remote swarm and deploy, pass the `manager` parameter:
 ```
 make deploy manager=user@manager.swarm.example.com
 ```
 
-To use a custom `.env` file:
+#### Use a custom stack name
+
+The [_Docker_ stack](https://docs.docker.com/engine/reference/commandline/stack/) name defaults to the name of your repository (as defined in `.orchesration.yml`) and the _Rails_ environment, e.g. `anvil_production`.
+
+To override this default, pass the `project_name` parameter:
+```
+make deploy project_name=acme_anvil_production
+```
+
+#### 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)):
 ```
-make deploy env_file=/path/to/.env manager=user@manager.swarm.example.com
+make deploy env_file=/path/to/.env
 ```
 
 Note that the following two variables _must_ be set in the relevant `.env` file (will look in the current working directory if no path provided):

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

@@ -204,11 +204,12 @@ endif
 ifndef manager
 	@$(call println_error,'Missing `manager` parameter: `make deploy manager=swarm-manager.example.com`')
 endif
-deploy: env := production
+ifeq (,${project_name})
 deploy: project_name = ${docker_repository}_${env}
+endif
 deploy: path := $(shell mktemp -d)
-deploy: RAILS_ENV = ${env}
-deploy: RACK_ENV = ${env}
+deploy: RAILS_ENV := ${env}
+deploy: RACK_ENV := ${env}
 deploy: DOCKER_TAG = ${git_version}
 deploy:
 	@$(call println,'${yellow}Deploying stack via${reset} ${green}${manager}${reset} ...') && \

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url