et_full_system 6.0.0.pre.rc9 → 6.0.0.pre.rc13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +3 -3
- data/docker/Dockerfile +1 -1
- data/lib/et_full_system/cli/docker/server.rb +0 -10
- data/lib/et_full_system/cli/local.rb +5 -2
- data/lib/et_full_system/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 435ab38785a683eb7e5a76355965bfdd7e4db76e60e499675caace396589300a
|
4
|
+
data.tar.gz: 0d97b907f56c7e3da3390fa4e0a353e1c1fbb3ddb6a2a64a6a773f1b291b6db1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 69414e9b7ebad03260f70316dd2b3c8f62ebf686ed9611674028d158be1dd3158aeea97992cf4c47eda953681ce6059e2a16412a5b8f684f20de6b9b988686e4
|
7
|
+
data.tar.gz: 9657cb2432efb9985414f4bfdc2844933a939b557a4e533b151b2a10c16bea86c62950c5f001078198c5a1d306bbe5256088248cc594bc7ab954853022bcd429
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
et_full_system (6.0.0.pre.
|
4
|
+
et_full_system (6.0.0.pre.rc13)
|
5
5
|
aws-sdk-s3 (~> 1.9)
|
6
6
|
azure-storage (~> 0.15.0.preview)
|
7
7
|
dotenv (~> 2.7, >= 2.7.2)
|
@@ -24,7 +24,7 @@ GEM
|
|
24
24
|
addressable (2.8.0)
|
25
25
|
public_suffix (>= 2.0.2, < 5.0)
|
26
26
|
aws-eventstream (1.2.0)
|
27
|
-
aws-partitions (1.
|
27
|
+
aws-partitions (1.532.0)
|
28
28
|
aws-sdk-core (3.122.1)
|
29
29
|
aws-eventstream (~> 1, >= 1.0.2)
|
30
30
|
aws-partitions (~> 1, >= 1.525.0)
|
@@ -33,7 +33,7 @@ GEM
|
|
33
33
|
aws-sdk-kms (1.51.0)
|
34
34
|
aws-sdk-core (~> 3, >= 3.122.0)
|
35
35
|
aws-sigv4 (~> 1.1)
|
36
|
-
aws-sdk-s3 (1.
|
36
|
+
aws-sdk-s3 (1.106.0)
|
37
37
|
aws-sdk-core (~> 3, >= 3.122.0)
|
38
38
|
aws-sdk-kms (~> 1)
|
39
39
|
aws-sigv4 (~> 1.4)
|
data/docker/Dockerfile
CHANGED
@@ -8,7 +8,7 @@ ARG GEM_VERSION=>0
|
|
8
8
|
ARG user_id=1000
|
9
9
|
# Get latest rubygems
|
10
10
|
RUN gem update --system
|
11
|
-
RUN apk add --no-cache postgresql-dev libffi-dev tzdata gettext wget sudo libmcrypt-dev sqlite sqlite-dev nodejs npm yarn shared-mime-info git build-base curl bash openjdk11-jre python2
|
11
|
+
RUN apk add --no-cache postgresql-dev libffi-dev tzdata gettext wget sudo libmcrypt-dev sqlite sqlite-dev nodejs npm yarn shared-mime-info git build-base curl bash openjdk11-jre python2 sassc
|
12
12
|
RUN addgroup app --gid 1000
|
13
13
|
RUN adduser -SD -u 1000 --shell /bin/bash --home /home/app app app
|
14
14
|
RUN chown -R app:app /usr/local/bundle
|
@@ -10,10 +10,6 @@ module EtFullSystem
|
|
10
10
|
method_option :without, type: :array, default: [], banner: "service1 service2", desc: "If specified, disables the specified services from running. The services are et1_web, et1_sidekiq, et3_web, mail_web, api_web, api_sidekiq, admin_web, atos_api_web, s3_web, azure_blob_web, fake_acas_web, fake_ccd_web"
|
11
11
|
method_option :ccd_docker, type: :boolean, default: false, aliases: 'ccd-docker', desc: "If specified, instead of using the built in fake ccd server, the system will connect to your local machine (see ccd-docker-host option also)"
|
12
12
|
method_option :ccd_docker_host, type: :string, default: 'docker.for.mac.localhost', aliases: 'ccd-docker-host', desc: "Only used if ccd-docker=true. This specifies the host name of your machine when viewed from inside the docker container. This defaults to docker.for.mac.localhost which is suitable for mac OSX only. Consult docker documentation for other systems"
|
13
|
-
method_option :with_test, type: :boolean, default: false, aliases: 'with-test'
|
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
|
-
method_option :chrome_instances, type: :numeric, default: 1, aliases: 'chrome-instances', desc: 'Specify the number of chrome instances for selenium'
|
16
|
-
method_option :firefox_instances, type: :numeric, default: 1, aliases: 'firefox-instances', desc: 'Specify the number of firefox instances for selenium'
|
17
13
|
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)'
|
18
14
|
def up(*args)
|
19
15
|
unbundled do
|
@@ -35,12 +31,6 @@ module EtFullSystem
|
|
35
31
|
env_vars << "CCD_GENERATE_ETHOS_CASE_REFERENCE=true"
|
36
32
|
end
|
37
33
|
extra_args = []
|
38
|
-
if options.with_test? && options.use_selenium?
|
39
|
-
extra_args.concat(["--scale chrome=#{options.chrome_instances}"])
|
40
|
-
extra_args.concat(["--scale firefox=#{options.firefox_instances}"])
|
41
|
-
else
|
42
|
-
extra_args.concat(['--scale selenium-hub=0', '--scale chrome=0', '--scale firefox=0'])
|
43
|
-
end
|
44
34
|
env_vars << "DB_PORT=#{ENV.fetch('DB_PORT', EtFullSystem.is_port_open?(5432) ? 0 : 5432)}"
|
45
35
|
env_vars << "REDIS_PORT=#{ENV.fetch('REDIS_PORT', EtFullSystem.is_port_open?(6379) ? 0 : 6379)}"
|
46
36
|
gem_root = File.absolute_path('../../../..', __dir__)
|
@@ -338,11 +338,14 @@ module EtFullSystem
|
|
338
338
|
end
|
339
339
|
|
340
340
|
def external_command(cmd, tag)
|
341
|
-
IO.popen(cmd) do |io|
|
341
|
+
ret = IO.popen(cmd) do |io|
|
342
342
|
io.each do |line|
|
343
343
|
puts "| #{tag} | #{line}"
|
344
344
|
end
|
345
345
|
end
|
346
|
+
raise "Command failed" unless $?.exitstatus.zero?
|
347
|
+
|
348
|
+
ret
|
346
349
|
end
|
347
350
|
|
348
351
|
def setup_et1_service
|
@@ -351,7 +354,7 @@ module EtFullSystem
|
|
351
354
|
puts cmd
|
352
355
|
external_command cmd, 'et1 setup'
|
353
356
|
|
354
|
-
cmd = "bash --login -c \"cd #{PROJECT_PATH}/systems/et1 &&
|
357
|
+
cmd = "bash --login -c \"cd #{PROJECT_PATH}/systems/et1 && yarn install\""
|
355
358
|
puts cmd
|
356
359
|
external_command cmd, 'et1 setup'
|
357
360
|
|
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: 6.0.0.pre.
|
4
|
+
version: 6.0.0.pre.rc13
|
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-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|