orchestration 0.7.11 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76a744cb6cc82929bcaea021634c1af4b7b34392659e1a3d799ddd61854e6dee
-  data.tar.gz: d42940c62fa5488a64cf3e6c245938de8d1cf8e47536fd9a0075903dcd54d272
+  metadata.gz: 88ac6c1abc38cd440da7fcb344b449d030c587c583628bdd449d02068f49522c
+  data.tar.gz: 6cd7f01dec6372ce5cc5eb2ed04ef6359ac5fa5869cf5736b39c0b611946b538
 SHA512:
-  metadata.gz: 0ad4095426917667b72150004b57525ffedaedf84be6c68b727ca782814c5a053a45f6e33c8cc36bcc95825863bbe36684862b3c31f501ad3938f40217d3f39e
-  data.tar.gz: fa5d209da39d650a7bbb52b786d900f3e5ebcce7ea69a9c662cbc3ddadbd318be82f3764d744420215a67e569436870c157ed244670d4471e00cdf16f9b8a23c
+  metadata.gz: e8a53799fecc687ab4121cd30409ebca199f355b549dfec2a19552c2975f3422f14b7180e6d964033b66c8410c4c047fd29503b16a45ca9b0c0cbbc93e71dbae
+  data.tar.gz: 9f50b1fc445b8e6110d8f1d8af5d22b7bce28723130c13289f03e7d55057c28790b1637eb9691fdb065bd51cb546c16ce184d1fedd9c146e2fb3e75798680a93

data/Gemfile.lock

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

data/lib/orchestration/environment.rb

@@ -30,7 +30,14 @@ module Orchestration
     end
 
     def mongo_url
-      ENV.fetch('MONGO_URL', nil)
+      case environment
+      when 'development'
+        ENV.fetch('DEVELOPMENT_MONGO_URL') { ENV.fetch('MONGO_URL', nil) }
+      when 'test'
+        ENV.fetch('TEST_MONGO_URL') { ENV.fetch('MONGO_URL', nil) }
+      else
+        ENV.fetch('MONGO_URL', nil)
+      end
     end
 
     def mongoid_configuration_path

data/lib/orchestration/make/orchestration.mk

@@ -386,14 +386,13 @@ tag:
 .PHONY: deploy
 deploy: _log-notify _clean-logs
 ifdef env_file
-deploy: env_file_option = --env-file ${env_file}
+deploy: env_file_option = . ${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: 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: 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: 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}'"

data/lib/orchestration/templates/Dockerfile.erb

@@ -15,14 +15,10 @@ RUN apt-get update \
  && 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 \
+ && 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 \
- && npm config set user 0 \
- && npm config set unsafe-perm true \
  && npm install -g yarn<% end %>
 WORKDIR /app
 COPY .build/Gemfile .build/Gemfile.lock ./
@@ -30,7 +26,7 @@ RUN bundle config set deployment 'true' \
  && bundle config set without 'development test' \
  && bundle install
 ADD .build/context.tar .
-<% 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 %>
+<% 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 %>
 RUN echo "${GIT_COMMIT}" > /app/GIT_COMMIT
 HEALTHCHECK --interval=<%= healthcheck['interval'] %> \
             --timeout=<%= healthcheck['timeout'] %> \

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

@@ -1,12 +1,12 @@
 development:
   clients:
     default:
-      uri: <%= "#{'<' + '%' + '='} ENV.fetch('MONGO_URL', 'mongodb://127.0.0.1:#{compose.call('development').local_port('mongo')}/development_db') #{'%' + '>'}" %>
+      uri: <%= "#{'<' + '%' + '='} ENV.fetch('DEVELOPMENT_MONGO_URL', 'mongodb://127.0.0.1:#{compose.call('development').local_port('mongo')}/development') #{'%' + '>'}" %>
 
 test:
   clients:
     default:
-      uri: <%= "#{'<' + '%' + '='} ENV.fetch('MONGO_URL', 'mongodb://127.0.0.1:#{compose.call('test').local_port('mongo')}/test_db') #{'%' + '>'}" %>
+      uri: <%= "#{'<' + '%' + '='} ENV.fetch('TEST_MONGO_URL', 'mongodb://127.0.0.1:#{compose.call('test').local_port('mongo')}/test') #{'%' + '>'}" %>
 
 production:
   clients:

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.13
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url