orchestration 0.6.12 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1de0a5221b816f60d95a04376bb965de0f6381b585b454f3b8d49f1c0e05086d
-  data.tar.gz: 811bba578ba6e1166db99f95bf51dbb4e33e349f82e442013725651640d0bb63
+  metadata.gz: bcf0bada7cf3b3a134fecda49886fd0a79b8b03d1a8a02a759f60390d6fa8a58
+  data.tar.gz: e716bc24dab185c4547c3c6b020e66e34cf5ad9598fded73a071c0aaecb896d0
 SHA512:
-  metadata.gz: 8fe95b455287bd1e7c4b874c3bccffc8595b259f11ea892419e23ba074c60235e1a1f48a8eeb71aef8a5a76522e0833717c3b22b06987326b8a67a5d4a0c128e
-  data.tar.gz: 716c7c3389b69be2d80ee0b1f690d42f66f09f047752c97d5b806aa88bd85998b446bf266b2ef7a57b357ae37337f3cea4a6e391a88456246f4f6fa726306b13
+  metadata.gz: 3494b60cc10be3de1ecfb828bdd5e750d039516a43ee4f6d2d28fd5b1c277eb2afc8ec862860d5f48652429413d101fd09b1bcc9d23edbb953f6042de08a002a
+  data.tar.gz: c2d8d6b318c16d44bce372012d7c2400ff20d3e465b201d34e24fc3ba8402e7be0b346f0f9fc0ad5e97b616672cb4e2184c265618e60a7882b98e1c89d8ea5a6

data/Gemfile.lock

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

data/README.md

@@ -29,7 +29,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.6.8'
+gem 'orchestration', '~> 0.6.12'
 ```
 
 Install:

data/lib/orchestration/docker_compose/app_service.rb

@@ -29,7 +29,7 @@ module Orchestration
 
         def healthcheck
           {
-            'test' => ['bundle', 'exec', 'rake', 'orchestration:healthcheck'],
+            'test' => ['/app/orchestration/healthcheck'],
             # Defaults according to
             # https://docs.docker.com/engine/reference/builder/#healthcheck
             # Except start_period which cannot be set to 0s

data/lib/orchestration/healthcheck.bash

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+url="${WEB_HEALTHCHECK_PROTOCOL:-http}://${WEB_HOST:-localhost}:${WEB_PORT:-8080}${WEB_HEALTHCHECK_PATH:-/healthcheck}"
+curl_options="--max-time ${WEB_HEALTHCHECK_READ_TIMEOUT:-10} --connect-timeout ${WEB_HEALTHCHECK_OPEN_TIMEOUT:-10} --silent --output /dev/null --write-out %{http_code}"
+status_code="$(curl ${curl_options} "${url}")"
+
+echo "Status Code: ${status_code} (${url})"
+
+if [[ "${WEB_HEALTHCHECK_SUCCESS_CODES:-200,201,202,204}" =~ (^|,)"${status_code}"(,|$) ]]
+then
+  echo 'Healthcheck SUCCESS'
+  exit 0
+else
+  echo 'Healthcheck FAILURE'
+  exit 1
+fi

data/lib/orchestration/install_generator.rb

@@ -17,6 +17,8 @@ module Orchestration
     end
 
     def orchestration_configuration
+      return unless build?('.orchestration.yml')
+
       configure_orchestration_settings
       relpath = relative_path(@env.orchestration_configuration_path)
       return @terminal.write(:create, relpath) unless @settings.exist? || force?
@@ -26,11 +28,15 @@ module Orchestration
     end
 
     def application_makefile
+      return unless build?('Makefile')
+
       path = @env.root.join('Makefile')
       simple_copy('application.mk', path) unless File.exist?(path)
     end
 
     def dockerfile
+      return unless build?('Dockerfile')
+
       create_file(
         orchestration_dir.join('Dockerfile'),
         dockerfile_content,
@@ -39,6 +45,8 @@ module Orchestration
     end
 
     def entrypoint_sh
+      return unless build?('entrypoint.sh')
+
       content = template('entrypoint.sh')
       path = orchestration_dir.join('entrypoint.sh')
       create_file(path, content, overwrite: false)
@@ -46,12 +54,15 @@ module Orchestration
     end
 
     def docker_compose
+      return unless build?('docker-compose.yml')
+
       @docker_compose.docker_compose_test_yml
       @docker_compose.docker_compose_development_yml
       @docker_compose.docker_compose_deployment_yml
     end
 
     def puma
+      return unless build?('puma.rb')
       return nil unless @env.web_server == 'puma'
 
       content = template('puma.rb')
@@ -60,6 +71,7 @@ module Orchestration
     end
 
     def unicorn
+      return unless build?('unicorn.rb')
       return nil unless @env.web_server == 'unicorn'
 
       content = template('unicorn.rb')
@@ -70,6 +82,7 @@ module Orchestration
     end
 
     def database_yml
+      return unless build?('database.yml')
       return unless defined?(ActiveRecord)
 
       adapter = DockerCompose::ComposeConfiguration.database_adapter_name
@@ -79,22 +92,28 @@ module Orchestration
     end
 
     def mongoid_yml
+      return unless build?('mongoid.yml')
       return unless defined?(Mongoid)
 
       service_config('mongoid.yml', Services::Mongo::Configuration)
     end
 
     def rabbitmq_yml
+      return unless build?('rabbitmq.yml')
       return unless defined?(Bunny)
 
       service_config('rabbitmq.yml', Services::RabbitMQ::Configuration)
     end
 
     def env
+      return unless build?('.env')
+
       simple_copy('env', @env.root.join('.env'), overwrite: false)
     end
 
     def gitignore
+      return unless build?('.gitignore')
+
       path = @env.root.join('.gitignore')
       globs = %w[.build/ .deploy/ Gemfile Gemfile.lock docker-compose.local.yml]
       lines = %w[orchestration/.sidecar .env deploy.tar] + globs.map do |line|
@@ -106,6 +125,13 @@ module Orchestration
 
     private
 
+    def build?(filename)
+      return true unless ENV.key?('build')
+      return true if ENV.fetch('build') == filename
+
+      false
+    end
+
     def t(key)
       I18n.t("orchestration.#{key}")
     end

data/lib/orchestration/make/orchestration.mk

@@ -182,12 +182,18 @@ ifeq (,$(findstring deploy,$(MAKECMDGOALS)))
     ifeq (,${sidecar_suffix})
       $(warning Unable to generate project suffix; project name collisions may occur.)
     endif
-    compose_project_name = ${project_base}_${sidecar_suffix}
+    compose_project_name_base = ${project_base}_${sidecar_suffix}
   else
-    compose_project_name = ${project_base}
+    compose_project_name_base = ${project_base}
   endif
 else
-  compose_project_name = ${project_base}
+  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 \
@@ -196,6 +202,7 @@ compose_base:=env -i \
              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
@@ -449,6 +456,8 @@ 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}
@@ -456,6 +465,8 @@ ifndef dev
 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 \

data/lib/orchestration/templates/Dockerfile.erb

@@ -2,18 +2,24 @@ FROM ruby:<%= ruby_version %>
 ARG BUNDLE_BITBUCKET__ORG
 ARG BUNDLE_GITHUB__COM
 ARG GIT_COMMIT
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
- && apt-get update \
+ENV NODE_MAJOR=20
+RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      nodejs \
       gosu \
       sendmail \
+      ca-certificates \
+      curl \
+      gnupg \
+ && mkdir -p /etc/apt/keyrings \
+ && 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 \
  && 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 \
- && nvm install 14.16.0 \
  && npm config set user 0 \
  && npm config set unsafe-perm true \
  && npm install -g yarn<% end %>

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.14
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-30 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -399,6 +399,7 @@ files:
 - lib/orchestration/environment.rb
 - lib/orchestration/errors.rb
 - lib/orchestration/file_helpers.rb
+- lib/orchestration/healthcheck.bash
 - lib/orchestration/install_generator.rb
 - lib/orchestration/make.rb
 - lib/orchestration/make/orchestration.mk