orchestration 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa88aaad54c45cf3a049016f35f7fbe14a93e98c1f804253c6092d32581ad4bb
-  data.tar.gz: 5eff5d0d6e44485812f320ac938ff081fa49daf8b88c59ffa65c33450420bfeb
+  metadata.gz: 0b45aa732e39c5ac61b9805a5872f2d9674fb93ab1019f01dd5b1036b5a3e649
+  data.tar.gz: b0d4c6059142bac5e727586ae55de030dc5f75ed9a4acf128a1f260323bee2e2
 SHA512:
-  metadata.gz: e9f031ebae8eeed8122e6b3a37db600848fa2e02726162aac785b20844e1f7911a56d3d9a5cf949e585a0c4cb74b434afc3727721beabee29d707a6d25563113
-  data.tar.gz: 456825bd84a2f32ede7b4e9dc0d5720b4c15abebb35dbf244620e1f3f3f05a251ba0e7718da5c6384d1062a1553dfc61c6494f6caff9e6c42ee0fd4864922ab2
+  metadata.gz: 705db40fc17fe876fb20b4c0319ec29bb66e89e4202a2e12ea1bea386130636dc52302047e2ce985f972c42e398ab0d09afd13ef0d0be1521d62a58fd2933925
+  data.tar.gz: f28843374e586e7d8fd299e588aa2b95602993faca0207c59a7e9f121658711db8c2c24bec2b58d72fa405b7141e90dd578bbf97b3722e096138ca047c3aeea9

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.12'
+gem 'orchestration', '~> 0.3.13'
 ```
 
 Install:

data/lib/orchestration/docker_compose/install_generator.rb

@@ -22,6 +22,10 @@ module Orchestration
         create_compose_file(:development)
       end
 
+      def docker_compose_local_yml
+        create_compose_file(:local)
+      end
+
       def docker_compose_production_yml
         create_compose_file(:production)
       end
@@ -80,7 +84,7 @@ module Orchestration
           %i[database mongo rabbitmq]
         when :production
           %i[haproxy app database mongo rabbitmq]
-        when nil
+        when :local, nil
           []
         else
           raise ArgumentError, environment.inspect

data/lib/orchestration/install_generator.rb

@@ -56,7 +56,7 @@ module Orchestration
 
     def gitignore
       path = @env.root.join('.gitignore')
-      globs = %w[.build/ .deploy/ Gemfile Gemfile.lock]
+      globs = %w[.build/ .deploy/ Gemfile Gemfile.lock docker-compose.local.yml]
       entries = %w[.env deploy.tar] + globs.map do |entry|
         "#{@env.orchestration_dir_name}/#{entry}"
       end
@@ -86,6 +86,7 @@ module Orchestration
       @docker_compose.docker_compose_yml
       @docker_compose.docker_compose_test_yml
       @docker_compose.docker_compose_development_yml
+      @docker_compose.docker_compose_local_yml
       @docker_compose.docker_compose_production_yml
       @docker_compose.docker_compose_override_yml
     end

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

@@ -34,6 +34,11 @@ module Orchestration
           @settings = merged_settings
           return if @adapter.name == 'sqlite3'
           return unless %w[test development].include?(@env.environment)
+
+          merge_port
+        end
+
+        def merge_port
           return if environment.key?('port') || url_config['port']
 
           @settings.merge!('port' => local_port) if @env.docker_compose_config?

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

@@ -58,10 +58,10 @@ pull:
 	@${compose} pull
 
 .PHONY: logs
-service := app
+logs: service := app
 logs:
 ifndef manager
-        @$(error Missing `manager` parameter: `make logs manager=swarm-manager.example.com`)
+	@$(error Missing `manager` parameter: `make logs manager=swarm-manager.example.com`)
 else
 	ssh ${manager} "docker service logs -f ${project_name}_${service}"
 endif

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

@@ -29,21 +29,24 @@ compose_base:=env HOST_UID=$(shell id -u) \
               DOCKER_REPOSITORY=${docker_repository} \
               docker-compose \
               -p ${docker_repository}_${env} \
-              -f <%= env.orchestration_dir_name %>/docker-compose.yml
+              -f <%= env.orchestration_dir_name %>/docker-compose.yml \
 
 git_branch:=$(if $(branch),$(branch),$(shell git rev-parse --abbrev-ref HEAD))
 git_version:=$(shell git rev-parse --short --verify ${git_branch})
 
 compose:=${compose_base} -f <%= env.orchestration_dir_name %>/docker-compose.${env}.yml -f <%= env.orchestration_dir_name %>/docker-compose.override.yml
 
+ifneq (,$(wildcard <%= env.orchestration_dir_name %>/docker-compose.local.yml))
+  compose:=${compose} -f <%= env.orchestration_dir_name %>/docker-compose.local.yml
+endif
+
 ### Container management commands ###
 
 .PHONY: start
 start:
 	@echo "Starting containers..."
 ifeq (${env},$(filter ${env},test development))
-	@${compose} up -d
-	@docker network connect ${docker_repository}_${env}_default $${hostname} 2>/dev/null || :
+	@(docker ps --format "{{.ID}}" | grep -q $(shell hostname) && ${compose} up -d && docker network connect ${docker_repository}_${env}_default $(shell hostname)) || ${compose} up -d
 else
 	@${compose} up -d --scale app=$${instances:-1}
 endif
@@ -90,6 +93,33 @@ bundle:
 	@tar -C <%= env.orchestration_dir_name %>/.deploy -cf ./deploy.tar ./${docker_repository}
 	@echo 'Deployment bundle written to ./deploy.tar'
 
+.PHONY: deploy
+deploy:
+ifndef manager
+	@$(error Missing `manager` parameter: `make deploy manager=swarm-manager.example.com`)
+else
+	@echo 'Deploying stack via ${manager}...'
+endif
+
+ifndef env_file
+	$(MAKE) bundle \
+     && workdir=$$(mktemp -d) \
+     && mv deploy.tar $${workdir}/ \
+     && cd $${workdir} \
+     && tar xf deploy.tar \
+     && cd ${docker_repository} \
+     && tar -cf - . | ssh ${manager} 'cd $$(mktemp -d) && chmod 0700 . && cat - | tar -x && make deploy-stack && rm -r $$(pwd)'
+else
+	$(MAKE) bundle \
+     && workdir=$$(mktemp -d) \
+     && mv deploy.tar $${workdir}/ \
+     && cd $${workdir} \
+     && tar xf deploy.tar \
+     && cd ${docker_repository} \
+     && cp "${env_file}" ./.env \
+     && tar -cf - . | ssh ${manager} 'cd $$(mktemp -d) && chmod 0700 . && cat - | tar -x && make deploy-stack && rm -r $$(pwd)'
+endif
+
 ### Database utility commands ###
 
 .PHONY: migrate

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize