orchestration 0.6.14 → 0.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcf0bada7cf3b3a134fecda49886fd0a79b8b03d1a8a02a759f60390d6fa8a58
-  data.tar.gz: e716bc24dab185c4547c3c6b020e66e34cf5ad9598fded73a071c0aaecb896d0
+  metadata.gz: 9495b1f5ce01552fda9a9fb5db75ad58cc9870c06a010093b0de05d8c572f1ab
+  data.tar.gz: 2e0be60722c04f7a75c622f2be88a08152253247f61179f740e9722dbce64f8f
 SHA512:
-  metadata.gz: 3494b60cc10be3de1ecfb828bdd5e750d039516a43ee4f6d2d28fd5b1c277eb2afc8ec862860d5f48652429413d101fd09b1bcc9d23edbb953f6042de08a002a
-  data.tar.gz: c2d8d6b318c16d44bce372012d7c2400ff20d3e465b201d34e24fc3ba8402e7be0b346f0f9fc0ad5e97b616672cb4e2184c265618e60a7882b98e1c89d8ea5a6
+  metadata.gz: 15a39a36a88488f993306387b31a229c74ab30f66360143bc17bcbe3f075073fbd301887530b976a36f9a9b8970e44b250ff1b7c3d82f64f62ed71d2633ba231
+  data.tar.gz: 961da484694bc593a1ffac5e78e9fb1b1f7df74071b043821806d07bde6519c057f1835dcc1824cf0bb3921eb412f006c66af5478441ffb2b67b48e3f28138a7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orchestration (0.6.14)
+    orchestration (0.6.16)
       database_url (~> 0.1.2)
       dotenv-rails (~> 2.8)
       erubis (~> 2.7)

data/lib/orchestration/make/orchestration.mk

@@ -197,7 +197,7 @@ else
 endif
 
 compose_base:=env -i \
-             PATH=$(PATH) \
+             PATH="$(PATH)" \
              HOST_UID=$(shell id -u) \
              DOCKER_ORGANIZATION="${docker_organization}" \
              DOCKER_REPOSITORY="${docker_repository}" \
@@ -393,14 +393,13 @@ tag:
 .PHONY: deploy
 deploy: _log-notify _clean-logs
 ifdef env_file
-deploy: env_file_option = --env-file ${env_file}
+deploy: env_file_option = . ${env_file}
 endif
 deploy: RAILS_ENV := ${env}
 deploy: RACK_ENV := ${env}
 deploy: DOCKER_TAG = ${git_version}
 deploy: base_vars = DOCKER_ORGANIZATION=${docker_organization} DOCKER_REPOSITORY=${docker_repository} DOCKER_TAG=${git_version}
-deploy: compose_deploy := ${base_vars} COMPOSE_PROJECT_NAME=${project_base} HOST_UID=$(shell id -u) docker-compose ${env_file_option} --project-name ${project_base} -f orchestration/docker-compose.deployment.yml
-deploy: config_cmd = ${compose_deploy} config
+deploy: config_cmd := ( set -a ; ${env_file_option} ; ${base_vars} COMPOSE_PROJECT_NAME=${project_base} HOST_UID=$(shell id -u) docker stack config --compose-file orchestration/docker-compose.deployment.yml )
 deploy: remote_cmd = cat | docker stack deploy --prune --with-registry-auth -c - ${project_base}
 deploy: ssh_cmd = ssh "${manager}"
 deploy: deploy_cmd := ${config_cmd} | ${ssh_cmd} "/bin/bash -lc '${remote_cmd}'"

data/lib/orchestration/make/orchestration.mk.orig

@@ -0,0 +1,535 @@
+
+### Environment setup ###
+SHELL:=/bin/bash
+MAKE:=mkpath=${mkpath} make --no-print-directory
+ORCHESTRATION_DISABLE_ENV=1
+export
+TERM ?= 'dumb'
+pwd:=$(shell pwd)
+
+orchestration_dir_name=orchestration
+orchestration_dir=orchestration
+
+ifdef env_file
+  custom_env_file ?= 1
+else
+  custom_env_file ?= 0
+endif
+
+ifneq (,$(wildcard ${pwd}/config/database.yml))
+  database_enabled = 1
+else
+  database_enabled = 0
+endif
+
+red:=$(shell tput setaf 1)
+green:=$(shell tput setaf 2)
+yellow:=$(shell tput setaf 3)
+blue:=$(shell tput setaf 4)
+magenta:=$(shell tput setaf 5)
+cyan:=$(shell tput setaf 6)
+gray:=$(shell tput setaf 7)
+reset:=$(shell tput sgr0)
+tick=[${green}✓${reset}]
+cross=[${red}✘${reset}]
+
+make=$(MAKE) $1
+orchestration_config_filename:=.orchestration.yml
+orchestration_config:=${pwd}/${orchestration_config_filename}
+system_prefix=${reset}[${cyan}exec${reset}]
+warn_prefix=${reset}[${yellow}warn${reset}]
+echo_prefix=${reset}[${blue}info${reset}]
+fail_prefix=${reset}[${red}fail${reset}]
+logs_prefix=${reset}[${green}logs${reset}]
+system=echo '${system_prefix} ${cyan}$1${reset}'
+warn=echo '${warn_prefix} ${reset}$1${reset}'
+echo=echo '${echo_prefix} ${reset}$1${reset}'
+fail=echo '${fail_prefix} ${reset}$1${reset}'
+logs=echo '${logs_prefix} ${reset}$1${reset}'
+print_error=printf '${red}\#${reset} '$1 | tee '${stderr}'
+println_error=$(call print_error,$1'\n')
+print=printf '${blue}\#${reset} '$1
+println=$(call print,$1'\n')
+printraw=printf $1
+stdout=${pwd}/log/orchestration.stdout.log
+stderr=${pwd}/log/orchestration.stderr.log
+log_path_length:=$(shell echo "${stdout}" | wc -c)
+ifndef verbose
+log_tee:= 2>&1 | tee -a ${stdout}
+log:= >>${stdout} 2>>${stderr}
+progress_point:=perl -e 'printf("[${magenta}busy${reset}] "); while( my $$line = <STDIN> ) { printf("."); select()->flush(); }'
+log_progress:= > >(tee -ai ${stdout} >&1 | ${progress_point}) 2> >(tee -ai ${stderr} 2>&1 | ${progress_point})
+endif
+hr:=$(call println,"$1$(shell head -c ${log_path_length} < /dev/zero | tr '\0' '=')${reset}")
+managed_env_tag:=\# -|- ORCHESTRATION
+standard_env_path:=${pwd}/.env
+backup_env_path:=${pwd}/.env.orchestration.backup
+is_managed_env:=$$(test -f '${standard_env_path}' && tail -n 1 '${standard_env_path}') == "${managed_env_tag}"*
+token:=$(shell cat /dev/urandom | LC_CTYPE=C tr -dc 'a-z0-9' | fold -w8 | head -n1)
+back_up_env:=( \
+               [ ! -f '${standard_env_path}' ] \
+             || \
+               ( \
+                 [ -f '${standard_env_path}' ] \
+                 && cp '${standard_env_path}' '${backup_env_path}' \
+               ) \
+             )
+
+key_chars:=[a-zA-Z0-9_]
+censored:=**********
+censor=s/\(^${key_chars}*$(1)${key_chars}*\)=\(.*\)$$/\1=${censored}/
+censor_urls:=s|\([a-zA-Z0-9_+]\+://.*:\).*\(@.*\)$$|\1${censored}\2|
+format_env:=sed '$(call censor,SECRET); \
+                 $(call censor,TOKEN); \
+                 $(call censor,PRIVATE); \
+                 $(call censor,KEY); \
+                 $(censor_urls); \
+                 /^\s*$$/d; \
+                 /^\s*\#/d; \
+                 s/\(^[a-zA-Z0-9_]\+\)=/${blue}\1${reset}=/; \
+                 s/^/  /; \
+                 s/=\(.*\)$$/=${yellow}\1${reset}/' | \
+            sort
+
+exit_fail=( \
+           $(call printraw,' ${cross}') ; \
+           $(call make,dump src_cmd=$(MAKECMDGOALS)) ; \
+           echo ; \
+           $(call println,'Failed. ${cross}') ; \
+           exit 1 \
+        )
+
+ifdef env_file
+  env_path=${env_file}
+else
+  env_path=.env
+endif
+
+ifneq (${env},test)
+  ifeq (,$(findstring test,$(MAKECMDGOALS)))
+    ifeq (,$(findstring deploy,$(MAKECMDGOALS)))
+      ifeq (,$(findstring setup,$(MAKECMDGOALS)))
+        -include ${env_path}
+      endif
+    endif
+  endif
+endif
+
+ifneq (,$(findstring deploy,$(MAKECMDGOALS)))
+  RAILS_ENV=$(shell grep '^RAILS_ENV=' '${env_path}' | tail -n1 | sed 's/^RAILS_ENV=//')
+endif
+
+export
+
+ifneq (,$(findstring test,$(MAKECMDGOALS)))
+  env=test
+endif
+
+ifneq (,$(RAILS_ENV))
+  env=$(RAILS_ENV)
+else ifneq (,$(env))
+  # `env` set by current shell.
+else ifneq (,$(RAILS_ENV))
+  env=$(RAILS_ENV)
+else ifneq (,$(RACK_ENV))
+  env=$(RACK_ENV)
+else
+  env=development
+endif
+
+env_human=${gray}${env}${reset}
+DOCKER_TAG ?= latest
+
+ifneq (,$(wildcard ./Gemfile))
+  bundle_cmd = bundle exec
+endif
+rake=ORCHESTRATION_DISABLE_ENV=1 DEVPACK_DISABLE=1 RACK_ENV=${env} SECRET_KEY_BASE='placeholder-secret' RAILS_ENV=${env} ${bundle_cmd} rake
+
+ifneq (,$(wildcard ${env_file}))
+  ifeq (,$(findstring deploy,$(MAKECMDGOALS)))
+    rake_cmd:=${rake}
+    rake=. ${env_file} && ${rake_cmd}
+  endif
+endif
+
+docker_config:=$(shell DEVPACK_DISABLE=1 RAILS_ENV=development ${bundle_cmd} rake orchestration:config 2>/dev/null || echo no-org no-repo)
+docker_organization=$(word 1,$(docker_config))
+docker_repository=$(word 2,$(docker_config))
+
+compose_services:=$(shell ${rake} orchestration:compose_services RAILS_ENV=${env})
+
+ifeq (,$(project_name))
+  project_base = ${docker_repository}_${env}
+else
+  project_base := $(project_name)
+endif
+
+ifeq (,$(findstring deploy,$(MAKECMDGOALS)))
+  sidecar_suffix := $(shell test -f ${orchestration_dir}/.sidecar && cat ${orchestration_dir}/.sidecar)
+  ifneq (,${sidecar_suffix})
+    sidecar := 1
+  endif
+
+  ifdef sidecar
+    # Set the variable to an empty string so that "#{sidecar-1234}" will
+    # evaluate to "1234" in port mappings.
+    sidecar_compose = sidecar=''
+    ifeq (,${sidecar_suffix})
+      sidecar_suffix := $(call token)
+      _ignore := $(shell echo ${sidecar_suffix} > ${orchestration_dir}/.sidecar)
+    endif
+
+    ifeq (,${sidecar_suffix})
+      $(warning Unable to generate project suffix; project name collisions may occur.)
+    endif
+    compose_project_name_base = ${project_base}_${sidecar_suffix}
+  else
+    compose_project_name_base = ${project_base}
+  endif
+else
+  compose_project_name_base = ${project_base}
+endif
+
+ifdef COMPOSE_PROJECT_NAME_SUFFIX
+  compose_project_name = ${compose_project_name_base}_${COMPOSE_PROJECT_NAME_SUFFIX}
+else
+  compose_project_name = ${compose_project_name_base}
+endif
+
+compose_base:=env -i \
+             PATH=$(PATH) \
+             HOST_UID=$(shell id -u) \
+             DOCKER_ORGANIZATION="${docker_organization}" \
+             DOCKER_REPOSITORY="${docker_repository}" \
+             COMPOSE_PROJECT_NAME="${compose_project_name}" \
+             COMPOSE_PROJECT_NAME_SUFFIX="${COMPOSE_PROJECT_NAME_SUFFIX}" \
+	     ${sidecar_compose} \
+             docker-compose \
+             -f ${orchestration_dir}/docker-compose.${env}.yml
+
+git_branch := $(if $(branch),$(branch),$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null || echo no-branch))
+ifndef dev
+  git_version := $(shell git rev-parse --short --verify ${git_branch} 2>/dev/null || echo no-version)
+else
+  git_version := dev
+endif
+
+docker_image:=${docker_organization}/${docker_repository}:${git_version}
+
+compose=${compose_base}
+compose_human=docker-compose -f ${orchestration_dir_name}/docker-compose.${env}.yml
+random_str=cat /dev/urandom | LC_ALL=C tr -dc 'a-z' | head -c $1
+
+ifneq (,$(wildcard ${orchestration_dir}/docker-compose.local.yml))
+  compose:=${compose} -f ${orchestration_dir}/docker-compose.local.yml
+endif
+
+all: build
+
+### Container management commands ###
+
+.PHONY: pull
+pull:
+	@$(call system,${compose_human} pull)
+	@${compose} pull
+
+.PHONY: start
+ifndef network
+start: network := ${compose_project_name}
+endif
+start: _create-log-directory _clean-logs pull
+ifneq (,${compose_services})
+	@$(call system,${compose_human} up --detach)
+ifeq (${env},$(filter ${env},test development))
+	@${compose} up --detach --force-recreate --renew-anon-volumes --remove-orphans ${services} ${log} || ${exit_fail}
+	@[ -n '${sidecar}' ] && \
+         ( \
+           $(call echo,(joining dependency network ${cyan}${network}${reset})) ; \
+           $(call system,docker network connect "${network}") ; \
+           docker network connect '${network}' '$(shell hostname)' ${log} \
+           || ( \
+           $(call warn,Unable to join network: "${cyan}${network}${reset}". Container will not be able to connect to dependency services) ; \
+           $(call echo,Try deleting "${cyan}orchestration/.sidecar${reset}" if you do not want to use sidecar mode) ; \
+           ) \
+         ) \
+         || ( [ -z '${sidecar}' ] || ${exit_fail} )
+else
+	@${compose} up --detach --scale app=$${instances:-1} ${log} || ${exit_fail}
+endif
+	@$(call echo,${env_human} containers started ${tick})
+	@$(call echo,Waiting for services to become available)
+	@$(call make,wait) 2>${stderr} || ${exit_fail}
+endif
+
+.PHONY: stop
+stop: network := ${compose_project_name}
+stop:
+ifneq (,${compose_services})
+	@$(call echo,Stopping ${env_human} containers)
+	@$(call system,${compose_human} down)
+	@if docker ps --format "{{.ID}}" | grep -q $(shell hostname) ; \
+          then \
+            ( docker network disconnect ${network} $(shell hostname) ${log} || : ) \
+            && \
+            ( ${compose} down ${log} || ${exit_fail} ) ; \
+          else \
+            ${compose} down ${log} || ${exit_fail} ; \
+          fi
+	@$(call echo,${env_human} containers stopped ${tick})
+endif
+
+.PHONY: logs
+logs:
+	@${compose} logs -f
+
+.PHONY: config
+config:
+	@${compose} config
+
+.PHONY: compose
+compose:
+	@echo ${compose}
+
+### Development/Test Utility Commands
+
+.PHONY: serve
+serve: env_file ?= ./.env
+serve: rails = RAILS_ENV='${env}' bundle exec rails server ${server}
+serve:
+	@if [ -f "${env_file}" ] ; \
+         then ( \
+                $(call echo,Environment${reset}: ${cyan}${env_file}${reset}) && \
+                cat '${env_file}' | ${format_env} \
+            ) ; \
+        fi
+	${rails}
+
+.PHONY: console
+console: env_file ?= ./.env
+console: rails = RAILS_ENV='${env}' bundle exec rails
+console:
+	@if [ -f "${env_file}" ] ; \
+         then ( \
+                $(call echo,Environment${reset}: ${cyan}${env_file}${reset}) && \
+                cat '${env_file}' | ${format_env} \
+            ) ; \
+        fi
+	${rails} console
+
+.PHONY: db-console
+db-console:
+	@${rake} orchestration:db:console RAILS_ENV=${env}
+
+.PHONY: setup
+ifneq (,$(wildcard config/database.yml))
+setup: url := $(shell ${rake} orchestration:db:url RAILS_ENV=${env} 2>/dev/null)
+endif
+setup: _log-notify
+	@$(call echo,Setting up ${env_human} environment)
+	@$(call make,start env=${env})
+ifneq (,$(wildcard config/database.yml))
+	@$(call echo,Preparing ${env_human} database)
+	@$(call system,rake db:create RAILS_ENV="${env}")
+	@${rake} db:create RAILS_ENV=${env} DATABASE_URL='${url}' ${log} || : ${log}
+  ifneq (,$(wildcard db/structure.sql))
+	@$(call system,rake db:structure:load RAILS_ENV="${env}" ${url_prefix}DATABASE_URL="${url}")
+	@${rake} db:structure:load RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
+  else ifneq (,$(wildcard db/schema.rb))
+	@$(call system,rake db:schema:load RAILS_ENV="${env}" ${url_prefix}DATABASE_URL="${url}")
+	@${rake} db:schema:load RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
+  endif
+	@$(call system,rake db:migrate RAILS_ENV="${env}" ${url_prefix}DATABASE_URL="${url}")
+	@${rake} db:migrate RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
+endif
+	@if $(MAKE) -n post-setup >/dev/null 2>&1; then \
+          $(call system,make post-setup RAILS_ENV="${env}") \
+          && $(MAKE) post-setup RAILS_ENV=${env}; fi
+	@$(call echo,${env_human} environment setup complete ${tick})
+
+.PHONY: dump
+dump:
+ifndef verbose
+	@$(call println)
+	@$(call println,'${yellow}Captured${reset} ${green}stdout${reset} ${yellow}and${reset} ${red}stderr${reset} ${yellow}log data [${cyan}${env}${yellow}]${reset}:')
+	@$(call println)
+	@echo
+	@test -f '${stdout}' && ( \
+          $(call hr,${green}) ; \
+          $(call println,'${gray}${stdout}${reset}') ; \
+          $(call hr,${green}) ; \
+          echo ; cat '${stdout}' ; echo ; \
+          $(call hr,${green}) ; \
+        )
+
+	@test -f '${stdout}' && ( \
+          echo ; \
+          $(call hr,${red}) ; \
+          $(call println,'${gray}${stderr}${reset}') ; \
+          $(call hr,${red}) ; \
+          echo ; cat '${stderr}' ; echo ; \
+          $(call hr,${red}) ; \
+        )
+endif
+ifneq (build,${src_cmd})
+ifneq (push,${src_cmd})
+	@echo ; \
+        $(call hr,${yellow}) ; \
+        $(call println,'${gray}docker-compose logs${reset}') ; \
+        $(call hr,${yellow}) ; \
+        echo
+	@${compose} logs
+	@echo ; \
+        $(call hr,${yellow})
+	@$(NOOP)
+endif
+endif
+
+.PHONY: tag
+tag:
+	@echo ${docker_image}
+
+### Deployment utility commands ###
+
+.PHONY: deploy
+deploy: _log-notify _clean-logs
+ifdef env_file
+deploy: env_file_option = --env-file ${env_file}
+endif
+deploy: RAILS_ENV := ${env}
+deploy: RACK_ENV := ${env}
+deploy: DOCKER_TAG = ${git_version}
+deploy: base_vars = DOCKER_ORGANIZATION=${docker_organization} DOCKER_REPOSITORY=${docker_repository} DOCKER_TAG=${git_version}
+deploy: compose_deploy := ${base_vars} COMPOSE_PROJECT_NAME=${project_base} HOST_UID=$(shell id -u) docker-compose ${env_file_option} --project-name ${project_base} -f orchestration/docker-compose.deployment.yml
+deploy: config_cmd = ${compose_deploy} config
+deploy: remote_cmd = cat | docker stack deploy --prune --with-registry-auth -c - ${project_base}
+deploy: ssh_cmd = ssh "${manager}"
+deploy: deploy_cmd := ${config_cmd} | ${ssh_cmd} "/bin/bash -lc '${remote_cmd}'"
+deploy:
+ifndef manager
+	@$(call fail,Missing ${cyan}manager${reset} parameter: ${cyan}make deploy manager=swarm-manager.example.com${reset}) ; exit 1
+endif
+	@$(call echo,Deploying ${env_human} stack via ${cyan}${manager}${reset} as ${cyan}${project_base}${reset}) && \
+          ( \
+             ( test -f '${env_file}' && $(call echo,Deployment environment:) && cat '${env_file}' | ${format_env} || : ) && \
+             $(call echo,Application image: ${cyan}${docker_image}${reset}) ; \
+	     $(call system,${config_cmd} | ${ssh_cmd} "/bin/bash -lc '\''${remote_cmd}'\''") ; \
+	     ${deploy_cmd} \
+          )
+	@$(call echo,Deployment ${green}complete${reset} ${tick})
+
+.PHONY: rollback
+ifndef service
+rollback: service = app
+endif
+rollback:
+ifndef manager
+	@$(call fail,Missing `manager` parameter: `make deploy manager=swarm-manager.example.com`)
+	@exit 1
+endif
+	@$(call echo,Rolling back ${cyan}${compose_project_name}_${service}${reset} via ${cyan}${manager}${reset} ...)
+	@$(call system,docker service rollback --detach "${compose_project_name}_${service}")
+	@ssh "${manager}" 'docker service rollback --detach "${compose_project_name}_${service}"' ${log} || ${exit_fail}
+	@$(call echo,Rollback request ${green}complete${reset} ${tick})
+
+### Service healthcheck commands ###
+
+.PHONY: wait
+wait:
+	@${rake} orchestration:wait
+	@$(call echo,${env_human} services ${green}ready${reset} ${tick})
+
+## Generic Listener healthcheck for TCP services ##
+
+wait-listener:
+	@${rake} orchestration:listener:wait service=${service} sidecar=${sidecar}
+
+### Docker build commands ###
+
+.PHONY: build
+build: _log-notify _clean-logs
+build: build_dir = ${orchestration_dir}/.build
+build: context = ${build_dir}/context.tar
+build: build_args := --build-arg GIT_COMMIT='${git_version}' $(shell grep '^ARG ' orchestration/Dockerfile | sed -e 's/=.*$$//' -e 's/^ARG /--build-arg /')
+build: tag_human = ${cyan}${docker_organization}/${docker_repository}:${git_version}${reset}
+build: latest_tag_human = ${cyan}${docker_organization}/${docker_repository}:latest${reset}
+build: _create-log-directory check-local-changes
+	@$(call echo,Preparing build context from ${cyan}${git_branch}${reset} (${cyan}${git_version}${reset})${reset})
+	@$(call system,git archive --format "tar" -o "${context}" "${git_branch}")
+	@mkdir -p ${orchestration_dir}/.build ${log} || ${exit_fail}
+	@cp '$(shell bundle info --path orchestration)/lib/orchestration/healthcheck.bash' '${orchestration_dir}/healthcheck'
+	@chmod +x '${orchestration_dir}/healthcheck'
+ifndef dev
+	@git show ${git_branch}:./Gemfile > ${orchestration_dir}/.build/Gemfile 2>${stderr} || ${exit_fail}
+	@git show ${git_branch}:./Gemfile.lock > ${orchestration_dir}/.build/Gemfile.lock 2>${stderr} || ${exit_fail}
+	@git archive --format 'tar' -o '${context}' '${git_branch}' ${log} || ${exit_fail}
+else
+	@tar -cvf '${context}' . ${log} || ${exit_fail}
+endif
+	@tar --append --file '${context}' '${orchestration_dir}/healthcheck'
+	@rm '${orchestration_dir}/healthcheck'
+ifdef include
+	@$(call echo,Including files from: ${cyan}${include}${reset})
+	@(while read line; do \
+            export line; \
+            include_dir="${build_dir}/$$(dirname "$${line}")/" && \
+            mkdir -p "$${include_dir}" && cp "$${line}" "$${include_dir}" \
+            && (cd '${orchestration_dir}/.build/' && tar rf 'context.tar' "$${line}"); \
+	    echo "${system_prefix}" "tar rf 'context.tar' '$${line}'"; \
+          done < '${include}') ${log} || ${exit_fail}
+	@$(call echo,Build context ${green}ready${reset} ${tick})
+endif
+	@$(call echo,Building image ${tag_human})
+	@$(call system,docker build ${build_args} -t ${docker_organization}/${docker_repository}:${git_version} ${orchestration_dir}/)
+	@docker build ${build_args} \
+                        -t ${docker_organization}/${docker_repository}:${git_version} \
+                        ${orchestration_dir}/ ${log_progress} || ${exit_fail}
+	@echo
+	@$(call echo,Build ${green}complete${reset} ${tick})
+	@$(call echo,[${green}tag${reset}] ${tag_human})
+
+.PHONY: push
+push: _log-notify _clean-logs
+	@$(call echo,Pushing ${cyan}${docker_image}${reset} to registry)
+	@$(call system,docker push ${docker_image})
+	@docker push ${docker_image} ${log_progress} || ${exit_fail}
+	@echo
+	@$(call echo,Push ${green}complete${reset} ${tick})
+
+.PHONY: check-local-changes
+check-local-changes:
+ifndef dev
+	@changes="$$(git status --porcelain)"; if ! [ -z "${changes}" ] && [[ "${changes}" != "?? orchestration/.sidecar" ]]; \
+         then \
+           $(call warn,You have uncommitted changes which will not be included in your build:) ; \
+           git status --porcelain ; \
+           $(call echo,Commit these changes to Git or, alternatively, build in development mode to test your changes before committing: ${cyan}make build dev=1${reset}) ; \
+         fi
+endif
+
+### Internal Commands ###
+#
+.PHONY: _log-notify
+_log-notify: comma=,
+_log-notify: _verify-repository
+ifndef verbose
+	@$(call logs,${green}stdout${reset}: ${cyan}log/orchestration.stdout.log${reset}${comma} ${red}stderr${reset}: ${cyan}log/orchestration.stderr.log)
+endif
+
+.PHONY: _verify-repository
+_verify-repository:
+	@if ! git rev-parse HEAD >/dev/null 2>&1 ; then $(call fail,You must make at least one commit before you can use Orchestration commands) ; exit 1 ; fi
+
+.PHONY: _clean-logs
+_clean-logs:
+_clean-logs: _create-log-directory
+	@rm -f '${stdout}' '${stderr}'
+	@touch '${stdout}' '${stderr}'
+
+.PHONY: _create-log-directory
+_create-log-directory:
+	@mkdir -p log
+
+# Used by Orchestration test suite to verify Makefile syntax
+.PHONY: _test
+_test:
+	@echo 'test command'

data/lib/orchestration/templates/Dockerfile.erb

@@ -14,14 +14,10 @@ RUN apt-get update \
  && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
  && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
  && apt-get update \
- && apt-get install nodejs \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs \
  && rm -rf /var/lib/apt/lists/* \
  && gem install bundler \
  && mkdir /app<%if defined?(Webpacker) %> \
- && curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash \
- && . /root/.bashrc \
- && npm config set user 0 \
- && npm config set unsafe-perm true \
  && npm install -g yarn<% end %>
 WORKDIR /app
 COPY .build/Gemfile .build/Gemfile.lock ./
@@ -29,7 +25,7 @@ RUN bundle config set deployment 'true' \
  && bundle config set without 'development test' \
  && bundle install
 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=placeholder-secret bundle exec rake assets:precompile<% elsif Rake::Task.tasks.map(&:name).include?('assets:precompile') %>RUN NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=placeholder-secret bundle exec rake assets:precompile<% end %>
+<% if defined?(Webpacker) %>RUN NODE_ENV=production RAILS_ENV=production yarn install && NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=placeholder-secret bundle exec rake assets:precompile<% elsif Rake::Task.tasks.map(&:name).include?('assets:precompile') %>RUN NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=placeholder-secret bundle exec rake assets:precompile<% end %>
 RUN echo "${GIT_COMMIT}" > /app/GIT_COMMIT
 HEALTHCHECK --interval=<%= healthcheck['interval'] %> \
             --timeout=<%= healthcheck['timeout'] %> \

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.6.14
+  version: 0.6.16
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -403,6 +403,7 @@ files:
 - lib/orchestration/install_generator.rb
 - lib/orchestration/make.rb
 - lib/orchestration/make/orchestration.mk
+- lib/orchestration/make/orchestration.mk.orig
 - lib/orchestration/railtie.rb
 - lib/orchestration/service_check.rb
 - lib/orchestration/services.rb