et_full_system 6.0.0.pre.rc15 → 6.0.0.pre.rc19
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 +12 -0
- data/foreman/ComposeProcfile +11 -11
- 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: 757e7134a605f2541a7593a4c784f44bddf502eb659f53308305a72fc943eb89
|
4
|
+
data.tar.gz: 5766b4a13bbe96745699418e3928a4882c4cd4a8e2e724767086d6cd2f76d5dc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a54138a93e857a3363dbeb3268e0827730c35cf6d144decd78709109dd91defd9a2a90bf8b49cff13294e93b8669f2eacb61bebdde4c005d61e7909514e4d81c
|
7
|
+
data.tar.gz: fcd8acbd1e21ccee456fbc2485fe39c4138293ce40f7012cd0b6641ba935ac3b91c5f9242847508f19a4beeb9c31d15a9bb44c245582122b87b9117f08085d15
|
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
@@ -35,6 +35,18 @@ services:
|
|
35
35
|
- '${SERVER_PORT:-3100}:${SERVER_PORT:-3100}'
|
36
36
|
- '${TRAEFIX_PORT:-3200}:${TRAEFIK_PORT:-3200}'
|
37
37
|
- '${SMTP_PORT:-1025}:${SMTP_PORT:-1025}'
|
38
|
+
links:
|
39
|
+
- db
|
40
|
+
- redis
|
41
|
+
- minio
|
42
|
+
- azurite
|
43
|
+
- mailhog
|
44
|
+
depends_on:
|
45
|
+
- db
|
46
|
+
- redis
|
47
|
+
- azurite
|
48
|
+
- mailhog
|
49
|
+
- minio
|
38
50
|
extra_hosts:
|
39
51
|
- "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP}"
|
40
52
|
volumes:
|
data/foreman/ComposeProcfile
CHANGED
@@ -1,11 +1,11 @@
|
|
1
|
-
et1_web: export
|
2
|
-
et3_web:
|
3
|
-
api_web:
|
4
|
-
admin_web:
|
5
|
-
atos_api_web:
|
6
|
-
fake_acas_web:
|
7
|
-
fake_ccd_web:
|
8
|
-
fake_notify_web:
|
9
|
-
et1_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} &&
|
10
|
-
api_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} &&
|
11
|
-
et_ccd_export_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} &&
|
1
|
+
et1_web: export godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et1.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/et1 && bundle exec iodine -port $PORT"
|
2
|
+
et3_web: godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et3.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system && cd systems/et3 && bundle exec iodine -port $PORT"
|
3
|
+
api_web: godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_api.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/api && bundle exec iodine -port $PORT"
|
4
|
+
admin_web: godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_admin.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/admin && bundle exec iodine -port $PORT"
|
5
|
+
atos_api_web: godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_atos.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/atos && bundle exec iodine -port $PORT"
|
6
|
+
fake_acas_web: bash --login -c "cd ${FS_ROOT_PATH} && et_fake_acas_server -port $PORT -threads=1 -workers=2"
|
7
|
+
fake_ccd_web: bash --login -c "cd ${FS_ROOT_PATH} && et_fake_ccd start --port=$PORT --create_case_schema=./systems/et_ccd_export/spec/json_schemas/case_create.json"
|
8
|
+
fake_notify_web: godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/fake_notify.env bash --login -c "cd ${FS_ROOT_PATH} && gov_fake_notify start --port=$PORT --config=${FOREMAN_PATH}/gov_fake_notify.yaml"
|
9
|
+
et1_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && cd systems/et1 && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et1.env ./run_sidekiq.sh"
|
10
|
+
api_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && cd systems/api && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_api.env ./run_sidekiq.sh"
|
11
|
+
et_ccd_export_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && cd systems/et_ccd_export && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_ccd_export.env ./run_sidekiq.sh"
|
@@ -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)
|