et_full_system 6.0.0.pre.rc24 → 6.0.0.pre.rc25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95b33af6823341942cdaba84b6d9aa6f29d2878064a6fbe07cadd886e92fa49a
-  data.tar.gz: 0a3916cf274dfca304c3c48a864f61afd748b295cfabe8a6f6d1b553a0f37353
+  metadata.gz: c1d3a4c406708c9b931c6e193f37a4506063187618c88c3a8d3b93c1350f7a3e
+  data.tar.gz: 1a67f7bab5f463c8455b2eebd47936963a9824dddec84215574330210197e9d9
 SHA512:
-  metadata.gz: 9dc4497e9a265ba4e8aea5422698ef30a98ee09c6c83580e1110e5c0087dfb7c48e430ca81f6de9be6628f3b72b79274f96a2fda2409897af804b8f7043cab15
-  data.tar.gz: 4d3b3d67f1e7e46bc3531a3973f2215a9d08f6c3228ba58ad8557ab73c066820a0fb906c19a6853c763b4f9971c30d66a4ddc7cc8e3462c58efd42d7a4d3304b
+  metadata.gz: 5a87cc4092dd1655303b9163d42fa8352e64db88398657836c5f86666a4241363f4f28623b6aad4e7afbf5e3697ee212a397a6520ed64a81abe0ad9e3ad5b513
+  data.tar.gz: 550085fe24376dc44ff26c1ab54b6e6dd78cce7b442aef482032bc9365b930b372149eea864d1f9f8cb99f86063680106ce7857f5cf85f7f6dcafe7295c3e67e

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.rc25)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)

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.rc25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.rc24
+  version: 6.0.0.pre.rc25
 platform: ruby
 authors:
 - Gary Taylor