orchestration 0.7.9 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7f2c48f8cea2252de2052ebe5f7f5a668b1fc61163cc08e299f14c0029dce8e
-  data.tar.gz: b886c269f560b78e6123285b476dd30ceee7c234a530e5ba6bbfc5eeb83b9e2a
+  metadata.gz: 76a744cb6cc82929bcaea021634c1af4b7b34392659e1a3d799ddd61854e6dee
+  data.tar.gz: d42940c62fa5488a64cf3e6c245938de8d1cf8e47536fd9a0075903dcd54d272
 SHA512:
-  metadata.gz: 4d4e59b7abdeabc3b354b6826a5d3fcceb8f4dcdfd7ce76008e765a6a94e334a335589374ee5dca2da7ee762ffc615c9d789ad469149cdadca25408c958c986e
-  data.tar.gz: b17ebc5095a553993b64df89d56671cc61852d136e1dcc8c1a0217d74a4cd355d9d513401259e59143158ce91c220a765ad17083c66c596a190b10fb4904fd14
+  metadata.gz: 0ad4095426917667b72150004b57525ffedaedf84be6c68b727ca782814c5a053a45f6e33c8cc36bcc95825863bbe36684862b3c31f501ad3938f40217d3f39e
+  data.tar.gz: fa5d209da39d650a7bbb52b786d900f3e5ebcce7ea69a9c662cbc3ddadbd318be82f3764d744420215a67e569436870c157ed244670d4471e00cdf16f9b8a23c

data/Gemfile.lock

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

data/README.md

@@ -31,13 +31,13 @@ Add _Orchestration_ to your `Gemfile`:
 _Ruby 3.x_:
 
 ```ruby
-gem 'orchestration', '~> 0.7.3'
+gem 'orchestration', '~> 0.7.9'
 ```
 
 _Ruby 2.x_:
 
 ```ruby
-gem 'orchestration', '~> 0.6.7'
+gem 'orchestration', '~> 0.6.12'
 ```
 
 Install:

data/lib/orchestration/docker_compose/app_service.rb

@@ -30,7 +30,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,28 +92,35 @@ 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 redis_yml
+      return unless build?('redis.yml')
       return unless defined?(::Redis)
 
       service_config('redis.yml', Services::Redis::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|
@@ -112,6 +132,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

@@ -449,6 +449,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 +458,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,25 @@ 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 \
+      cron \
+      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.7.9'
+  VERSION = '0.7.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.11
 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
@@ -414,6 +414,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