orchestration 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd921565b9b20b945732f3acca684e796a34b34e1ea4d114ae32f08be13a9154
-  data.tar.gz: 35215ab0b5e79a4cd0010013c32edfac740040cdf3d781c1e68c9320c5ff5773
+  metadata.gz: a45477bd5cd5d3aaf948247ed294c24509c59b55c3244d2bdb34d7adb50bf7d8
+  data.tar.gz: cc1be97aec363dabbe212d4bc5160651ec78b2f46ed3fe5461950c8392522adc
 SHA512:
-  metadata.gz: 8e18cd088528a72508ddf360cedcb1ccb2a8a2ead7988c63b023bb5540c036eda8012d096cc4495d9c902a6e6e032ef076ebe94117c9fb600679c96b21af39ea
-  data.tar.gz: 6ef64fcd29bf6e962b311008bf9473196fda122bca958e2a8863740248074b65c8b6934b8518d72da8b2d55855f3d7df8c6bc7229130727d6e28e021c84ffe04
+  metadata.gz: e151308a54ac3048249820773ee5c2657fd1e6f1cfa2d8429ccfae1782bb77bc6413dcdd55a010004fc6b869eae9e057f89b52101eb9af5e9c236d34c08ccb49
+  data.tar.gz: 472e8a63dbd0277c2bc6a5e6cfc5c24ab69b27a132109f08f097288c8958c6ad0f7c1565c60db5b6075f4ee7dc1eaa49b1c7d46908995cb7b7e4c55cccb4c2ca

data/README.md

@@ -11,7 +11,7 @@ _Orchestration_ is a toolkit for testing, building, and deploying _Ruby_ (includ
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.3.16'
+gem 'orchestration', '~> 0.3.17'
 ```
 
 Install:

data/config/locales/en.yml

@@ -33,11 +33,11 @@ en:
     settings:
       docker:
         organization:
-          description: "Docker registry organization/username"
+          description: "Registry organization/username"
           prompt: "organization"
 
         repository:
-          description: "Project name (will be used as Docker registry repository)"
+          description: "Project name/Docker repository name"
           prompt: "project name"
 
     rake:

data/lib/orchestration/docker_compose/app_service.rb

@@ -10,7 +10,7 @@ module Orchestration
 
       def definition
         {
-          'image' => '${DOCKER_ORGANIZATION}/${DOCKER_REPOSITORY}',
+          'image' => image,
           'environment' => environment,
           'ports' => ports
         }
@@ -18,6 +18,10 @@ module Orchestration
 
       private
 
+      def image
+        '${DOCKER_ORGANIZATION}/${DOCKER_REPOSITORY}'
+      end
+
       def environment
         {
           'RAILS_LOG_TO_STDOUT' => '1',

data/lib/orchestration/templates/env.erb

@@ -1,5 +1,2 @@
 # Your application will be available on this port when deployed to the Swarm:
 LISTEN_PORT=3000
-
-# Comma-separated list of hostnames your application will be available on:
-VIRTUAL_HOST=localhost

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

@@ -135,7 +135,10 @@ migrate:
 .PHONY: migrate-container
 migrate-container:
 	@echo "[app] Running migrations..."
-	@${compose} run --rm app make migrate env=${env}
+ifdef env_file
+	@cp ${env_file} ./.env
+endif
+	${compose} run --rm app bundle exec rake db:migrate
 	@echo "[app] Migrations complete."
 
 ### Service healthcheck commands ###
@@ -169,6 +172,10 @@ ifeq (${env},$(filter ${env},test development))
 	@${rake} orchestration:rabbitmq:wait
 endif
 
+.PHONY: wait-app
+wait-app:
+	@# no-op
+
 ### Docker build commands ###
 
 .PHONY: build

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize