et_full_system 1.0.3 → 1.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +43 -44
  3. data/foreman/et1.env +2 -1
  4. data/foreman/et3.env +2 -1
  5. data/lib/et_full_system/cli/docker.rb +6 -6
  6. data/lib/et_full_system/version.rb +1 -1
  7. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 68d64ffac81f8404b1e85e62da30a05d25994dcaa69da8dcc3c02efde2101bb0
4
- data.tar.gz: ef0cee834e7a222793d4c30c044ad9d9aea86888b6b6ab1f003d025464636b51
3
+ metadata.gz: 14f221fa2a8e1f716098f53b4f09e3a28fb8ac46b3d43a03156ce5052c2addf6
4
+ data.tar.gz: 041cdec1f87bd55f9e3d4fe4358e65b01918fc666b914ba33f91227b39a4115e
5
5
  SHA512:
6
- metadata.gz: 3cc058164e00318e0da0d947f0abdbf1bb2bd05cd2c4317a929599d5974e450ebc17981aceacf0796704ed99e4155994d791ac896767444a692741d614ef3a7f
7
- data.tar.gz: 2f4bfbbc1dcfcf45c6f3f49339329c55bce8fe870c4f132628f01f19284ccdab6c11879574b6ba86bfa76b2061d576a7c8f4774e440cfcedf52bb73dd7bc6a15
6
+ metadata.gz: d2cfee0a9f1d2644d9db988c9230b50f88d16b2e1216a3c8f43ed8207dde69e0ff570d1bb24671d9bcc48c82543a3c116cc78cac227e8d2c4a6558a665542503
7
+ data.tar.gz: 5fb8cc12e9e3cd8d1493dc31ac6be74a16e6ffbb263d1ce61484365c39060845f8780c3d13c1ea7b19fc722511be3300f3ba6c04b98e596a6adf12552dade503
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- et_full_system (1.0.3)
4
+ et_full_system (1.0.9)
5
5
  aws-sdk-s3 (~> 1.9)
6
6
  azure-storage (~> 0.15.0.preview)
7
7
  dotenv (~> 2.7, >= 2.7.2)
@@ -13,32 +13,32 @@ PATH
13
13
  GEM
14
14
  remote: https://rubygems.org/
15
15
  specs:
16
- activemodel (6.0.2.2)
17
- activesupport (= 6.0.2.2)
18
- activesupport (6.0.2.2)
16
+ activemodel (6.1.0)
17
+ activesupport (= 6.1.0)
18
+ activesupport (6.1.0)
19
19
  concurrent-ruby (~> 1.0, >= 1.0.2)
20
- i18n (>= 0.7, < 2)
21
- minitest (~> 5.1)
22
- tzinfo (~> 1.1)
23
- zeitwerk (~> 2.2)
20
+ i18n (>= 1.6, < 2)
21
+ minitest (>= 5.1)
22
+ tzinfo (~> 2.0)
23
+ zeitwerk (~> 2.3)
24
24
  addressable (2.7.0)
25
25
  public_suffix (>= 2.0.2, < 5.0)
26
26
  aws-eventstream (1.1.0)
27
- aws-partitions (1.296.0)
28
- aws-sdk-core (3.94.0)
27
+ aws-partitions (1.414.0)
28
+ aws-sdk-core (3.110.0)
29
29
  aws-eventstream (~> 1, >= 1.0.2)
30
30
  aws-partitions (~> 1, >= 1.239.0)
31
31
  aws-sigv4 (~> 1.1)
32
32
  jmespath (~> 1.0)
33
- aws-sdk-kms (1.30.0)
34
- aws-sdk-core (~> 3, >= 3.71.0)
33
+ aws-sdk-kms (1.40.0)
34
+ aws-sdk-core (~> 3, >= 3.109.0)
35
35
  aws-sigv4 (~> 1.1)
36
- aws-sdk-s3 (1.61.2)
37
- aws-sdk-core (~> 3, >= 3.83.0)
36
+ aws-sdk-s3 (1.87.0)
37
+ aws-sdk-core (~> 3, >= 3.109.0)
38
38
  aws-sdk-kms (~> 1)
39
39
  aws-sigv4 (~> 1.1)
40
- aws-sigv4 (1.1.1)
41
- aws-eventstream (~> 1.0, >= 1.0.2)
40
+ aws-sigv4 (1.2.2)
41
+ aws-eventstream (~> 1, >= 1.0.2)
42
42
  azure-core (0.1.15)
43
43
  faraday (~> 0.9)
44
44
  faraday_middleware (~> 0.10)
@@ -48,9 +48,8 @@ GEM
48
48
  faraday (~> 0.9)
49
49
  faraday_middleware (~> 0.10)
50
50
  nokogiri (~> 1.6, >= 1.6.8)
51
- backports (3.17.1)
52
- concurrent-ruby (1.1.6)
53
- dotenv (2.7.5)
51
+ concurrent-ruby (1.1.7)
52
+ dotenv (2.7.6)
54
53
  et_fake_acas_server (0.1.10)
55
54
  activesupport (>= 5.2)
56
55
  iodine (~> 0.7)
@@ -58,7 +57,7 @@ GEM
58
57
  ruby-mcrypt (~> 0.2)
59
58
  sinatra (~> 2.0, >= 2.0.3)
60
59
  sinatra-contrib (~> 2.0)
61
- et_fake_ccd (1.0.5)
60
+ et_fake_ccd (1.1.1)
62
61
  activemodel (>= 5.2.3)
63
62
  iodine (~> 0.7)
64
63
  json-schema (~> 2.5)
@@ -70,56 +69,56 @@ GEM
70
69
  multipart-post (>= 1.2, < 3)
71
70
  faraday_middleware (0.14.0)
72
71
  faraday (>= 0.7.4, < 1.0)
73
- httparty (0.18.0)
72
+ httparty (0.18.1)
74
73
  mime-types (~> 3.0)
75
74
  multi_xml (>= 0.5.2)
76
- i18n (1.8.2)
75
+ i18n (1.8.7)
77
76
  concurrent-ruby (~> 1.0)
78
- iodine (0.7.38)
77
+ iodine (0.7.43)
79
78
  jmespath (1.4.0)
80
79
  json-schema (2.8.1)
81
80
  addressable (>= 2.4)
82
81
  mime-types (3.3.1)
83
82
  mime-types-data (~> 3.2015)
84
- mime-types-data (3.2019.1009)
85
- mini_portile2 (2.4.0)
86
- minitest (5.14.0)
87
- multi_json (1.14.1)
83
+ mime-types-data (3.2020.1104)
84
+ mini_portile2 (2.5.0)
85
+ minitest (5.14.2)
86
+ multi_json (1.15.0)
88
87
  multi_xml (0.6.0)
89
88
  multipart-post (2.1.1)
90
89
  mustermann (1.1.1)
91
90
  ruby2_keywords (~> 0.0.1)
92
- nokogiri (1.10.9)
93
- mini_portile2 (~> 2.4.0)
94
- public_suffix (4.0.4)
95
- rack (2.2.2)
96
- rack-protection (2.0.8.1)
91
+ nokogiri (1.11.0)
92
+ mini_portile2 (~> 2.5.0)
93
+ racc (~> 1.4)
94
+ public_suffix (4.0.6)
95
+ racc (1.5.2)
96
+ rack (2.2.3)
97
+ rack-protection (2.1.0)
97
98
  rack
98
99
  rake (13.0.1)
99
- roda (3.30.0)
100
+ roda (3.39.0)
100
101
  rack
101
102
  rotp (5.1.0)
102
103
  addressable (~> 2.5)
103
104
  ruby-mcrypt (0.2.0)
104
105
  ruby2_keywords (0.0.2)
105
- sinatra (2.0.8.1)
106
+ sinatra (2.1.0)
106
107
  mustermann (~> 1.0)
107
- rack (~> 2.0)
108
- rack-protection (= 2.0.8.1)
108
+ rack (~> 2.2)
109
+ rack-protection (= 2.1.0)
109
110
  tilt (~> 2.0)
110
- sinatra-contrib (2.0.8.1)
111
- backports (>= 2.8.2)
111
+ sinatra-contrib (2.1.0)
112
112
  multi_json
113
113
  mustermann (~> 1.0)
114
- rack-protection (= 2.0.8.1)
115
- sinatra (= 2.0.8.1)
114
+ rack-protection (= 2.1.0)
115
+ sinatra (= 2.1.0)
116
116
  tilt (~> 2.0)
117
117
  thor (1.0.1)
118
- thread_safe (0.3.6)
119
118
  tilt (2.0.10)
120
- tzinfo (1.2.7)
121
- thread_safe (~> 0.1)
122
- zeitwerk (2.3.0)
119
+ tzinfo (2.0.4)
120
+ concurrent-ruby (~> 1.0)
121
+ zeitwerk (2.4.2)
123
122
 
124
123
  PLATFORMS
125
124
  ruby
data/foreman/et1.env CHANGED
@@ -13,8 +13,9 @@ AWS_S3_FORCE_PATH_STYLE=true
13
13
  ET_API_URL='http://api.et.127.0.0.1.nip.io:3100/api/v2'
14
14
  SECURE_SESSION_COOKIE=false
15
15
  SENDING_HOST=et1.et.127.0.0.1.nip.io
16
+ ROOT_URL=http://et1.et.127.0.0.1.nip.io:3100
16
17
  FLATTEN_PDF=false
17
18
  SIDEKIQ_ALIVE_PORT=7434
18
19
  DISABLE_SIDEKIQ_ALIVE=true
19
20
  SERVICE_NOW_EMAIL=fake@servicenow.fake.com
20
- AZURE_APP_INSIGHTS_ROLE_NAME=et1-fs
21
+ AZURE_APP_INSIGHTS_ROLE_NAME=et1-fs
data/foreman/et3.env CHANGED
@@ -2,4 +2,5 @@ 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
4
  AZURE_APP_INSIGHTS_ROLE_NAME=et3-fs
5
- DB_NAME=et3_production
5
+ DB_NAME=et3_production
6
+ ROOT_URL=http://et3.et.127.0.0.1.nip.io:3100
data/lib/et_full_system/cli/docker.rb CHANGED
@@ -32,7 +32,7 @@ module EtFullSystem
32
32
  def compose(*args)
33
33
  unbundled do
34
34
  gem_root = File.absolute_path('../../..', __dir__)
35
- cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
35
+ cmd = "UID=#{Process.uid} GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
36
36
  puts cmd
37
37
  exec(cmd)
38
38
  end
@@ -47,10 +47,10 @@ module EtFullSystem
47
47
  def reset
48
48
  unbundled do
49
49
  gem_root = File.absolute_path('../../..', __dir__)
50
- cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml down -v"
50
+ cmd = "UID=#{Process.uid} GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml down -v"
51
51
  puts cmd
52
52
  next unless system(cmd)
53
- cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml build --no-cache"
53
+ cmd = "UID=#{Process.uid} GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml build --no-cache"
54
54
  puts cmd
55
55
  next unless system(cmd)
56
56
  self.class.start(['setup'])
@@ -238,7 +238,7 @@ module EtFullSystem
238
238
  unbundled do
239
239
  gem_root = File.absolute_path('../../..', __dir__)
240
240
  cmd = "/bin/bash --login -c \"et_full_system local #{cmd}\""
241
- compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
241
+ compose_cmd = "UID=#{Process.uid} GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
242
242
  if return_output
243
243
  `#{compose_cmd}`
244
244
  else
@@ -250,7 +250,7 @@ module EtFullSystem
250
250
  def run_compose_command(*args, silent: false)
251
251
  unbundled do
252
252
  gem_root = File.absolute_path('../../..', __dir__)
253
- cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
253
+ cmd = "UID=#{Process.uid} GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
254
254
  puts cmd unless silent
255
255
  `#{cmd}`
256
256
  end
@@ -267,7 +267,7 @@ module EtFullSystem
267
267
  case ::EtFullSystem.os
268
268
  when :linux, :unix
269
269
  "http://#{host_ip}:#{port}"
270
- when :osx
270
+ when :macosx
271
271
  "http://docker.for.mac.localhost"
272
272
  when :windows
273
273
  "http://docker.for.windows.localhost"
data/lib/et_full_system/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EtFullSystem
2
- VERSION = "1.0.3"
2
+ VERSION = "1.0.9"
3
3
  end
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: 1.0.3
4
+ version: 1.0.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gary Taylor
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-04-13 00:00:00.000000000 Z
11
+ date: 2021-01-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
200
200
  version: '0'
201
201
  requirements: []
202
202
  rubyforge_project:
203
- rubygems_version: 2.7.7
203
+ rubygems_version: 2.7.6
204
204
  signing_key:
205
205
  specification_version: 4
206
206
  summary: Runs the employment tribunals system - all services and background jobs