orchestration 0.4.3 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cb5ae60827d78174136105aa5d569442403e0c66fbd91b52dc1fa960d54b901
-  data.tar.gz: ebc464ac7f85474af8cd888571583f863d2a0ffe6629190e8a6d412e6abc20dd
+  metadata.gz: 3658b497eae57e7f247ef8f703ddb90ca6c041a2aba5409c61e54291a8e80c22
+  data.tar.gz: 4a7a242492fd376b62ccb30c2dbf6e5e9163aa202e5fefbbb75b1fef4eab315c
 SHA512:
-  metadata.gz: 20653aa7ed7ee911d562cab05df0184525655af43a156082840a2052ed687575cd46c8a34fc975721fb97eaea0899c4b7e9d0244e6af67531905f91f6fdef569
-  data.tar.gz: 9aa560232ac183ba7368c23109e17d382f6483c1f125fbf155f3f8a58eddf25f1cf626ac85581ca1dbe0b8e0dfb3110774b3ca549890a816c7e90e0c17423617
+  metadata.gz: d855b7c336167af5db5444f96319de4236d7bb19fdb2ad0554b0c1730485ff57f3d1e3e9d8317138fe60797ac4cf4011bf76f168c1e8948ce3e242e0a012d7c6
+  data.tar.gz: 98c840d9cdd7272fa2f167373b5df176f9bb0a6d6b22f4be897dd64290f51c17087a20c8f5765e1fdd68890beae7f9de74fdde839441d014d873dfb1effd1996

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.3'
+gem 'orchestration', '~> 0.4.8'
 ```
 
 Install:
@@ -144,7 +150,7 @@ make push
 
 ### Development
 
-An [`.env`](https://docs.docker.com/compose/env-file/) is created automatically in your project root. This file is _not_ stored in version control. Set all application environment variables in this file.
+An [`.env` file](https://docs.docker.com/compose/env-file/) is created automatically in your project root. This file is _not_ stored in version control. Set all application environment variables in this file.
 
 #### Launching a development server
 
@@ -176,16 +182,59 @@ 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_)_.
+
+Dependencies will be launched and then tested for readiness. The retry limit and interval time for readiness tests can be controlled by the following environment variables:
+
+```
+ORCHESTRATION_RETRY_LIMIT # default: 10
+ORCHESTRATION_RETRY_INTERVAL # default: 5 [seconds]
+```
+
+### (Local) Production
+
+Run a production environment locally to simulate your deployment platform:
+
+```
+make start env=production
+```
+
 ### 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
+```
+
+This variable will also be available as `COMPOSE_PROJECT_NAME` for use within your `docker-compose.yml`. e.g. to explicitly name a network after the project name:
+
+```yaml
+networks:
+  myapp:
+    name: "${COMPOSE_PROJECT_NAME}"
+```
+
+#### 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):
@@ -268,6 +317,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/environment.rb

@@ -18,7 +18,14 @@ module Orchestration
     end
 
     def database_url
-      ENV['DATABASE_URL']
+      case environment
+      when 'development'
+        ENV['DEVELOPMENT_DATABASE_URL'] || ENV['DATABASE_URL']
+      when 'test'
+        ENV['TEST_DATABASE_URL'] || ENV['DATABASE_URL']
+      else
+        ENV['DATABASE_URL']
+      end
     end
 
     def mongo_url

data/lib/orchestration/service_check.rb

@@ -2,8 +2,8 @@
 
 module Orchestration
   class ServiceCheck
-    ATTEMPT_LIMIT = 10
-    RETRY_INTERVAL = 3 # seconds
+    ATTEMPT_LIMIT = ENV.fetch('ORCHESTRATION_RETRY_LIMIT', '10').to_i
+    RETRY_INTERVAL = ENV.fetch('ORCHESTRATION_RETRY_INTERVAL', '5').to_i
 
     def initialize(service, terminal, options = {})
       @service = service
@@ -16,6 +16,8 @@ module Orchestration
     end
 
     def run
+      return echo_missing unless @service.configuration.configured?
+
       echo_start
       success = attempt_connection
       echo_ready if success
@@ -37,6 +39,14 @@ module Orchestration
       false
     end
 
+    def echo_missing
+      @terminal.write(
+        @service_name.to_sym,
+        "#{@service.configuration.error} (skipping)",
+        :error
+      )
+    end
+
     def echo_start
       @terminal.write(@service_name.to_sym, '', :status)
     end

data/lib/orchestration/services/mixins/configuration_base.rb

@@ -3,7 +3,7 @@
 module Orchestration
   module Services
     module ConfigurationBase
-      attr_reader :service_name, :env
+      attr_reader :service_name, :env, :error
 
       def self.included(base)
         base.extend(ClassMethods)
@@ -33,6 +33,14 @@ module Orchestration
         @service_name
       end
 
+      def configured?
+        port
+        true
+      rescue KeyError => error
+        @error = error
+        false
+      end
+
       def port
         return @env.app_port if @service_name == 'app'
 

data/lib/orchestration/templates/Dockerfile.erb

@@ -1,8 +1,13 @@
 FROM ruby:<%= ruby_version %>
 ARG BUNDLE_BITBUCKET__ORG
 ARG BUNDLE_GITHUB__COM
-RUN apt-get update \
- && apt-get install -y node.js gosu sendmail \
+ARG GIT_COMMIT
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+ && apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+      nodejs \
+      gosu \
+      sendmail \
  && rm -rf /var/lib/apt/lists/* \
  && gem install bundler \
  && mkdir /app<%if defined?(Webpacker) %> \
@@ -19,6 +24,7 @@ RUN . /root/.bashrc && yarn install
 <% end %>
 ADD .build/context.tar .
 <% if defined?(Webpacker) %>RUN . /root/.bashrc && NODE_ENV=production RAILS_ENV=production yarn install && NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=abc123 bundle exec rake assets:precompile<% elsif Rake::Task.tasks.map(&:name).include?('assets:precompile') %>RUN NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=abc123 bundle exec rake assets:precompile<% end %>
+RUN echo "${GIT_COMMIT}" > /app/GIT_COMMIT
 HEALTHCHECK --interval=<%= healthcheck['interval'] %> \
             --timeout=<%= healthcheck['timeout'] %> \
             --start-period=<%= healthcheck['start_period'] %> \

data/lib/orchestration/templates/database.yml.erb

@@ -21,8 +21,8 @@ test:
   database: <%= compose.call(nil).database_adapter.credentials['database'] %>
   # Useful for certain continuous integration environments (e.g. Jenkins in
   # Docker) where the DB hostname may be a service name rather than `127.0.0.1`:
-  <%% if ENV.key?('DATABASE_URL') %>
-  url: <%%= ENV['DATABASE_URL'] %>
+  <%% if ENV.key?('TEST_DATABASE_URL') %>
+  url: <%%= ENV['TEST_DATABASE_URL'] %>
   <%% end %>
 <% end %>
 

data/lib/orchestration/templates/entrypoint.sh.erb

@@ -1,7 +1,6 @@
 #!/bin/sh
-set -ue
-echo "Host user ID: ${HOST_UID}"
-set +u
+HOST_UID=${HOST_UID:-$(id -u)}
+set -e
 id owner >/dev/null 2>&1 || useradd -u ${HOST_UID} -m -o owner
 mkdir -p /app/tmp/pids
 chown -Rf owner:owner /app/tmp /app/log /app/db

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/mongoid.yml.erb

@@ -1,16 +1,12 @@
 development:
   clients:
     default:
-      hosts:
-        - 127.0.0.1:<%= compose.call('development').local_port('mongo') %>
-      database: development_db
+      uri: <%= "#{'<' + '%' + '='} ENV.fetch('MONGO_URL', 'mongodb://127.0.0.1:#{compose.call('development').local_port('mongo')}/development_db') #{'%' + '>'}" %>
 
 test:
   clients:
     default:
-      hosts:
-        - 127.0.0.1:<%= compose.call('test').local_port('mongo') %>
-      database: test_db
+      uri: <%= "#{'<' + '%' + '='} ENV.fetch('MONGO_URL', 'mongodb://127.0.0.1:#{compose.call('test').local_port('mongo')}/test_db') #{'%' + '>'}" %>
 
 production:
   clients:

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

@@ -39,11 +39,15 @@ endif
 docker_organization=$(shell bash ${orchestration_dir}/yaml.bash docker_organization)
 docker_repository=$(shell bash ${orchestration_dir}/yaml.bash docker_repository)
 
+ifeq (,$(project_name))
+  project_name = ${docker_repository}_${env}
+endif
+
 compose_base=env HOST_UID=$(shell id -u) \
              DOCKER_ORGANIZATION="${docker_organization}" \
              DOCKER_REPOSITORY="${docker_repository}" \
+             COMPOSE_PROJECT_NAME="${project_name}" \
              docker-compose \
-             -p "${docker_repository}_${env}" \
              -f "${orchestration_dir}/docker-compose.yml"
 
 git_branch ?= $(if $(branch),$(branch),$(shell git rev-parse --abbrev-ref HEAD))
@@ -62,19 +66,22 @@ 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' ] && \
+	@${compose} up --detach --force-recreate --renew-anon-volumes ${services} ${log} || ${fail}
+	@[ -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}
+	@${compose} up --detach --scale app=$${instances:-1} ${services} ${log} || ${fail}
 endif
 	@$(call printrawln,' ${green}started${reset} ${tick}')
 	@$(call println,'${yellow}Waiting for services to become available${reset} ...')
@@ -204,11 +211,9 @@ endif
 ifndef manager
 	@$(call println_error,'Missing `manager` parameter: `make deploy manager=swarm-manager.example.com`')
 endif
-deploy: env := production
-deploy: project_name = ${docker_repository}_${env}
 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} ...') && \
@@ -277,12 +282,13 @@ 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 \
                         --build-arg BUNDLE_GITHUB__COM \
                         --build-arg BUNDLE_BITBUCKET__ORG \
+                        --build-arg GIT_COMMIT='${git_version}' \
                         -t ${docker_organization}/${docker_repository} \
                         -t ${docker_organization}/${docker_repository}:${git_version} \
                         ${orchestration_dir}/ ${log_progress} || ${fail}

data/lib/orchestration/templates/rabbitmq.yml.erb

@@ -1,11 +1,11 @@
 <% if compose.call('development').services.key?('rabbitmq') %>
 development:
-  url: amqp://127.0.0.1:<%= compose.call('development').local_port('rabbitmq') %>
+  url: <%= "#{'<' + '%' + '='} ENV.fetch('RABBITMQ_URL', 'amqp://127.0.0.1:#{compose.call('development').local_port('rabbitmq')}') #{'%' + '>'}" %>
 <% end %>
 
 <% if compose.call('test').services.key?('rabbitmq') %>
 test:
-  url: amqp://127.0.0.1:<%= compose.call('test').local_port('rabbitmq') %>
+  url: <%= "#{'<' + '%' + '='} ENV.fetch('RABBITMQ_URL', 'amqp://127.0.0.1:#{compose.call('test').local_port('rabbitmq')}') #{'%' + '>'}" %>
 <% end %>
 
 production:

data/lib/orchestration/version.rb

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

metadata

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