et_full_system 5.0.0.pre.rc2 → 6.0.0.pre.rc2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +16 -6
- data/docker/Dockerfile +21 -77
- data/docker/build/pdftk +2 -0
- data/docker/build/run +9 -0
- data/docker/docker-compose.yml +59 -38
- data/foreman/.env +1 -2
- data/foreman/ComposeProcfile +11 -0
- data/foreman/et1.env +0 -1
- data/foreman/et3.env +0 -1
- data/foreman/et_admin.env +0 -1
- data/foreman/et_api.env +0 -1
- data/foreman/et_atos.env +0 -1
- data/foreman/et_ccd_export.env +0 -1
- data/lib/et_full_system/cli/local.rb +7 -2
- data/lib/et_full_system/version.rb +1 -1
- metadata +5 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f9938ca7a4fb5777a7c1d84f38686eb524e5cc4eb21e1896249c95fe56e30960
|
4
|
+
data.tar.gz: ef38d8dd6b4a348f195d9c970a492600b79e745f7a05fddef8b06485a7b3a5a7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: be4d00131a75d8dfca1a5a40180a448bf5f30a6fbe54ca574523bba94e562375fe701633b99a66eaec4bd8508e8a46d38078a5bc6f5bcf6c635970fdf73aa610
|
7
|
+
data.tar.gz: be9b4677aea82538251918ffc8c92ee104768c50796d3ccba8b1a93a80654e716917054bf5703a9a136089df35f553dde0c1dd7507bb859c1394b4f9d1938b31
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,8 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
et_full_system (
|
4
|
+
et_full_system (6.0.0.pre.rc2)
|
5
|
+
|
5
6
|
aws-sdk-s3 (~> 1.9)
|
6
7
|
azure-storage (~> 0.15.0.preview)
|
7
8
|
dotenv (~> 2.7, >= 2.7.2)
|
@@ -24,7 +25,7 @@ GEM
|
|
24
25
|
addressable (2.8.0)
|
25
26
|
public_suffix (>= 2.0.2, < 5.0)
|
26
27
|
aws-eventstream (1.2.0)
|
27
|
-
aws-partitions (1.
|
28
|
+
aws-partitions (1.530.0)
|
28
29
|
aws-sdk-core (3.122.1)
|
29
30
|
aws-eventstream (~> 1, >= 1.0.2)
|
30
31
|
aws-partitions (~> 1, >= 1.525.0)
|
@@ -50,11 +51,12 @@ GEM
|
|
50
51
|
nokogiri (~> 1.6, >= 1.6.8)
|
51
52
|
concurrent-ruby (1.1.9)
|
52
53
|
dotenv (2.7.6)
|
53
|
-
et_fake_ccd (1.1.
|
54
|
+
et_fake_ccd (1.1.10)
|
54
55
|
activemodel (>= 5.2.3)
|
55
56
|
iodine (~> 0.7)
|
56
57
|
json-schema (~> 2.5)
|
57
58
|
roda (~> 3.21)
|
59
|
+
roda-enhanced_logger (~> 0.4.0)
|
58
60
|
rotp (~> 6.2)
|
59
61
|
thor (~> 1.0)
|
60
62
|
tilt (~> 2.0, >= 2.0.9)
|
@@ -82,9 +84,9 @@ GEM
|
|
82
84
|
jwt (2.3.0)
|
83
85
|
mail (2.7.1)
|
84
86
|
mini_mime (>= 0.1.1)
|
85
|
-
mime-types (3.
|
87
|
+
mime-types (3.4.1)
|
86
88
|
mime-types-data (~> 3.2015)
|
87
|
-
mime-types-data (3.2021.
|
89
|
+
mime-types-data (3.2021.1115)
|
88
90
|
mini_mime (1.1.2)
|
89
91
|
mini_portile2 (2.6.1)
|
90
92
|
minitest (5.14.4)
|
@@ -93,15 +95,23 @@ GEM
|
|
93
95
|
nokogiri (1.12.5)
|
94
96
|
mini_portile2 (~> 2.6.1)
|
95
97
|
racc (~> 1.4)
|
98
|
+
pastel (0.8.0)
|
99
|
+
tty-color (~> 0.5)
|
96
100
|
public_suffix (4.0.6)
|
97
101
|
racc (1.6.0)
|
98
102
|
rack (2.2.3)
|
99
103
|
rake (13.0.1)
|
100
|
-
roda (3.
|
104
|
+
roda (3.50.0)
|
101
105
|
rack
|
106
|
+
roda-enhanced_logger (0.4.0)
|
107
|
+
roda (>= 3.19.0)
|
108
|
+
tty-logger (>= 0.3, < 1.0)
|
102
109
|
rotp (6.2.0)
|
103
110
|
thor (1.1.0)
|
104
111
|
tilt (2.0.10)
|
112
|
+
tty-color (0.6.0)
|
113
|
+
tty-logger (0.6.0)
|
114
|
+
pastel (~> 0.8)
|
105
115
|
tzinfo (2.0.4)
|
106
116
|
concurrent-ruby (~> 1.0)
|
107
117
|
zeitwerk (2.5.1)
|
data/docker/Dockerfile
CHANGED
@@ -1,93 +1,37 @@
|
|
1
|
-
FROM
|
2
|
-
FROM traefik:1.7 AS traefik
|
3
|
-
FROM minio/minio AS minio
|
4
|
-
FROM phusion/passenger-customizable:1.0.19
|
5
|
-
|
1
|
+
FROM ruby:2.7.4-alpine
|
6
2
|
# Set correct environment variables.
|
7
|
-
|
3
|
+
|
8
4
|
ARG GEM_VERSION=>0
|
9
5
|
ARG user_id=1000
|
10
|
-
COPY --from=mailhog /usr/local/bin/MailHog /usr/local/bin/mailhog
|
11
|
-
COPY --from=traefik /traefik /usr/local/bin/
|
12
|
-
COPY --from=minio /opt/bin/minio /usr/local/bin/
|
13
|
-
# Use baseimage-docker's init process.
|
14
|
-
CMD ["/sbin/my_init"]
|
15
|
-
RUN mv /etc/apt/sources.list.d /etc/apt/sources.list.d.bak
|
16
|
-
RUN apt update && apt install -y ca-certificates
|
17
|
-
RUN mv /etc/apt/sources.list.d.bak /etc/apt/sources.list.d
|
18
|
-
RUN apt-get update
|
19
|
-
# If you're using the 'customizable' variant, you need to explicitly opt-in
|
20
|
-
# for features.
|
21
|
-
#
|
22
|
-
# N.B. these images are based on https://github.com/phusion/baseimage-docker,
|
23
|
-
# so anything it provides is also automatically on board in the images below
|
24
|
-
# (e.g. older versions of Ruby, Node, Python).
|
25
|
-
#
|
26
|
-
# Uncomment the features you want:
|
27
|
-
#
|
28
|
-
# Ruby support
|
29
|
-
|
30
|
-
|
31
|
-
#RUN /pd_build/ruby-2.0.*.sh
|
32
|
-
#RUN /pd_build/ruby-2.1.*.sh
|
33
|
-
#RUN /pd_build/ruby-2.2.*.sh
|
34
|
-
#RUN /pd_build/ruby-2.3.*.sh
|
35
|
-
#RUN /pd_build/ruby-2.4.*.sh
|
36
|
-
RUN /pd_build/ruby-2.7.*.sh
|
37
|
-
#RUN /pd_build/jruby-9.1.*.sh
|
38
|
-
# Python support.
|
39
|
-
#RUN /pd_build/python.sh
|
40
|
-
# Node.js and Meteor standalone support.
|
41
|
-
# (not needed if you already have the above Ruby support)
|
42
|
-
RUN /pd_build/nodejs.sh
|
43
|
-
|
44
6
|
# Get latest rubygems
|
45
|
-
RUN bash --login -c "rvm --default use 2.7.4"
|
46
7
|
RUN gem update --system
|
47
|
-
|
48
|
-
|
49
|
-
RUN
|
50
|
-
|
51
|
-
RUN apt-get update && apt-get -y --no-install-recommends install freeport tzdata postgresql gettext-base pdftk wget sudo libmcrypt-dev mcrypt sqlite3 libsqlite3-dev yarn shared-mime-info && rm -rf /var/lib/apt/lists/*
|
52
|
-
|
53
|
-
# Enable the Redis service.
|
54
|
-
RUN rm -f /etc/service/redis/down
|
55
|
-
|
56
|
-
# Install freeport
|
57
|
-
RUN wget https://github.com/phayes/freeport/releases/download/1.0.2/freeport_1.0.2_linux_amd64.deb && dpkg -i freeport_1.0.2_linux_amd64.deb && rm freeport_1.0.2_linux_amd64.deb
|
58
|
-
|
59
|
-
# Install azurite
|
60
|
-
RUN bash -lc "npm install -g azurite@2.7.0"
|
61
|
-
|
62
|
-
# Install go, then godotenv, then remove go
|
63
|
-
RUN apt-get update && apt-get -y install --no-install-recommends golang && export GOPATH=/home/app/go && mkdir -p /home/app/go && go get github.com/joho/godotenv/cmd/godotenv && apt-get -y remove golang && apt -y autoremove && rm -rf /var/lib/apt/lists/* && cp /home/app/go/bin/godotenv /usr/bin/ && rm -rf /home/app/go
|
64
|
-
|
65
|
-
# Create the minio_data directory for the minio server
|
66
|
-
RUN mkdir -p /home/app/minio_data; chown app:app /home/app/minio_data; chmod 0777 /home/app/minio_data
|
67
|
-
|
68
|
-
# Create the azure_storage_data directory for the azure storage server
|
69
|
-
RUN mkdir -p /home/app/azure_storage_data; chown app:app /home/app/azure_storage_data; chmod 0777 /home/app/azure_storage_data
|
70
|
-
|
71
|
-
# Clean up APT when done.
|
72
|
-
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
73
|
-
|
8
|
+
RUN apk add --no-cache postgresql-dev libffi-dev tzdata gettext wget sudo libmcrypt-dev sqlite sqlite-dev nodejs yarn shared-mime-info git build-base curl bash openjdk11-jre
|
9
|
+
RUN addgroup app --gid 1000
|
10
|
+
RUN adduser -SD -u 1000 --shell /bin/bash --home /home/app app app
|
11
|
+
RUN chown -R app:app /usr/local/bundle
|
74
12
|
RUN mkdir -p /home/app/full_system; chown app:app /home/app/full_system
|
13
|
+
RUN wget https://gitlab.com/pdftk-java/pdftk/-/jobs/1507074845/artifacts/raw/build/libs/pdftk-all.jar
|
14
|
+
RUN mv pdftk-all.jar usr/lib/pdftk.jar
|
15
|
+
COPY docker/build/pdftk /usr/local/bin/pdftk
|
16
|
+
COPY docker/build/run /home/app/run
|
17
|
+
|
75
18
|
# Install gems and binstubs to run without bundler
|
76
19
|
RUN mkdir -p /home/app/system_gems/et_full_system && chmod 0777 /home/app/system_gems/et_full_system && chown -R app:app /home/app/system_gems
|
77
20
|
|
78
|
-
RUN usermod -o -u $user_id app
|
79
|
-
RUN groupmod -o -g $user_id app
|
21
|
+
#RUN usermod -o -u $user_id app
|
22
|
+
#RUN groupmod -o -g $user_id app
|
80
23
|
WORKDIR /home/app/full_system
|
81
|
-
RUN echo "app ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && chmod 0440 /etc/sudoers.d/user
|
24
|
+
#RUN echo "app ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && chmod 0440 /etc/sudoers.d/user
|
82
25
|
USER app
|
26
|
+
RUN gem install dotenv bundler:1.17.3 invoker
|
27
|
+
CMD /home/app/run
|
83
28
|
|
84
|
-
RUN bash --login -c "
|
85
|
-
RUN bash --login -c "gem install bundler --version 1.17.3"
|
29
|
+
#RUN bash --login -c "gem install bundler --version 1.17.3"
|
86
30
|
|
87
31
|
# Install gems required outside of any bundle.
|
88
|
-
RUN bash --login -c "rvm use 2.7.4 && gem install dotenv et_fake_acas_server invoker && gem install et_full_system --version=$GEM_VERSION"
|
32
|
+
#RUN bash --login -c "rvm use 2.7.4 && gem install dotenv et_fake_acas_server invoker && gem install et_full_system --version=$GEM_VERSION"
|
89
33
|
|
90
|
-
WORKDIR /home/app/full_system
|
34
|
+
#WORKDIR /home/app/full_system
|
91
35
|
|
92
|
-
RUN cd /home/app
|
93
|
-
ENV HOME /home/app
|
36
|
+
#RUN cd /home/app
|
37
|
+
#ENV HOME /home/app
|
data/docker/build/pdftk
ADDED
data/docker/build/run
ADDED
@@ -0,0 +1,9 @@
|
|
1
|
+
#!/usr/bin/env bash
|
2
|
+
cd /home/app/full_system/systems/et1 && bundle && bundle exec rails db:create db:migrate && \
|
3
|
+
cd /home/app/full_system/systems/et3 && bundle && bundle exec rails db:create db:migrate && \
|
4
|
+
cd /home/app/full_system/systems/api && bundle && bundle exec rails db:create db:migrate db:seed && \
|
5
|
+
cd /home/app/full_system/systems/admin && bundle && bundle exec rails db:seed && \
|
6
|
+
cd /home/app/full_system/systems/atos && bundle && \
|
7
|
+
cd /home/app/full_system/systems/et_ccd_export && bundle && \
|
8
|
+
sleep 60
|
9
|
+
|
data/docker/docker-compose.yml
CHANGED
@@ -1,5 +1,20 @@
|
|
1
1
|
version: '3'
|
2
2
|
services:
|
3
|
+
traefik:
|
4
|
+
# The official v2 Traefik docker image
|
5
|
+
image: traefik:v2.5
|
6
|
+
# Enables the web UI and tells Traefik to listen to docker
|
7
|
+
command: --api.insecure=true --providers.docker
|
8
|
+
ports:
|
9
|
+
# The HTTP port
|
10
|
+
- "80:80"
|
11
|
+
# The Web UI (enabled by --api.insecure=true)
|
12
|
+
- "8080:8080"
|
13
|
+
volumes:
|
14
|
+
# So that Traefik can listen to the Docker events
|
15
|
+
- /var/run/docker.sock:/var/run/docker.sock
|
16
|
+
networks:
|
17
|
+
- et_full_system
|
3
18
|
et:
|
4
19
|
image: 'et_full_system:1.0.0.pre'
|
5
20
|
build:
|
@@ -67,7 +82,7 @@ services:
|
|
67
82
|
CCD_MICROSERVICE_SECRET: ${CCD_MICROSERVICE_SECRET:-AAAAAAAAAAAAAAAC}
|
68
83
|
CCD_SIDAM_USERNAME: ${CCD_SIDAM_USERNAME:-m@m.com}
|
69
84
|
CCD_SIDAM_PASSWORD: ${CCD_SIDAM_PASSWORD:-p}
|
70
|
-
command: /bin/bash --login -c "cd /home/app/full_system && et_full_system local server --
|
85
|
+
command: /bin/bash --login -c "cd /home/app/full_system && et_full_system local server --in-docker-compose ${SERVER_ARGS}"
|
71
86
|
links:
|
72
87
|
- "db"
|
73
88
|
- "redis"
|
@@ -84,6 +99,31 @@ services:
|
|
84
99
|
- atos.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
|
85
100
|
- mail.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
|
86
101
|
- ccd.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
|
102
|
+
labels:
|
103
|
+
- traefik.http.routers.et1-router.rule=Host(`et1.et.127.0.0.1.nip.io`)
|
104
|
+
- traefik.http.routers.et1-router.service=et1-service
|
105
|
+
- traefik.http.services.et1-service.loadbalancer.server.port=4000
|
106
|
+
- traefik.http.routers.et3-router.rule=Host(`et3.et.127.0.0.1.nip.io`)
|
107
|
+
- traefik.http.routers.et3-router.service=et3-service
|
108
|
+
- traefik.http.services.et3-service.loadbalancer.server.port=4001
|
109
|
+
- traefik.http.routers.api-router.rule=Host(`api.et.127.0.0.1.nip.io`)
|
110
|
+
- traefik.http.routers.api-router.service=api-service
|
111
|
+
- traefik.http.services.api-service.loadbalancer.server.port=4002
|
112
|
+
- traefik.http.routers.admin-router.rule=Host(`admin.et.127.0.0.1.nip.io`)
|
113
|
+
- traefik.http.routers.admin-router.service=api-service
|
114
|
+
- traefik.http.services.admin-service.loadbalancer.server.port=4003
|
115
|
+
- traefik.http.routers.atos-router.rule=Host(`atos.et.127.0.0.1.nip.io`)
|
116
|
+
- traefik.http.routers.atos-router.service=api-service
|
117
|
+
- traefik.http.services.atos-service.loadbalancer.server.port=4004
|
118
|
+
- traefik.http.routers.acas-router.rule=Host(`acas.et.127.0.0.1.nip.io`)
|
119
|
+
- traefik.http.routers.acas-router.service=api-service
|
120
|
+
- traefik.http.services.acas-service.loadbalancer.server.port=4005
|
121
|
+
- traefik.http.routers.ccd-router.rule=Host(`ccd.et.127.0.0.1.nip.io`)
|
122
|
+
- traefik.http.routers.ccd-router.service=api-service
|
123
|
+
- traefik.http.services.ccd-service.loadbalancer.server.port=4006
|
124
|
+
- traefik.http.routers.notify-router.rule=Host(`notify.et.127.0.0.1.nip.io`)
|
125
|
+
- traefik.http.routers.notify-router.service=api-service
|
126
|
+
- traefik.http.services.notify-service.loadbalancer.server.port=4007
|
87
127
|
|
88
128
|
#command: bash -lc "cd /home/app/full_system/systems/api && REDIS_DATABASE=2 bundle exec sidekiq"
|
89
129
|
db:
|
@@ -102,49 +142,30 @@ services:
|
|
102
142
|
- et_full_system
|
103
143
|
volumes:
|
104
144
|
- redis_data:/data
|
105
|
-
|
106
|
-
image:
|
107
|
-
|
108
|
-
|
109
|
-
-
|
145
|
+
minio:
|
146
|
+
image: minio/minio
|
147
|
+
labels:
|
148
|
+
- traefik.http.routers.s3-router.rule=Host(`s3.et.127.0.0.1.nip.io`)
|
149
|
+
- traefik.http.routers.s3-router.service=et1-service
|
150
|
+
- traefik.http.services.s3-service.loadbalancer.server.port=9000
|
110
151
|
networks:
|
111
152
|
- et_full_system
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
-
|
116
|
-
|
117
|
-
|
118
|
-
volumes:
|
119
|
-
- /dev/shm:/dev/shm
|
120
|
-
depends_on:
|
121
|
-
- selenium-hub
|
122
|
-
environment:
|
123
|
-
- HUB_HOST=selenium-hub
|
124
|
-
- HUB_PORT=4444
|
125
|
-
extra_hosts:
|
126
|
-
- "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP}"
|
153
|
+
mailhog:
|
154
|
+
image: mailhog/mailhog:v1.0.1
|
155
|
+
labels:
|
156
|
+
- traefik.http.routers.mail-router.rule=Host(`mail.et.127.0.0.1.nip.io`)
|
157
|
+
- traefik.http.routers.mail-router.service=et1-service
|
158
|
+
- traefik.http.services.mail-service.loadbalancer.server.port=8025
|
127
159
|
networks:
|
128
160
|
- et_full_system
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
- /dev/shm:/dev/shm
|
136
|
-
depends_on:
|
137
|
-
- selenium-hub
|
138
|
-
environment:
|
139
|
-
- HUB_HOST=selenium-hub
|
140
|
-
- HUB_PORT=4444
|
141
|
-
extra_hosts:
|
142
|
-
- "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP:-127.255.255.255}"
|
161
|
+
azurite:
|
162
|
+
image: mcr.microsoft.com/azure-storage/azurite
|
163
|
+
labels:
|
164
|
+
- traefik.http.routers.azurite-router.rule=Host(`azure_blob_storage.et.127.0.0.1.nip.io`)
|
165
|
+
- traefik.http.routers.azurite-router.service=et1-service
|
166
|
+
- traefik.http.services.azurite-service.loadbalancer.server.port=10000
|
143
167
|
networks:
|
144
168
|
- et_full_system
|
145
|
-
profiles:
|
146
|
-
- test
|
147
|
-
- firefox
|
148
169
|
volumes:
|
149
170
|
rvm:
|
150
171
|
global_node_modules:
|
data/foreman/.env
CHANGED
@@ -30,6 +30,5 @@ AZURE_STORAGE_CONTAINER='et-api-test-container'
|
|
30
30
|
AZURE_STORAGE_DIRECT_UPLOAD_ACCOUNT='devstoreaccount1'
|
31
31
|
AZURE_STORAGE_DIRECT_UPLOAD_ACCESS_KEY='Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=='
|
32
32
|
AZURE_STORAGE_DIRECT_UPLOAD_CONTAINER='et-api-direct-test-container'
|
33
|
-
AZURE_APP_INSIGHTS_KEY=${AZURE_APP_INSIGHTS_KEY}
|
34
33
|
GOVUK_NOTIFY_CUSTOM_URL=http://notify.et.127.0.0.1.nip.io:3100
|
35
|
-
GOVUK_NOTIFY_API_KEY_LIVE=fake-key-7fc24bc8-1938-1827-bed3-fb237f9cd5e7-c34b3015-02a1-4e01-b922-1ea21f331d4d
|
34
|
+
GOVUK_NOTIFY_API_KEY_LIVE=fake-key-7fc24bc8-1938-1827-bed3-fb237f9cd5e7-c34b3015-02a1-4e01-b922-1ea21f331d4d
|
@@ -0,0 +1,11 @@
|
|
1
|
+
et1_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et1.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url et1 http://localhost:$FREEPORT && cd systems/et1 && PORT=$FREEPORT ./run.sh"
|
2
|
+
et3_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et3.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url et3 http://localhost:$FREEPORT && cd systems/et3 && PORT=$FREEPORT ./run.sh"
|
3
|
+
api_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_api.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url api http://localhost:$FREEPORT && cd systems/api && PORT=$FREEPORT ./run.sh"
|
4
|
+
admin_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_admin.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url admin http://localhost:$FREEPORT && cd systems/admin && PORT=$FREEPORT ./run.sh"
|
5
|
+
atos_api_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_atos.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url atos_api http://localhost:$FREEPORT && cd systems/atos && PORT=$FREEPORT ./run.sh"
|
6
|
+
fake_acas_web: export FREEPORT=$(freeport) && bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_acas http://localhost:$FREEPORT && rvm use && et_fake_acas_server -port $FREEPORT -threads=1 -workers=2"
|
7
|
+
fake_ccd_web: export FREEPORT=$(freeport) && bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_ccd http://localhost:$FREEPORT && rvm use && et_fake_ccd start --port=$FREEPORT --create_case_schema=./systems/et_ccd_export/spec/json_schemas/case_create.json"
|
8
|
+
fake_notify_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/fake_notify.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_notify http://localhost:$FREEPORT && rvm use && gov_fake_notify start --port=$FREEPORT --config=${FOREMAN_PATH}/gov_fake_notify.yaml"
|
9
|
+
et1_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && 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} && et_full_system local wait_for_support && 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} && et_full_system local wait_for_support && cd systems/et_ccd_export && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_ccd_export.env ./run_sidekiq.sh"
|
data/foreman/et1.env
CHANGED
data/foreman/et3.env
CHANGED
@@ -1,6 +1,5 @@
|
|
1
1
|
REDIS_URL=redis://redis:6379/5
|
2
2
|
RAVEN_DSN='https://7f2374c2e0cd4650bf5129c9fe45215e:e0ae53d01bd7454da963790ee204ffa0@sentry.io/1376078'
|
3
3
|
ET_API_URL='http://api.et.127.0.0.1.nip.io:3100/api'
|
4
|
-
AZURE_APP_INSIGHTS_ROLE_NAME=et3-fs
|
5
4
|
DB_NAME=et3_production
|
6
5
|
ROOT_URL=http://et3.et.127.0.0.1.nip.io:3100
|
data/foreman/et_admin.env
CHANGED
data/foreman/et_api.env
CHANGED
@@ -7,4 +7,3 @@ S3_DIRECT_UPLOAD_BUCKET='etapidirectbucket'
|
|
7
7
|
RAVEN_DSN='https://929365547a42468fb521248a96100646:139af8327fa340b88088efeae059fca8@sentry.io/1254109'
|
8
8
|
ACAS_SERVICE_URL='http://acas.et.127.0.0.1.nip.io:3100/Lookup/ECService.svc'
|
9
9
|
DISABLE_SIDEKIQ_ALIVE=true
|
10
|
-
AZURE_APP_INSIGHTS_ROLE_NAME=et-api-fs
|
data/foreman/et_atos.env
CHANGED
data/foreman/et_ccd_export.env
CHANGED
@@ -85,6 +85,7 @@ module EtFullSystem
|
|
85
85
|
method_option :rails_env, type: :string, default: ENV.fetch('RAILS_ENV', 'production')
|
86
86
|
method_option :cloud_provider, type: :string, default: ENV.fetch('CLOUD_PROVIDER', 'amazon')
|
87
87
|
method_option :minimal, type: :boolean, default: false, desc: 'Set to true to only start the minimum (db, redis, mail, s3, azure blob, fake_acas, fake_ccd)'
|
88
|
+
method_option :in_docker_compose, type: :boolean, default: false, desc: 'Set to true to assume certain services are in docker compose'
|
88
89
|
def server
|
89
90
|
puts "Scheduling traefik config and file storage config"
|
90
91
|
pid = fork do
|
@@ -99,7 +100,11 @@ module EtFullSystem
|
|
99
100
|
if options.minimal?
|
100
101
|
without = ['et1', 'et3', 'admin', 'api', 'ccd_export', 'atos_api']
|
101
102
|
end
|
102
|
-
|
103
|
+
if options.in_docker_compose?
|
104
|
+
cmd = "CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} FS_ROOT_PATH=#{PROJECT_PATH} FOREMAN_PATH=#{GEM_PATH}/foreman godotenv -f #{GEM_PATH}/foreman/.env invoker start \"#{GEM_PATH}/foreman/ComposeProcfile\" --port=4000"
|
105
|
+
else
|
106
|
+
cmd = "CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} AZURITE_STORAGE_PATH=\"#{options[:azurite_storage_path]}\" MINIO_STORAGE_PATH=\"#{options[:minio_storage_path]}\" FS_ROOT_PATH=#{PROJECT_PATH} FOREMAN_PATH=#{GEM_PATH}/foreman godotenv -f #{GEM_PATH}/foreman/.env invoker start \"#{GEM_PATH}/foreman/Procfile\" --port=4000"
|
107
|
+
end
|
103
108
|
STDERR.puts cmd
|
104
109
|
unless without.empty?
|
105
110
|
stop_cmds = without.reduce([]) do |acc, service|
|
@@ -396,7 +401,7 @@ module EtFullSystem
|
|
396
401
|
puts cmd
|
397
402
|
external_command cmd, 'atos setup'
|
398
403
|
end
|
399
|
-
|
404
|
+
|
400
405
|
def setup_ccd_service
|
401
406
|
puts "------------------------------------------------ SETTING UP CCD EXPORT SERVICE ---------------------------------------------------"
|
402
407
|
cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et_ccd_export && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_ccd_export.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""
|
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:
|
4
|
+
version: 6.0.0.pre.rc2
|
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-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|
@@ -150,12 +150,15 @@ files:
|
|
150
150
|
- bin/setup
|
151
151
|
- docker/.empty
|
152
152
|
- docker/Dockerfile
|
153
|
+
- docker/build/pdftk
|
154
|
+
- docker/build/run
|
153
155
|
- docker/docker-compose.yml
|
154
156
|
- docker/pdftk
|
155
157
|
- et_full_system.gemspec
|
156
158
|
- exe/et_full_system
|
157
159
|
- foreman/.env
|
158
160
|
- foreman/.foreman
|
161
|
+
- foreman/ComposeProcfile
|
159
162
|
- foreman/Procfile
|
160
163
|
- foreman/et1.env
|
161
164
|
- foreman/et3.env
|