orchestration 0.7.10 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aea7091859513085daaa652226e9e6e2eaad838f8cea0fc5e4f92baabf231d66
-  data.tar.gz: 01f656a8e0a4c94679ea1cede73a276345dd097254c8feee73ecf4d71c6ae0f8
+  metadata.gz: 20aff7348ec0fde4cf7a457138a2f4ea67f5467c25cde74757e6f1f1ebccd7d3
+  data.tar.gz: bd582b8b42c353ec86d2c3dadd8932dc24fe3123784dd62f1bdaa62eea934ac8
 SHA512:
-  metadata.gz: aac8c41311328ee9285d9d3172baed798ca89a17a9311c16bd2dfd75ff2ee9631b4f8b464c208d0e607cd9c488641e8cce33fc6988204d5812b4ac1abd428861
-  data.tar.gz: 6c5bd17caaa053100b721f78fe93620aa8579e55c141b35a477ce162ed1929bb10a2e073d2f4b8ca6e5ca3ffe110d862bab3bfdce1b33f332431fdd3d5fbef98
+  metadata.gz: be08355e64f4f66fe249a447b816c9f98d72f94a8c32ab79b22236700755f930aab6a6d1e3a481f9c7ae01b73c387bcc82516256bd61220e35be909bc58ed09f
+  data.tar.gz: 2166504bbb6fb34c349bf1e15c7a5f50107b65f7869accfbee6edccb9c9dc98d2b1c2bd65de9e9d8c75489867d803b5a8f485a814a1901e189f12d09fdfb9167

data/Gemfile.lock

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

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

@@ -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

@@ -2,20 +2,23 @@ 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 \
+ && 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 ./
@@ -23,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/version.rb

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

metadata

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