et_full_system 6.0.0.pre.rc16 → 6.0.0.pre.rc20
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 -3
- 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: 84261b9787f4353b4c6313592ace9dbffe8fa5b24a6a3a9047026eefb590ce2e
|
|
4
|
+
data.tar.gz: ce97e407df29b8c72f4e7f92494354e3043c931cb6fe802592c9619e36c1232a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: cb91e41bad51b67c1fdaddd3875912b3b563df359cda2200405fd345ac016ce4c542dfb551d4f99b49bd088f2ad2bb1a0c6cfba4256178dcf8e76fd1a8861210
|
|
7
|
+
data.tar.gz: 4a5867d1a0fd43476956b6a38ea72a739ecd360414d887219e40c09a1d53f8e9b574edf2fd557a5d8fb1ca683d501be8356de9ad1e22266924b0c70d451bd8f8
|
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
|
|
@@ -41,6 +40,12 @@ services:
|
|
|
41
40
|
- minio
|
|
42
41
|
- azurite
|
|
43
42
|
- mailhog
|
|
43
|
+
depends_on:
|
|
44
|
+
- db
|
|
45
|
+
- redis
|
|
46
|
+
- azurite
|
|
47
|
+
- mailhog
|
|
48
|
+
- minio
|
|
44
49
|
extra_hosts:
|
|
45
50
|
- "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP}"
|
|
46
51
|
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)
|