orchestration 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73e3bd1a53561ff23639b91df25206eeba692032b889923c5f2c1bed31fdff79
-  data.tar.gz: e78fd68cbf8882b150a6299ef8c1beab516ed4e60e95fd25d28d08d45ca699a6
+  metadata.gz: 04b4a99bc763cd0a467762c2299d15ba5ce96f16e2f6a49b0f084457b64ae79f
+  data.tar.gz: 5f1ddcbef2c012e7b6f2016e54c05e111df88b91e6983635991880b7f9b18cbd
 SHA512:
-  metadata.gz: c11c6c27f1cd7db3777115706eb83ff31a44a1a26074bfd0f91d95d4c0403dd4f474c0adfe390d3c4f9c6a1d55e273d0c7603e7eeed9697dbacac89e517593ce
-  data.tar.gz: d1a156ad2f061fa02dbd08665a47acc9de28f95002d470bd7a44379483516b87564aecaea35f1add0439a339a1907c6f230ed5a9d0dabb3ff38a6415c2315b93
+  metadata.gz: 50f67324c925ff8339fe43efe4d81ffa091a4e15c5cab207c1abf55ce8546f32cea14644ac04f4852d3a8ee3cb1606d21d4e8fb8ac4c4d3ff61a2bf98a1c48e4
+  data.tar.gz: af6f8845919db0b4d8f6c0ad980879357bd2946e8c34fcbeef479fd2b4e92dc1e25a238af98961ea68cc9325f0d2958ee1fae4b695488a0ed32f19ac436d7913

data/README.md

@@ -1,5 +1,11 @@
 # Orchestration
 
+```
+I've got two tickets to the game
+It'd be great if I could take you to it this Sunday
+                                       --Nickelback
+```
+
 ## Overview
 
 _Orchestration_ aims to provide a convenient and consistent process for working with _Rails_ and _Docker_ without obscuring underlying components.
@@ -29,7 +35,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.4.4'
+gem 'orchestration', '~> 0.4.5'
 ```
 
 Install:
@@ -176,6 +182,8 @@ make test
 
 Note that _Orchestration_ will wait for all services to become fully available (i.e. running and providing valid responses) before attempting to run tests. This is specifically intended to facilitate testing in continuous integration environments.
 
+_(See [sidecar containers](#sidecar-containers) if you are running your test/development server inside _Docker_)_.
+
 ### Deployment to Docker Swarm
 
 To deploy your application to a local _Docker Swarm_ use:
@@ -286,6 +294,17 @@ An [entrypoint](https://docs.docker.com/engine/reference/builder/#entrypoint) sc
 * Adds a route `host.docker.internal` to the host machine running the container (mimicking the same route provided by _Docker_ itself on _Windows_ and _OS
   X_).
 
+<a name="sidecar-containers"></a>
+## Sidecar Containers
+
+If you need to start dependency services (databases, etc.) and connect to them from a _Docker_ container (an example use case of this would be running tests in _Jenkins_ using its _Docker_ agent) then the container that runs your tests must join the same _Docker_ network as your dependency services.
+
+To do this automatically, pass the `sidecar` parameter to the `start` or `test` targets:
+
+```bash
+make test sidecar=1
+```
+
 <a name="rabbitmq-configuration"></a>
 ## RabbitMQ Configuration
 

data/lib/orchestration/templates/Dockerfile.erb

@@ -1,8 +1,9 @@
 FROM ruby:<%= ruby_version %>
 ARG BUNDLE_BITBUCKET__ORG
 ARG BUNDLE_GITHUB__COM
-RUN apt-get update \
- && apt-get install -y node.js gosu sendmail \
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+ && apt-get update \
+ && 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/makefile_macros.mk.erb

@@ -1,4 +1,3 @@
-is_container:=$(shell [ -f './.orchestration_container_flag' ] && echo -n '1' || echo -n '0')
 TERM ?= 'dumb'
 pwd:=$(shell pwd)
 ifdef mounted_orchestration

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

@@ -62,17 +62,20 @@ all: build
 ### Container management commands ###
 
 .PHONY: start
+ifndef network
+start: network := ${docker_repository}_${env}_default
+endif
 start: _clean-logs
 	@$(call print,'${yellow}Starting containers${reset} ...')
 ifeq (${env},$(filter ${env},test development))
 	@${compose} up -d --force-recreate ${services} ${log} || ${fail}
-	@[ '${is_container}' == '1' ] && \
+	@[ -n '${sidecar}' ] && \
          ( \
            docker network connect '${network}' '$(shell hostname)' ${log} \
            || \
            $(call println,'${yellow}Warning${reset}: Unable to join network: "${yellow}${network}${reset}". Container will not be able to connect to dependency services.') \
          ) \
-         || ( [ '${is_container}' == '0' ] || ${fail} )
+         || ( [ -z '${sidecar}' ] || ${fail} )
 else
 	@${compose} up -d --scale app=$${instances:-1} ${services} ${log} || ${fail}
 endif
@@ -278,7 +281,7 @@ build:
 <% if defined?(Webpacker) %>	@git show ${git_branch}:./package.json > ${orchestration_dir}/.build/package.json 2>${stderr} || ${fail}<% end %>
 <% if defined?(Webpacker) %>	@git show ${git_branch}:./yarn.lock > ${orchestration_dir}/.build/yarn.lock 2>${stderr} || ${fail}<% end %>
 	@git archive --format 'tar' -o '${context}' '${git_branch}' ${log} || ${fail}
-	@temp=$$(mktemp -d) ; ( cd "$${temp}" && touch './.orchestration_container_flag' && tar -uvf '${context}' . ) ${log} || ${fail}
+	@temp=$$(mktemp -d) ; ( cd "$${temp}" && tar -uvf '${context}' . ) ${log} || ${fail}
 	@$(call printrawln,'${green}complete.${reset} ${tick}')
 	@$(call print,'${yellow}Building image${reset} ...')
 	@docker build \

data/lib/orchestration/version.rb

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

metadata

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