orchestration 0.7.8 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c7e9edb1bd0c867ecf0ec2e04843a9088da9094a58db4a5316d232f08852383
-  data.tar.gz: de0f1c365a23e2d88ee01f108800801ee261765d756cff2d28bf548d0d3c9c06
+  metadata.gz: aea7091859513085daaa652226e9e6e2eaad838f8cea0fc5e4f92baabf231d66
+  data.tar.gz: 01f656a8e0a4c94679ea1cede73a276345dd097254c8feee73ecf4d71c6ae0f8
 SHA512:
-  metadata.gz: dcd287e55fddb78b737ae52a8c5af3e632c34cb55391aa7ea14593f501c1935e66e9070064c83b251a408326b3f31099b9bcbc3c56f76123e5a3da6e47a4ef02
-  data.tar.gz: cf2f763a19c10b0717c2918ebd996371e0b3445db287833b14d66cef07e4737f183692944d5f1b468436fb6775a786a64ad4866ab843e04f9f7009ee3ffb610f
+  metadata.gz: aac8c41311328ee9285d9d3172baed798ca89a17a9311c16bd2dfd75ff2ee9631b4f8b464c208d0e607cd9c488641e8cce33fc6988204d5812b4ac1abd428861
+  data.tar.gz: 6c5bd17caaa053100b721f78fe93620aa8579e55c141b35a477ce162ed1929bb10a2e073d2f4b8ca6e5ca3ffe110d862bab3bfdce1b33f332431fdd3d5fbef98

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orchestration (0.7.8)
+    orchestration (0.7.10)
       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:
@@ -60,6 +60,12 @@ To rebuild all build-out at any time, pass `force=yes` to the above install comm
 
 You will be prompted to enter values for your _Docker_ organisation and repository name. For example, the _organisation_ and _repository_ for https://hub.docker.com/r/rubyorchestration/sampleapp are `rubyorchestration` and `sampleapp` respectively. If you are unsure of these values, they can be modified later by editing `.orchestration.yml` in the root of your project directory.
 
+Override these values from the command line by passing `project` and `organization` variables:
+
+```bash
+rake orchestration:install project=myapp organization=myorg
+```
+
 #### Configuration files
 
 _Orchestration_ generates the following files where appropriate. Backups are created if a file is replaced.

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,10 +17,8 @@ module Orchestration
     end
 
     def orchestration_configuration
-      path = @env.orchestration_configuration_path
-      @terminal.ask_setting('docker.organization')
-      @terminal.ask_setting('docker.repository', @env.default_app_name)
-      relpath = relative_path(path)
+      configure_orchestration_settings
+      relpath = relative_path(@env.orchestration_configuration_path)
       return @terminal.write(:create, relpath) unless @settings.exist? || force?
       return @terminal.write(:update, relpath) if @settings.dirty?
 
@@ -155,6 +153,19 @@ module Orchestration
         healthcheck: DockerCompose::AppService.healthcheck
       )
     end
+
+    def configure_orchestration_settings
+      @terminal.ask_setting(
+        'docker.organization',
+        override: ENV.fetch('organization', nil)
+      )
+
+      @terminal.ask_setting(
+        'docker.repository',
+        default: @env.default_app_name,
+        override: ENV.fetch('project', nil)
+      )
+    end
   end
   # rubocop:enable Metrics/ClassLength
 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/terminal.rb

@@ -39,8 +39,9 @@ module Orchestration
       result
     end
 
-    def ask_setting(setting, default = nil)
+    def ask_setting(setting, default: nil, override: nil)
       return unless @settings.get(setting).nil?
+      return @settings.set(setting, override) unless override.nil?
 
       write(:setup, t("settings.#{setting}.description"))
       prompt = t("settings.#{setting}.prompt")

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.10
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-10-12 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