et_full_system 3.0.4 → 3.0.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +5 -7
- data/docker/docker-compose.yml +1 -47
- data/foreman/et_ccd_export.env +4 -3
- data/lib/et_full_system/cli/docker/server.rb +1 -5
- data/lib/et_full_system/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 904b2a0ef49ec4eaffe39dbbd3bc36a734f97e733047e5023a4123e7db756752
|
4
|
+
data.tar.gz: b4c2ee4a81dd944b1c30fb4d94a1a21abf48b94c180c90122656b33756ade71f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 65da2ee12b7b57b1287929a48eecb2b7dd9cd0eea772ecdbc96b31713b78f315358ed09d24f3ea476811a116090ceb0bc119e88f1e0c4fa5efbd51433e85e3a3
|
7
|
+
data.tar.gz: b336ee8f466eaeddbbe6150f62926c8fadafde07fb9ae01d495d41206a36ad424a30d323da3523601d7313533e8051fdfa262b65c5efe4367575edff4925a069
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
et_full_system (3.0.
|
4
|
+
et_full_system (3.0.8)
|
5
5
|
aws-sdk-s3 (~> 1.9)
|
6
6
|
azure-storage (~> 0.15.0.preview)
|
7
7
|
dotenv (~> 2.7, >= 2.7.2)
|
@@ -23,16 +23,16 @@ GEM
|
|
23
23
|
addressable (2.8.0)
|
24
24
|
public_suffix (>= 2.0.2, < 5.0)
|
25
25
|
aws-eventstream (1.1.1)
|
26
|
-
aws-partitions (1.
|
26
|
+
aws-partitions (1.492.0)
|
27
27
|
aws-sdk-core (3.119.1)
|
28
28
|
aws-eventstream (~> 1, >= 1.0.2)
|
29
29
|
aws-partitions (~> 1, >= 1.239.0)
|
30
30
|
aws-sigv4 (~> 1.1)
|
31
31
|
jmespath (~> 1.0)
|
32
|
-
aws-sdk-kms (1.
|
32
|
+
aws-sdk-kms (1.47.0)
|
33
33
|
aws-sdk-core (~> 3, >= 3.119.0)
|
34
34
|
aws-sigv4 (~> 1.1)
|
35
|
-
aws-sdk-s3 (1.
|
35
|
+
aws-sdk-s3 (1.100.0)
|
36
36
|
aws-sdk-core (~> 3, >= 3.119.0)
|
37
37
|
aws-sdk-kms (~> 1)
|
38
38
|
aws-sigv4 (~> 1.1)
|
@@ -73,12 +73,10 @@ GEM
|
|
73
73
|
mime-types (3.3.1)
|
74
74
|
mime-types-data (~> 3.2015)
|
75
75
|
mime-types-data (3.2021.0704)
|
76
|
-
mini_portile2 (2.6.1)
|
77
76
|
minitest (5.14.4)
|
78
77
|
multi_xml (0.6.0)
|
79
78
|
multipart-post (2.1.1)
|
80
|
-
nokogiri (1.12.
|
81
|
-
mini_portile2 (~> 2.6.1)
|
79
|
+
nokogiri (1.12.4-arm64-darwin)
|
82
80
|
racc (~> 1.4)
|
83
81
|
public_suffix (4.0.6)
|
84
82
|
racc (1.5.2)
|
data/docker/docker-compose.yml
CHANGED
@@ -47,7 +47,6 @@ services:
|
|
47
47
|
- ./.empty:/home/app/full_system/systems/admin/.env.local
|
48
48
|
- ./.empty:/home/app/full_system/systems/et_ccd_export/.env.local
|
49
49
|
environment:
|
50
|
-
DISABLE_CLOUDWATCH: 'true'
|
51
50
|
DB_HOST: 'db'
|
52
51
|
DB_USERNAME: 'postgres'
|
53
52
|
RAILS_ENV:
|
@@ -55,7 +54,7 @@ services:
|
|
55
54
|
REDIS_HOST: redis
|
56
55
|
SERVER_PORT: ${SERVER_PORT:-3100}
|
57
56
|
SERVER_DOMAIN: ${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
|
58
|
-
CLOUD_PROVIDER: ${CLOUD_PROVIDER:-
|
57
|
+
CLOUD_PROVIDER: ${CLOUD_PROVIDER:-azure}
|
59
58
|
AZURITE_STORAGE_PATH: /home/app/azure_storage_data
|
60
59
|
MINIO_STORAGE_PATH: /home/app/minio_data
|
61
60
|
SHOW_DOWNTIME_BANNER:
|
@@ -64,14 +63,10 @@ services:
|
|
64
63
|
CCD_DATA_STORE_BASE_URL: ${CCD_DATA_STORE_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/data_store}
|
65
64
|
CCD_ECM_BASE_URL: ${CCD_ECM_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/ecm}
|
66
65
|
CCD_DOCUMENT_STORE_BASE_URL: ${CCD_DOCUMENT_STORE_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/document_store}
|
67
|
-
CCD_DOCUMENT_STORE_URL_REWRITE: ${CCD_DOCUMENT_STORE_URL_REWRITE:-'false'}
|
68
|
-
CCD_USE_SIDAM: ${CCD_USE_SIDAM:-'true'}
|
69
66
|
CCD_MICROSERVICE_ID: ${CCD_MICROSERVICE_ID:-ccd_gw}
|
70
67
|
CCD_MICROSERVICE_SECRET: ${CCD_MICROSERVICE_SECRET:-AAAAAAAAAAAAAAAC}
|
71
68
|
CCD_SIDAM_USERNAME: ${CCD_SIDAM_USERNAME:-m@m.com}
|
72
69
|
CCD_SIDAM_PASSWORD: ${CCD_SIDAM_PASSWORD:-p}
|
73
|
-
CCD_GENERATE_ETHOS_CASE_REFERENCE: ${CCD_GENERATE_ETHOS_CASE_REFERENCE:-'false'}
|
74
|
-
AZURE_APP_INSIGHTS_KEY: ${AZURE_APP_INSIGHTS_KEY:-2ac37587-9187-4ec1-97a4-d12ba26bc0fc}
|
75
70
|
command: /bin/bash --login -c "cd /home/app/full_system && et_full_system local server --azurite-storage-path=/home/app/azure_storage_data --minio-storage-path=/home/app/minio_data ${SERVER_ARGS}"
|
76
71
|
links:
|
77
72
|
- "db"
|
@@ -142,46 +137,6 @@ services:
|
|
142
137
|
- "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP:-127.255.255.255}"
|
143
138
|
networks:
|
144
139
|
- et_full_system
|
145
|
-
zalenium:
|
146
|
-
image: "dosel/zalenium"
|
147
|
-
container_name: zalenium
|
148
|
-
hostname: zalenium
|
149
|
-
tty: 'true'
|
150
|
-
volumes:
|
151
|
-
- zalenium_videos:/home/seluser/videos
|
152
|
-
- /var/run/docker.sock:/var/run/docker.sock
|
153
|
-
ports:
|
154
|
-
- 4444:4444
|
155
|
-
extra_hosts:
|
156
|
-
- "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP}"
|
157
|
-
networks:
|
158
|
-
- et_full_system
|
159
|
-
command: >
|
160
|
-
start --desiredContainers 2
|
161
|
-
--maxDockerSeleniumContainers 8
|
162
|
-
--screenWidth 1024 --screenHeight 768
|
163
|
-
--timeZone "Europe/Berlin"
|
164
|
-
--videoRecordingEnabled ${RECORD_VIDEO:-'false'}
|
165
|
-
--sauceLabsEnabled 'false'
|
166
|
-
--browserStackEnabled 'false'
|
167
|
-
--testingBotEnabled 'false'
|
168
|
-
--cbtEnabled 'false'
|
169
|
-
--lambdaTestEnabled 'false'
|
170
|
-
--startTunnel 'false'
|
171
|
-
environment:
|
172
|
-
- HOST_UID
|
173
|
-
- HOST_GID
|
174
|
-
- SAUCE_USERNAME
|
175
|
-
- SAUCE_ACCESS_KEY
|
176
|
-
- BROWSER_STACK_USER
|
177
|
-
- BROWSER_STACK_KEY
|
178
|
-
- TESTINGBOT_KEY
|
179
|
-
- TESTINGBOT_SECRET
|
180
|
-
- CBT_USERNAME
|
181
|
-
- CBT_AUTHKEY
|
182
|
-
- LT_USERNAME
|
183
|
-
- LT_ACCESS_KEY
|
184
|
-
- PULL_SELENIUM_IMAGE='true'
|
185
140
|
volumes:
|
186
141
|
rvm:
|
187
142
|
global_node_modules:
|
@@ -202,7 +157,6 @@ volumes:
|
|
202
157
|
atos_bundle:
|
203
158
|
db_data:
|
204
159
|
redis_data:
|
205
|
-
zalenium_videos:
|
206
160
|
|
207
161
|
networks:
|
208
162
|
et_full_system:
|
data/foreman/et_ccd_export.env
CHANGED
@@ -7,9 +7,10 @@ CCD_IDAM_BASE_URL=${CCD_IDAM_BASE_URL}
|
|
7
7
|
CCD_DATA_STORE_BASE_URL=${CCD_DATA_STORE_BASE_URL}
|
8
8
|
CCD_ECM_BASE_URL=${CCD_ECM_BASE_URL}
|
9
9
|
CCD_DOCUMENT_STORE_BASE_URL=${CCD_DOCUMENT_STORE_BASE_URL}
|
10
|
-
CCD_USE_SIDAM
|
10
|
+
CCD_USE_SIDAM=true
|
11
11
|
CCD_MICROSERVICE_ID=${CCD_MICROSERVICE_ID}
|
12
12
|
CCD_MICROSERVICE_SECRET=${CCD_MICROSERVICE_SECRET}
|
13
13
|
DISABLE_SIDEKIQ_ALIVE=true
|
14
|
-
CCD_GENERATE_ETHOS_CASE_REFERENCE
|
15
|
-
AZURE_APP_INSIGHTS_ROLE_NAME=et-ccd-export-fs
|
14
|
+
CCD_GENERATE_ETHOS_CASE_REFERENCE=false
|
15
|
+
AZURE_APP_INSIGHTS_ROLE_NAME=et-ccd-export-fs
|
16
|
+
CCD_DOCUMENT_STORE_URL_REWRITE=false
|
@@ -14,7 +14,6 @@ module EtFullSystem
|
|
14
14
|
method_option :use_selenium, type: :boolean, default: false, aliases: 'use-selenium', desc: 'Only used if with_test is true - says to use selenium in preference to zalenium'
|
15
15
|
method_option :chrome_instances, type: :numeric, default: 1, aliases: 'chrome-instances', desc: 'Specify the number of chrome instances for selenium'
|
16
16
|
method_option :firefox_instances, type: :numeric, default: 1, aliases: 'firefox-instances', desc: 'Specify the number of firefox instances for selenium'
|
17
|
-
method_option :record_video, type: :boolean, default: false, aliases: 'record-video', desc: 'When using zalenium, enable video recording'
|
18
17
|
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)'
|
19
18
|
def up(*args)
|
20
19
|
unbundled do
|
@@ -35,16 +34,13 @@ module EtFullSystem
|
|
35
34
|
env_vars << "CCD_SIDAM_PASSWORD=Pa55word11"
|
36
35
|
env_vars << "CCD_GENERATE_ETHOS_CASE_REFERENCE=true"
|
37
36
|
end
|
38
|
-
extra_args = []
|
37
|
+
extra_args = ['--no-recreate']
|
39
38
|
if options.with_test? && options.use_selenium?
|
40
39
|
extra_args.concat(["--scale chrome=#{options.chrome_instances}"])
|
41
40
|
extra_args.concat(["--scale firefox=#{options.firefox_instances}"])
|
42
41
|
else
|
43
42
|
extra_args.concat(['--scale selenium-hub=0', '--scale chrome=0', '--scale firefox=0'])
|
44
43
|
end
|
45
|
-
unless options.with_test? && !options.use_selenium?
|
46
|
-
extra_args.concat(['--scale zalenium=0'])
|
47
|
-
end
|
48
44
|
env_vars << "DB_PORT=#{ENV.fetch('DB_PORT', EtFullSystem.is_port_open?(5432) ? 0 : 5432)}"
|
49
45
|
env_vars << "REDIS_PORT=#{ENV.fetch('REDIS_PORT', EtFullSystem.is_port_open?(6379) ? 0 : 6379)}"
|
50
46
|
gem_root = File.absolute_path('../../../..', __dir__)
|
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: 3.0.
|
4
|
+
version: 3.0.8
|
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-08-
|
11
|
+
date: 2021-08-31 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
185
185
|
- !ruby/object:Gem::Version
|
186
186
|
version: '0'
|
187
187
|
requirements: []
|
188
|
-
rubygems_version: 3.1.
|
188
|
+
rubygems_version: 3.1.4
|
189
189
|
signing_key:
|
190
190
|
specification_version: 4
|
191
191
|
summary: Runs the employment tribunals system - all services and background jobs
|