et_full_system 6.0.0.pre.rc24 → 6.0.0.pre.rc25
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c1d3a4c406708c9b931c6e193f37a4506063187618c88c3a8d3b93c1350f7a3e
|
4
|
+
data.tar.gz: 1a67f7bab5f463c8455b2eebd47936963a9824dddec84215574330210197e9d9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5a87cc4092dd1655303b9163d42fa8352e64db88398657836c5f86666a4241363f4f28623b6aad4e7afbf5e3697ee212a397a6520ed64a81abe0ad9e3ad5b513
|
7
|
+
data.tar.gz: 550085fe24376dc44ff26c1ab54b6e6dd78cce7b442aef482032bc9365b930b372149eea864d1f9f8cb99f86063680106ce7857f5cf85f7f6dcafe7295c3e67e
|
data/Gemfile.lock
CHANGED
@@ -21,7 +21,7 @@ module EtFullSystem
|
|
21
21
|
def setup
|
22
22
|
unbundled do
|
23
23
|
gem_root = File.absolute_path('../../..', __dir__)
|
24
|
-
cmd = "/bin/bash --login -c \"cd /home/app/full_system && et_full_system docker bootstrap && et_full_system local setup\""
|
24
|
+
cmd = "/bin/bash --login -c \"cd /home/app/full_system && et_full_system docker bootstrap && et_full_system local setup --in-docker-compose\""
|
25
25
|
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}"
|
26
26
|
puts compose_cmd
|
27
27
|
exec(compose_cmd)
|
@@ -55,7 +55,7 @@ module EtFullSystem
|
|
55
55
|
|
56
56
|
def setup_azure_storage
|
57
57
|
unbundled do
|
58
|
-
puts `bash --login -c "export RAILS_ENV=production && cd systems/api &&
|
58
|
+
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"`
|
59
59
|
|
60
60
|
end
|
61
61
|
end
|
@@ -130,9 +130,10 @@ module EtFullSystem
|
|
130
130
|
desc "setup", "Sets up everything ready for first run"
|
131
131
|
method_option :rails_env, type: :string, default: ENV.fetch('RAILS_ENV', 'production')
|
132
132
|
method_option :cloud_provider, type: :string, default: ENV.fetch('CLOUD_PROVIDER', 'amazon')
|
133
|
+
method_option :in_docker_compose, type: :boolean, default: false, desc: 'Set to true to assume certain services are in docker compose'
|
133
134
|
def setup
|
134
135
|
setup_depencencies
|
135
|
-
setup_ruby_versions
|
136
|
+
setup_ruby_versions unless options.in_docker_compose?
|
136
137
|
setup_services
|
137
138
|
end
|
138
139
|
|