et_full_system 6.0.0.pre.rc18 → 6.0.0.pre.rc22
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/docker/docker-compose.yml +10 -16
- data/lib/et_full_system/cli/local.rb +1 -1
- data/lib/et_full_system/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b071cea1a5940cb40cea920d7d0fdf5d2f4df8e28ba5ca3943a5af93ecc44bfc
|
|
4
|
+
data.tar.gz: ccf1d0bace1f20687a34b5dfe9e62b257a4371128f63f5206b86bd9f22d9a6c2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ab472d1d8f69f32d446dc603d397f71829f83c294b8576d082216e74c8122fe644979b493acffe4a6210b197367e0eb1480a862ae7a66ce318b7fc30bfd8fcc1
|
|
7
|
+
data.tar.gz: f85e2972bbb82aba6699ac5ce0205d8a38703c4148122eca7492a0c36b2391675f9ad2d362dc444aa36c37ad66b8ffd8adeb413efc81c08b4d6c9a1dfeabe766
|
data/Gemfile.lock
CHANGED
data/docker/docker-compose.yml
CHANGED
|
@@ -6,10 +6,9 @@ services:
|
|
|
6
6
|
# Enables the web UI and tells Traefik to listen to docker
|
|
7
7
|
command: --api.insecure=true --providers.docker
|
|
8
8
|
ports:
|
|
9
|
-
|
|
10
|
-
- "80:80"
|
|
9
|
+
- "3100:80"
|
|
11
10
|
# The Web UI (enabled by --api.insecure=true)
|
|
12
|
-
- "
|
|
11
|
+
- "3200:8080"
|
|
13
12
|
volumes:
|
|
14
13
|
# So that Traefik can listen to the Docker events
|
|
15
14
|
- /var/run/docker.sock:/var/run/docker.sock
|
|
@@ -30,11 +29,6 @@ services:
|
|
|
30
29
|
args:
|
|
31
30
|
GEM_VERSION:
|
|
32
31
|
user_id: ${UID:-1000}
|
|
33
|
-
|
|
34
|
-
ports:
|
|
35
|
-
- '${SERVER_PORT:-3100}:${SERVER_PORT:-3100}'
|
|
36
|
-
- '${TRAEFIX_PORT:-3200}:${TRAEFIK_PORT:-3200}'
|
|
37
|
-
- '${SMTP_PORT:-1025}:${SMTP_PORT:-1025}'
|
|
38
32
|
links:
|
|
39
33
|
- db
|
|
40
34
|
- redis
|
|
@@ -126,19 +120,19 @@ services:
|
|
|
126
120
|
- traefik.http.routers.api-router.service=api-service
|
|
127
121
|
- traefik.http.services.api-service.loadbalancer.server.port=4002
|
|
128
122
|
- traefik.http.routers.admin-router.rule=Host(`admin.et.127.0.0.1.nip.io`)
|
|
129
|
-
- traefik.http.routers.admin-router.service=
|
|
123
|
+
- traefik.http.routers.admin-router.service=admin-service
|
|
130
124
|
- traefik.http.services.admin-service.loadbalancer.server.port=4003
|
|
131
125
|
- traefik.http.routers.atos-router.rule=Host(`atos.et.127.0.0.1.nip.io`)
|
|
132
|
-
- traefik.http.routers.atos-router.service=
|
|
126
|
+
- traefik.http.routers.atos-router.service=atos-service
|
|
133
127
|
- traefik.http.services.atos-service.loadbalancer.server.port=4004
|
|
134
128
|
- traefik.http.routers.acas-router.rule=Host(`acas.et.127.0.0.1.nip.io`)
|
|
135
|
-
- traefik.http.routers.acas-router.service=
|
|
129
|
+
- traefik.http.routers.acas-router.service=acas-service
|
|
136
130
|
- traefik.http.services.acas-service.loadbalancer.server.port=4005
|
|
137
131
|
- traefik.http.routers.ccd-router.rule=Host(`ccd.et.127.0.0.1.nip.io`)
|
|
138
|
-
- traefik.http.routers.ccd-router.service=
|
|
132
|
+
- traefik.http.routers.ccd-router.service=ccd-service
|
|
139
133
|
- traefik.http.services.ccd-service.loadbalancer.server.port=4006
|
|
140
134
|
- traefik.http.routers.notify-router.rule=Host(`notify.et.127.0.0.1.nip.io`)
|
|
141
|
-
- traefik.http.routers.notify-router.service=
|
|
135
|
+
- traefik.http.routers.notify-router.service=notify-service
|
|
142
136
|
- traefik.http.services.notify-service.loadbalancer.server.port=4007
|
|
143
137
|
|
|
144
138
|
#command: bash -lc "cd /home/app/full_system/systems/api && REDIS_DATABASE=2 bundle exec sidekiq"
|
|
@@ -162,7 +156,7 @@ services:
|
|
|
162
156
|
image: minio/minio
|
|
163
157
|
labels:
|
|
164
158
|
- traefik.http.routers.s3-router.rule=Host(`s3.et.127.0.0.1.nip.io`)
|
|
165
|
-
- traefik.http.routers.s3-router.service=
|
|
159
|
+
- traefik.http.routers.s3-router.service=s3-service
|
|
166
160
|
- traefik.http.services.s3-service.loadbalancer.server.port=9000
|
|
167
161
|
command:
|
|
168
162
|
- server
|
|
@@ -173,7 +167,7 @@ services:
|
|
|
173
167
|
image: mailhog/mailhog:v1.0.1
|
|
174
168
|
labels:
|
|
175
169
|
- traefik.http.routers.mail-router.rule=Host(`mail.et.127.0.0.1.nip.io`)
|
|
176
|
-
- traefik.http.routers.mail-router.service=
|
|
170
|
+
- traefik.http.routers.mail-router.service=mail-service
|
|
177
171
|
- traefik.http.services.mail-service.loadbalancer.server.port=8025
|
|
178
172
|
networks:
|
|
179
173
|
- et_full_system
|
|
@@ -181,7 +175,7 @@ services:
|
|
|
181
175
|
image: mcr.microsoft.com/azure-storage/azurite
|
|
182
176
|
labels:
|
|
183
177
|
- traefik.http.routers.azurite-router.rule=Host(`azure_blob_storage.et.127.0.0.1.nip.io`)
|
|
184
|
-
- traefik.http.routers.azurite-router.service=
|
|
178
|
+
- traefik.http.routers.azurite-router.service=azurite-service
|
|
185
179
|
- traefik.http.services.azurite-service.loadbalancer.server.port=10000
|
|
186
180
|
networks:
|
|
187
181
|
- et_full_system
|
|
@@ -89,7 +89,7 @@ module EtFullSystem
|
|
|
89
89
|
def server
|
|
90
90
|
puts "Scheduling traefik config and file storage config"
|
|
91
91
|
pid = fork do
|
|
92
|
-
self.class.start(['boot'])
|
|
92
|
+
self.class.start(['boot']) unless options.in_docker_compose?
|
|
93
93
|
EtFullSystem::Cli::Local::FileStorageCommand.start(['setup'])
|
|
94
94
|
end
|
|
95
95
|
Process.detach(pid)
|