orchestration 0.6.16 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9495b1f5ce01552fda9a9fb5db75ad58cc9870c06a010093b0de05d8c572f1ab
-  data.tar.gz: 2e0be60722c04f7a75c622f2be88a08152253247f61179f740e9722dbce64f8f
+  metadata.gz: 7891efd1c4930036b2245fad46bc9bc78c0de97b3c2cce26ede48d5a6de34a2c
+  data.tar.gz: c56d7d3193fd6cafe76dc823924bcc1ba74fda288090d1424bfdce148789cb51
 SHA512:
-  metadata.gz: 15a39a36a88488f993306387b31a229c74ab30f66360143bc17bcbe3f075073fbd301887530b976a36f9a9b8970e44b250ff1b7c3d82f64f62ed71d2633ba231
-  data.tar.gz: 961da484694bc593a1ffac5e78e9fb1b1f7df74071b043821806d07bde6519c057f1835dcc1824cf0bb3921eb412f006c66af5478441ffb2b67b48e3f28138a7
+  metadata.gz: c82db0ac9646d8b93ad2ef72cff3216106e8558f670c086cd0647f5496559f0a0c32309b8e2680323e627345a9f6da9f2745d4d67a5a1d8d1e7a56d2fc91417c
+  data.tar.gz: c0fc26b8ea7f66f7a50b52de3991fe5f4a99ec73b9186312e397fce229c184f8bdf8182d8bca991a79cb5b95f24ed3ce1907048bf27dceff482437129ce18ad4

data/.gitignore

@@ -9,6 +9,8 @@
 # rspec failure tracking
 .rspec_status
 
+Gemfile.lock
+
 *.swp
 *.swo
 
@@ -32,3 +34,5 @@ docker/.build/
 docker/.context.tar
 
 .DS_Store
+
+.ruby-version

data/.strong_versions.yml

@@ -1,3 +1,4 @@
 ignore:
   - i18n
   - rails
+  - activerecord

data/README.md

@@ -26,10 +26,18 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 
 ### Install
 
-Add _Orchestration_ to your Gemfile:
+Add _Orchestration_ to your `Gemfile`:
+
+_Ruby 3.x_:
+
+```ruby
+gem 'orchestration', '~> 0.7.0'
+```
+
+_Ruby 2.x_:
 
 ```ruby
-gem 'orchestration', '~> 0.6.12'
+gem 'orchestration', '~> 0.6.6'
 ```
 
 Install:
@@ -52,12 +60,6 @@ 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.
@@ -163,15 +165,30 @@ make push
 
 ### Development
 
-A [`.env` file](https://docs.docker.com/compose/env-file/) is created automatically in your project root. This file is _not_ stored in version control. Set all application environment variables in this file.
+An [`.env` file](https://docs.docker.com/compose/env-file/) is created automatically in your project root. This file is _not_ stored in version control. Set all application environment variables in this file.
 
 #### Launching a development server
 
-Use vanilla _Rails_ commands to load a server or console. If present, a `.env` file will be read and loaded (via the [dotenv](https://github.com/bkeepers/dotenv) gem) to populate the environment.
+To load all variables from `.env` and launch a development server, run the following command:
 
 ```bash
-bundle exec rails s # Launch a server
-bundle exec rails c # Launch a console
+make serve
+```
+
+To load a _Rails_ console:
+```bash
+make console
+```
+
+The application environment will be output on launch for convenience.
+
+To pass extra commands to the _Rails_ server:
+```bash
+# Custom server, custom port
+make serve server='webrick -p 3001'
+
+# Default server, custom port, custom bind address
+make serve server='-p 3001 -b 192.168.0.1'
 ```
 
 ### Testing

data/lib/orchestration/docker_compose/app_service.rb

@@ -29,7 +29,7 @@ module Orchestration
 
         def healthcheck
           {
-            'test' => ['/app/orchestration/healthcheck'],
+            'test' => ['bundle', 'exec', 'rake', 'orchestration:healthcheck'],
             # Defaults according to
             # https://docs.docker.com/engine/reference/builder/#healthcheck
             # Except start_period which cannot be set to 0s
@@ -54,7 +54,7 @@ module Orchestration
           raise ArgumentError,
                 I18n.t(
                   'orchestration.rake.app.unspported_web_server',
-                  server: server,
+                  server:,
                   expected: %w[puma unicorn]
                 )
         end

data/lib/orchestration/docker_compose/compose_configuration.rb

@@ -77,7 +77,7 @@ module Orchestration
         # '{sidecar-27018:}27017' => '27018:27017'
         local, _, remote = mapping.sub(/\${sidecar-(\d+):}/, '\1:')
                                   .partition(':')
-        { local: local, remote: remote }
+        { local:, remote: }
       end
     end
   end

data/lib/orchestration/environment.rb

@@ -9,7 +9,7 @@ module Orchestration
     def environment
       return @environment unless @environment.nil?
 
-      ENV.fetch('RAILS_ENV') { ENV.fetch('RACK_ENV', 'development') }
+      ENV.fetch('RAILS_ENV', nil) || ENV.fetch('RACK_ENV', nil) || 'development'
     end
 
     def web_server
@@ -20,9 +20,9 @@ module Orchestration
     def database_url
       case environment
       when 'development'
-        ENV.fetch('DEVELOPMENT_DATABASE_URL') { ENV.fetch('DATABASE_URL', nil) }
+        ENV.fetch('DEVELOPMENT_DATABASE_URL', nil) || ENV.fetch('DATABASE_URL', nil)
       when 'test'
-        ENV.fetch('TEST_DATABASE_URL') { ENV.fetch('DATABASE_URL', nil) }
+        ENV.fetch('TEST_DATABASE_URL', nil) || ENV.fetch('DATABASE_URL', nil)
       else
         ENV.fetch('DATABASE_URL', nil)
       end

data/lib/orchestration/file_helpers.rb

@@ -6,7 +6,7 @@ module Orchestration
 
     def orchestration_dir
       path = @env.orchestration_root
-      FileUtils.mkdir_p(path)
+      FileUtils.mkdir(path) unless Dir.exist?(path)
 
       path
     end
@@ -95,9 +95,9 @@ module Orchestration
     end
 
     def ensure_line_in_file(path, line, echo: true, regex: nil)
-      return if line_in_file?(path, line: line, regex: regex)
+      return if line_in_file?(path, line:, regex:)
 
-      append_file(path, "\n#{line.chomp}\n", echo: echo)
+      append_file(path, "\n#{line.chomp}\n", echo:)
       true
     end
 
@@ -131,7 +131,7 @@ module Orchestration
 
     def force?
       # Rake task was invoked with `force=yes`
-      ENV['force'] == 'yes'
+      ENV.fetch('force', nil) == 'yes'
     end
   end
 end

data/lib/orchestration/install_generator.rb

@@ -17,10 +17,10 @@ module Orchestration
     end
 
     def orchestration_configuration
-      return unless build?('.orchestration.yml')
-
-      configure_orchestration_settings
-      relpath = relative_path(@env.orchestration_configuration_path)
+      path = @env.orchestration_configuration_path
+      @terminal.ask_setting('docker.organization')
+      @terminal.ask_setting('docker.repository', @env.default_app_name)
+      relpath = relative_path(path)
       return @terminal.write(:create, relpath) unless @settings.exist? || force?
       return @terminal.write(:update, relpath) if @settings.dirty?
 
@@ -28,15 +28,11 @@ 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,
@@ -45,8 +41,6 @@ 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)
@@ -54,15 +48,12 @@ 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')
@@ -71,18 +62,16 @@ module Orchestration
     end
 
     def unicorn
-      return unless build?('unicorn.rb')
       return nil unless @env.web_server == 'unicorn'
 
       content = template('unicorn.rb')
       path = @env.root.join('config', 'unicorn.rb')
       create_file(path, content, backup: true)
       regex = /gem\s+['"]unicorn['"]/
-      ensure_line_in_file(gemfile_path, "gem 'unicorn'", regex: regex)
+      ensure_line_in_file(gemfile_path, "gem 'unicorn'", regex:)
     end
 
     def database_yml
-      return unless build?('database.yml')
       return unless defined?(ActiveRecord)
 
       adapter = DockerCompose::ComposeConfiguration.database_adapter_name
@@ -92,28 +81,22 @@ 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|
@@ -125,13 +108,6 @@ 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
@@ -173,19 +149,6 @@ 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

@@ -2,8 +2,7 @@
 ### Environment setup ###
 SHELL:=/bin/bash
 MAKE:=mkpath=${mkpath} make --no-print-directory
-ORCHESTRATION_DISABLE_ENV=1
-export
+
 TERM ?= 'dumb'
 pwd:=$(shell pwd)
 
@@ -53,14 +52,14 @@ 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)
+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}")
+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
@@ -108,9 +107,7 @@ endif
 ifneq (${env},test)
   ifeq (,$(findstring test,$(MAKECMDGOALS)))
     ifeq (,$(findstring deploy,$(MAKECMDGOALS)))
-      ifeq (,$(findstring setup,$(MAKECMDGOALS)))
-        -include ${env_path}
-      endif
+      -include ${env_path}
     endif
   endif
 endif
@@ -125,9 +122,7 @@ ifneq (,$(findstring test,$(MAKECMDGOALS)))
   env=test
 endif
 
-ifneq (,$(RAILS_ENV))
-  env=$(RAILS_ENV)
-else ifneq (,$(env))
+ifneq (,$(env))
   # `env` set by current shell.
 else ifneq (,$(RAILS_ENV))
   env=$(RAILS_ENV)
@@ -143,7 +138,7 @@ 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
+rake=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)))
@@ -182,39 +177,32 @@ ifeq (,$(findstring deploy,$(MAKECMDGOALS)))
     ifeq (,${sidecar_suffix})
       $(warning Unable to generate project suffix; project name collisions may occur.)
     endif
-    compose_project_name_base = ${project_base}_${sidecar_suffix}
+    compose_project_name = ${project_base}_${sidecar_suffix}
   else
-    compose_project_name_base = ${project_base}
+    compose_project_name = ${project_base}
   endif
 else
-  compose_project_name_base = ${project_base}
+  compose_project_name = ${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)" \
+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))
+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)
+  git_version ?= $(shell git rev-parse --short --verify ${git_branch} 2>/dev/null || echo no-version)
 else
-  git_version := dev
+  git_version = dev
 endif
 
-docker_image:=${docker_organization}/${docker_repository}:${git_version}
+docker_image=${docker_organization}/${docker_repository}:${git_version}
 
 compose=${compose_base}
 compose_human=docker-compose -f ${orchestration_dir_name}/docker-compose.${env}.yml
@@ -228,16 +216,11 @@ 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
+start: _create-log-directory _clean-logs
 ifneq (,${compose_services})
 	@$(call system,${compose_human} up --detach)
 ifeq (${env},$(filter ${env},test development))
@@ -322,7 +305,7 @@ db-console:
 
 .PHONY: setup
 ifneq (,$(wildcard config/database.yml))
-setup: url := $(shell ${rake} orchestration:db:url RAILS_ENV=${env} 2>/dev/null)
+setup: url = $(shell ${rake} orchestration:db:url RAILS_ENV=${env} 2>/dev/null)
 endif
 setup: _log-notify
 	@$(call echo,Setting up ${env_human} environment)
@@ -330,16 +313,16 @@ setup: _log-notify
 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}
+	@${rake} db:create RAILS_ENV=${env} ${log} || : ${log}
   ifneq (,$(wildcard db/structure.sql))
-	@$(call system,rake db:structure:load RAILS_ENV="${env}" ${url_prefix}DATABASE_URL="${url}")
+	@$(call system,rake db:structure:load RAILS_ENV="${env}" 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}")
+	@$(call system,rake db:schema:load RAILS_ENV="${env}" 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}
+	@$(call system,rake db:migrate RAILS_ENV="${env}" DATABASE_URL="${url}")
+	@${rake} db:migrate RAILS_ENV=${env} ${log} || ${exit_fail}
 endif
 	@if $(MAKE) -n post-setup >/dev/null 2>&1; then \
           $(call system,make post-setup RAILS_ENV="${env}") \
@@ -393,13 +376,14 @@ tag:
 .PHONY: deploy
 deploy: _log-notify _clean-logs
 ifdef env_file
-deploy: env_file_option = . ${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: 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: 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}'"
@@ -455,8 +439,6 @@ 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}
@@ -464,8 +446,6 @@ 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/make.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 
-ENV['ORCHESTRATION_DISABLE_ENV'] = '1'
-
 require 'orchestration'
 puts Orchestration.makefile

data/lib/orchestration/services/database/configuration.rb

@@ -21,10 +21,10 @@ module Orchestration
         def settings(healthcheck: false)
           {
             adapter: adapter.name,
-            host: host,
-            port: port,
-            username: username,
-            password: password,
+            host:,
+            port:,
+            username:,
+            password:,
             database: healthcheck ? adapter.credentials['database'] : database
           }.transform_keys(&:to_s)
         end
@@ -64,7 +64,7 @@ module Orchestration
           return {} unless File.exist?(database_configuration_path) || custom?
 
           yaml = ERB.new(File.read(database_configuration_path)).result
-          YAML.safe_load(yaml, [], [], true)[@env.environment] || {}
+          YAML.safe_load(yaml, aliases: true)[@env.environment] || {}
         end
 
         def url_config

data/lib/orchestration/services/mixins/configuration_base.rb

@@ -74,7 +74,7 @@ module Orchestration
 
       def yaml(content)
         # Whitelist `Symbol` and permit aliases:
-        YAML.safe_load(content, [Symbol], [], true)
+        YAML.safe_load(content, permitted_classes: [Symbol], aliases: true)
       end
     end
   end

data/lib/orchestration/services/mixins/http_healthcheck.rb

@@ -19,7 +19,7 @@ module Orchestration
 
       def connection_error(code)
         raise HTTPConnectionError,
-              I18n.t('orchestration.http.connection_error', code: code)
+              I18n.t('orchestration.http.connection_error', code:)
       end
 
       def connection_error?(code)

data/lib/orchestration/services/mongo/configuration.rb

@@ -64,7 +64,7 @@ module Orchestration
           return {} unless File.exist?(@env.mongoid_configuration_path)
 
           yaml = File.read(@env.mongoid_configuration_path)
-          config = YAML.safe_load(yaml, [], [], true)
+          config = YAML.safe_load(yaml, aliases: true)
           env = config.fetch(@env.environment, nil)
           return {} if env.nil?
 

data/lib/orchestration/templates/Dockerfile.erb

@@ -2,22 +2,20 @@ FROM ruby:<%= ruby_version %>
 ARG BUNDLE_BITBUCKET__ORG
 ARG BUNDLE_GITHUB__COM
 ARG GIT_COMMIT
-ENV NODE_MAJOR=20
-RUN apt-get update \
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
+ && 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 \
- && 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 \
+ && nvm install 14.16.0 \
+ && npm config set user 0 \
+ && npm config set unsafe-perm true \
  && npm install -g yarn<% end %>
 WORKDIR /app
 COPY .build/Gemfile .build/Gemfile.lock ./
@@ -25,7 +23,7 @@ RUN bundle config set deployment 'true' \
  && bundle config set without 'development test' \
  && bundle install
 ADD .build/context.tar .
-<% 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 %>
+<% 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 %>
 RUN echo "${GIT_COMMIT}" > /app/GIT_COMMIT
 HEALTHCHECK --interval=<%= healthcheck['interval'] %> \
             --timeout=<%= healthcheck['timeout'] %> \

data/lib/orchestration/templates/rabbitmq.yml.erb

@@ -12,4 +12,4 @@ test:
 
 production:
   url: <%%= ENV['RABBITMQ_URL'] %>
-  management_url: <%%= ENV['RABBITMQ_MANAGEMENT_URL'] %>
+  url: <%%= ENV['RABBITMQ_MANAGEMENT_URL'] %>

data/lib/orchestration/terminal.rb

@@ -39,19 +39,14 @@ module Orchestration
       result
     end
 
-    def ask_setting(setting, default: nil, override: nil)
+    def ask_setting(setting, default = 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")
       @settings.set(setting, read(prompt, default))
     end
 
-    def print_variable(variable, value)
-      $stderr.print "#{Paint[variable, :blue]}#{Paint['=', :white]}#{Paint[value, :cyan]}"
-    end
-
     private
 
     def prompt(message, default)

data/lib/orchestration/version.rb

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