orchestration 0.6.11 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60c52d91f6eb17469c4244093217f7c37bdf083bc9b045e175869788178a9196
-  data.tar.gz: 2b70b8a444c78beb19ffbf9b2690349e942374c16ca36edecd714f33d798bae0
+  metadata.gz: 0eca537cffc7c1d04a9fee15b15d039e63f3ea64c29ca7384097ce5c3aeaedad
+  data.tar.gz: 00c16b6c7a3d5cf3fa4fdf160a3664ce294d8fd52b4fb875eac0780e5013a9cf
 SHA512:
-  metadata.gz: 03efb92b5de3ef15940464ae6e5ba5739c98c4b18d312490f70a497ed0e2fdc2f8094cc482301fe0f81e6667a254fc481783a9f5e349e98a4f0b598d54827640
-  data.tar.gz: bbc0087cd77db01f1a87f69222425a91ff2f5f8d204794795b4872d8f5157df208caa05343c5fed67bd1461633baa3aed344ebe2db52a82998932f32c215843a
+  metadata.gz: c1b0bd62ed5ce027fa5b3fd6e71891df96070c7b874fcdf90e86b9f4d13f3364105b05a456052dc8bed836ea96149ada3ee6b7ef875333b9af0ae22d8426404f
+  data.tar.gz: 16e33c0e81496d722b04c5f60d446aa8e506cb549f5f14c3d39d107eb74c03f79e95b76e8f9ed13f35188fcda58b465f6bfa7fd2fe355af0c0adde36bb4a8c22

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orchestration (0.6.11)
+    orchestration (0.6.13)
       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:
@@ -50,13 +50,14 @@ rake orchestration:install server=unicorn # (or 'puma' [default], etc.)
 
 To rebuild all build-out at any time, pass `force=yes` to the above install command.
 
-To rebuild just `orchestration/Makefile` (useful after upgrading the _Orchestration_ gem):
+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:makefile
+rake orchestration:install project=myapp organization=myorg
 ```
 
-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.
-
 #### 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

@@ -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,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?
 
@@ -149,6 +147,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.6.11'
+  VERSION = '0.6.13'
 end

metadata

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