et_full_system 6.0.0.pre.rc24 → 6.0.0.pre.rc28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95b33af6823341942cdaba84b6d9aa6f29d2878064a6fbe07cadd886e92fa49a
-  data.tar.gz: 0a3916cf274dfca304c3c48a864f61afd748b295cfabe8a6f6d1b553a0f37353
+  metadata.gz: f662d434ca524a4c044be580c81f246bd3a35c2d4246326e4aa8a0bf0da8c55f
+  data.tar.gz: ccfcc2454c874e39e816b5512a1e06fbf11392e2b2046dbbb5ebd6aae0b82ee9
 SHA512:
-  metadata.gz: 9dc4497e9a265ba4e8aea5422698ef30a98ee09c6c83580e1110e5c0087dfb7c48e430ca81f6de9be6628f3b72b79274f96a2fda2409897af804b8f7043cab15
-  data.tar.gz: 4d3b3d67f1e7e46bc3531a3973f2215a9d08f6c3228ba58ad8557ab73c066820a0fb906c19a6853c763b4f9971c30d66a4ddc7cc8e3462c58efd42d7a4d3304b
+  metadata.gz: a9e4e9191e1b115a59aea93875eaa6248347e48e342b7116d79451670c5c8b24f67a868a09ced1785c6f4ce8f593df331cf571c6a24cc77061a3d6cf40946e02
+  data.tar.gz: da3d47fa7f5c075280f3bc5633414ec093cf5ddf0a6dee59215423fb28ff42818507f079d9881ec5e784772f57fe2838ea1b160e5d6450955e411aba6f18c4b6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (6.0.0.pre.rc24)
+    et_full_system (6.0.0.pre.rc28)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)

data/docker/build/run

@@ -1,9 +1,2 @@
 #!/usr/bin/env bash
-cd /home/app/full_system/systems/et1 && bundle && bundle exec rails db:create db:migrate && \
-cd /home/app/full_system/systems/et3 && bundle && bundle exec rails db:create db:migrate && \
-cd /home/app/full_system/systems/api && bundle && bundle exec rails db:create db:migrate db:seed && \
-cd /home/app/full_system/systems/admin && bundle && bundle exec rails db:seed && \
-cd /home/app/full_system/systems/atos && bundle && \
-cd /home/app/full_system/systems/et_ccd_export && bundle && \
-sleep 60
 

data/foreman/.env

@@ -4,6 +4,7 @@ DB_USERNAME=postgres
 REDIS_HOST=${REDIS_HOST}
 REDIS_PORT=6379
 RAILS_LOG_TO_STDOUT='true'
+RAILS_LOG_LEVEL=debug
 WEB_CONCURRENCY=1
 SECRET_KEY_BASE=sdlkjewfkjhfviuhduihenrjk435r89esfd7cv983qh2n4r3q27yh4u5rtfg
 SMTP_HOSTNAME='mail.et.127.0.0.1.nip.io'

data/foreman/ComposeProcfile

@@ -1,5 +1,5 @@
-et1_web:  export godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et1.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/et1 && bundle exec iodine -port $PORT"
-et3_web:  godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et3.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system && cd systems/et3 && bundle exec iodine -port $PORT"
+et1_web:  export godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et1.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/et1 && bundle exec iodine -port $PORT > /home/app/et1.log"
+et3_web:  godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et3.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/et3 && bundle exec iodine -port $PORT"
 api_web: godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_api.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/api && bundle exec iodine -port $PORT"
 admin_web: godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_admin.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/admin && bundle exec iodine -port $PORT"
 atos_api_web: godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_atos.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/atos && bundle exec iodine -port $PORT"

data/lib/et_full_system/cli/docker.rb

@@ -21,7 +21,7 @@ module EtFullSystem
     def setup
       unbundled do
         gem_root = File.absolute_path('../../..', __dir__)
-        cmd = "/bin/bash --login -c \"cd /home/app/full_system && et_full_system docker bootstrap && et_full_system local setup\""
+        cmd = "/bin/bash --login -c \"cd /home/app/full_system && et_full_system docker bootstrap && et_full_system local setup --in-docker-compose\""
         compose_cmd = "UID=#{Process.uid} GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
         puts compose_cmd
         exec(compose_cmd)

data/lib/et_full_system/cli/local/file_storage.rb

@@ -55,7 +55,7 @@ module EtFullSystem
 
         def setup_azure_storage
           unbundled do
-            puts `bash --login -c "export RAILS_ENV=production && cd systems/api && rvm use && dotenv -f \"#{GEM_PATH}/foreman/.env\" dotenv -f \"#{GEM_PATH}/foreman/et_api.env\" bundle exec rails configure_azure_storage_containers configure_azure_storage_cors"`
+            puts `bash --login -c "export RAILS_ENV=production && cd systems/api && godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_api.env\" bundle exec rails configure_azure_storage_containers configure_azure_storage_cors"`
 
           end
         end

data/lib/et_full_system/cli/local.rb

@@ -130,9 +130,10 @@ module EtFullSystem
     desc "setup", "Sets up everything ready for first run"
     method_option :rails_env, type: :string, default: ENV.fetch('RAILS_ENV', 'production')
     method_option :cloud_provider, type: :string, default: ENV.fetch('CLOUD_PROVIDER', 'amazon')
+    method_option :in_docker_compose, type: :boolean, default: false, desc: 'Set to true to assume certain services are in docker compose'
     def setup
       setup_depencencies
-      setup_ruby_versions
+      setup_ruby_versions unless options.in_docker_compose?
       setup_services
     end
 

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "6.0.0.pre.rc24"
+  VERSION = "6.0.0.pre.rc28"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.rc24
+  version: 6.0.0.pre.rc28
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor