et_full_system 6.0.0.pre.rc17 → 6.0.0.pre.rc21
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/Dockerfile +1 -1
- data/docker/docker-compose.yml +8 -8
- 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: 749c21c89abe9f0c89970f0d4d1cce11209a46bb00b9c05ba7bcfcaf9bea2d16
|
|
4
|
+
data.tar.gz: a4ed4580e0ee957a058aadcc904b6627900e8502aadf993cd7912f5e26d60216
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 33437b20ba4256040038b2572be589e83c392788a0fce948b5438acfaa0705d2bcd99895c2cbd2bc10ef9742566881ba64efba7d5bebfdae3bd49ce76f9aca96
|
|
7
|
+
data.tar.gz: 5798475f1365d2a9291b00e0787a1a76b0f5f522417a826780cf26aa19b1d29f8264f7892ef0e1b6054937ae74091381f51795cf6ce9af9584a845e9d4376a90
|
data/Gemfile.lock
CHANGED
data/docker/Dockerfile
CHANGED
|
@@ -26,7 +26,7 @@ RUN mkdir -p /home/app/system_gems/et_full_system && chmod 0777 /home/app/system
|
|
|
26
26
|
WORKDIR /home/app/full_system
|
|
27
27
|
RUN echo "app ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && chmod 0440 /etc/sudoers.d/user
|
|
28
28
|
USER app
|
|
29
|
-
RUN gem install dotenv bundler:1.17.3 invoker et_full_system:$GEM_VERSION
|
|
29
|
+
RUN gem install dotenv bundler:1.17.3 invoker et_full_system:$GEM_VERSION et_fake_acas_server
|
|
30
30
|
CMD /home/app/run
|
|
31
31
|
|
|
32
32
|
#RUN bash --login -c "gem install bundler --version 1.17.3"
|
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,17 +29,18 @@ 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
|
|
41
35
|
- minio
|
|
42
36
|
- azurite
|
|
43
37
|
- mailhog
|
|
38
|
+
depends_on:
|
|
39
|
+
- db
|
|
40
|
+
- redis
|
|
41
|
+
- azurite
|
|
42
|
+
- mailhog
|
|
43
|
+
- minio
|
|
44
44
|
extra_hosts:
|
|
45
45
|
- "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP}"
|
|
46
46
|
volumes:
|
|
@@ -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)
|