et_full_system 6.0.0.pre.rc21 → 6.0.0.pre.rc25
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +2 -2
- data/docker/docker-compose.yml +15 -13
- data/lib/et_full_system/cli/docker.rb +1 -1
- data/lib/et_full_system/cli/local/file_storage.rb +1 -1
- data/lib/et_full_system/cli/local.rb +2 -1
- data/lib/et_full_system/version.rb +1 -1
- metadata +2 -2
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
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
et_full_system (6.0.0.pre.
|
4
|
+
et_full_system (6.0.0.pre.rc25)
|
5
5
|
aws-sdk-s3 (~> 1.9)
|
6
6
|
azure-storage (~> 0.15.0.preview)
|
7
7
|
dotenv (~> 2.7, >= 2.7.2)
|
@@ -24,7 +24,7 @@ GEM
|
|
24
24
|
addressable (2.8.0)
|
25
25
|
public_suffix (>= 2.0.2, < 5.0)
|
26
26
|
aws-eventstream (1.2.0)
|
27
|
-
aws-partitions (1.
|
27
|
+
aws-partitions (1.533.0)
|
28
28
|
aws-sdk-core (3.122.1)
|
29
29
|
aws-eventstream (~> 1, >= 1.0.2)
|
30
30
|
aws-partitions (~> 1, >= 1.525.0)
|
data/docker/docker-compose.yml
CHANGED
@@ -4,16 +4,19 @@ services:
|
|
4
4
|
# The official v2 Traefik docker image
|
5
5
|
image: traefik:v2.5
|
6
6
|
# Enables the web UI and tells Traefik to listen to docker
|
7
|
-
command: --api.insecure=true --providers.docker
|
7
|
+
command: --api.insecure=true --providers.docker --entryPoints.http.address=:3100 --entryPoints.traefik.address=:3200
|
8
8
|
ports:
|
9
|
-
- "3100:
|
9
|
+
- "3100:3100"
|
10
10
|
# The Web UI (enabled by --api.insecure=true)
|
11
|
-
- "3200:
|
11
|
+
- "3200:3200"
|
12
12
|
volumes:
|
13
13
|
# So that Traefik can listen to the Docker events
|
14
14
|
- /var/run/docker.sock:/var/run/docker.sock
|
15
15
|
networks:
|
16
|
-
|
16
|
+
et_full_system:
|
17
|
+
aliases:
|
18
|
+
- s3.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
|
19
|
+
|
17
20
|
links:
|
18
21
|
- db
|
19
22
|
- redis
|
@@ -103,7 +106,6 @@ services:
|
|
103
106
|
- admin.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
|
104
107
|
- et1.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
|
105
108
|
- et3.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
|
106
|
-
- s3.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
|
107
109
|
- azure_blob_storage.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
|
108
110
|
- azure.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
|
109
111
|
- atos.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
|
@@ -120,19 +122,19 @@ services:
|
|
120
122
|
- traefik.http.routers.api-router.service=api-service
|
121
123
|
- traefik.http.services.api-service.loadbalancer.server.port=4002
|
122
124
|
- traefik.http.routers.admin-router.rule=Host(`admin.et.127.0.0.1.nip.io`)
|
123
|
-
- traefik.http.routers.admin-router.service=
|
125
|
+
- traefik.http.routers.admin-router.service=admin-service
|
124
126
|
- traefik.http.services.admin-service.loadbalancer.server.port=4003
|
125
127
|
- traefik.http.routers.atos-router.rule=Host(`atos.et.127.0.0.1.nip.io`)
|
126
|
-
- traefik.http.routers.atos-router.service=
|
128
|
+
- traefik.http.routers.atos-router.service=atos-service
|
127
129
|
- traefik.http.services.atos-service.loadbalancer.server.port=4004
|
128
130
|
- traefik.http.routers.acas-router.rule=Host(`acas.et.127.0.0.1.nip.io`)
|
129
|
-
- traefik.http.routers.acas-router.service=
|
131
|
+
- traefik.http.routers.acas-router.service=acas-service
|
130
132
|
- traefik.http.services.acas-service.loadbalancer.server.port=4005
|
131
133
|
- traefik.http.routers.ccd-router.rule=Host(`ccd.et.127.0.0.1.nip.io`)
|
132
|
-
- traefik.http.routers.ccd-router.service=
|
134
|
+
- traefik.http.routers.ccd-router.service=ccd-service
|
133
135
|
- traefik.http.services.ccd-service.loadbalancer.server.port=4006
|
134
136
|
- traefik.http.routers.notify-router.rule=Host(`notify.et.127.0.0.1.nip.io`)
|
135
|
-
- traefik.http.routers.notify-router.service=
|
137
|
+
- traefik.http.routers.notify-router.service=notify-service
|
136
138
|
- traefik.http.services.notify-service.loadbalancer.server.port=4007
|
137
139
|
|
138
140
|
#command: bash -lc "cd /home/app/full_system/systems/api && REDIS_DATABASE=2 bundle exec sidekiq"
|
@@ -156,7 +158,7 @@ services:
|
|
156
158
|
image: minio/minio
|
157
159
|
labels:
|
158
160
|
- traefik.http.routers.s3-router.rule=Host(`s3.et.127.0.0.1.nip.io`)
|
159
|
-
- traefik.http.routers.s3-router.service=
|
161
|
+
- traefik.http.routers.s3-router.service=s3-service
|
160
162
|
- traefik.http.services.s3-service.loadbalancer.server.port=9000
|
161
163
|
command:
|
162
164
|
- server
|
@@ -167,7 +169,7 @@ services:
|
|
167
169
|
image: mailhog/mailhog:v1.0.1
|
168
170
|
labels:
|
169
171
|
- traefik.http.routers.mail-router.rule=Host(`mail.et.127.0.0.1.nip.io`)
|
170
|
-
- traefik.http.routers.mail-router.service=
|
172
|
+
- traefik.http.routers.mail-router.service=mail-service
|
171
173
|
- traefik.http.services.mail-service.loadbalancer.server.port=8025
|
172
174
|
networks:
|
173
175
|
- et_full_system
|
@@ -175,7 +177,7 @@ services:
|
|
175
177
|
image: mcr.microsoft.com/azure-storage/azurite
|
176
178
|
labels:
|
177
179
|
- traefik.http.routers.azurite-router.rule=Host(`azure_blob_storage.et.127.0.0.1.nip.io`)
|
178
|
-
- traefik.http.routers.azurite-router.service=
|
180
|
+
- traefik.http.routers.azurite-router.service=azurite-service
|
179
181
|
- traefik.http.services.azurite-service.loadbalancer.server.port=10000
|
180
182
|
networks:
|
181
183
|
- et_full_system
|
@@ -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
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: et_full_system
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 6.0.0.pre.
|
4
|
+
version: 6.0.0.pre.rc25
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Gary Taylor
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-11-
|
11
|
+
date: 2021-11-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|