et_full_system 8.0.4 → 8.1.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/.ruby-version +1 -1
- data/Gemfile.lock +14 -12
- data/docker/Dockerfile +1 -1
- data/lib/et_full_system/cli/local.rb +26 -5
- data/lib/et_full_system/version.rb +1 -1
- metadata +7 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fa2a567c7fdaac726c60d3d4fbab9ce83068d73f4be685ff4b0d58f017653118
|
4
|
+
data.tar.gz: 20c116d6789fa576534588dc4c51a10c8ca17dd7594cf07ce43bd63a1735c2b9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 371b17c780a8dd4da1a717f70d36fdf3b5ed78f6b0c460074652ae99f5412c81c15ea4bd2c6f1727249425687b80003b73d175bbeb98488c7c445b1da375c2e1
|
7
|
+
data.tar.gz: c124a3e02fbb78f8421004371ca128e28e571ae6d60392b7993c41c2fc74ffc6141f969c661860b76483de767e06a7f5d6b769a839c977cf3aac30432604506b
|
data/.ruby-version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
2.7.
|
1
|
+
2.7.7
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
et_full_system (8.0.
|
4
|
+
et_full_system (8.1.0.pre.rc2)
|
5
5
|
azure-storage (~> 0.15.0.preview)
|
6
6
|
dotenv (~> 2.7, >= 2.7.2)
|
7
7
|
et_fake_ccd (~> 1.0)
|
@@ -12,15 +12,15 @@ PATH
|
|
12
12
|
GEM
|
13
13
|
remote: https://rubygems.org/
|
14
14
|
specs:
|
15
|
-
activemodel (6.1.7.
|
16
|
-
activesupport (= 6.1.7.
|
17
|
-
activesupport (6.1.7.
|
15
|
+
activemodel (6.1.7.2)
|
16
|
+
activesupport (= 6.1.7.2)
|
17
|
+
activesupport (6.1.7.2)
|
18
18
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
19
19
|
i18n (>= 1.6, < 2)
|
20
20
|
minitest (>= 5.1)
|
21
21
|
tzinfo (~> 2.0)
|
22
22
|
zeitwerk (~> 2.3)
|
23
|
-
addressable (2.8.
|
23
|
+
addressable (2.8.4)
|
24
24
|
public_suffix (>= 2.0.2, < 6.0)
|
25
25
|
azure-core (0.1.15)
|
26
26
|
faraday (~> 0.9)
|
@@ -58,7 +58,7 @@ GEM
|
|
58
58
|
httparty (0.21.0)
|
59
59
|
mini_mime (>= 1.0.0)
|
60
60
|
multi_xml (>= 0.5.2)
|
61
|
-
i18n (1.
|
61
|
+
i18n (1.14.1)
|
62
62
|
concurrent-ruby (~> 1.0)
|
63
63
|
iodine (0.7.54)
|
64
64
|
json-schema (2.8.1)
|
@@ -70,7 +70,8 @@ GEM
|
|
70
70
|
net-pop
|
71
71
|
net-smtp
|
72
72
|
mini_mime (1.1.2)
|
73
|
-
|
73
|
+
mini_portile2 (2.8.2)
|
74
|
+
minitest (5.18.0)
|
74
75
|
multi_xml (0.6.0)
|
75
76
|
multipart-post (2.3.0)
|
76
77
|
net-imap (0.3.4)
|
@@ -82,12 +83,13 @@ GEM
|
|
82
83
|
timeout
|
83
84
|
net-smtp (0.3.3)
|
84
85
|
net-protocol
|
85
|
-
nokogiri (1.
|
86
|
+
nokogiri (1.15.2)
|
87
|
+
mini_portile2 (~> 2.8.2)
|
86
88
|
racc (~> 1.4)
|
87
89
|
pastel (0.8.0)
|
88
90
|
tty-color (~> 0.5)
|
89
91
|
public_suffix (5.0.1)
|
90
|
-
racc (1.
|
92
|
+
racc (1.7.0)
|
91
93
|
rack (3.0.4.1)
|
92
94
|
rake (13.0.1)
|
93
95
|
roda (3.66.0)
|
@@ -96,15 +98,15 @@ GEM
|
|
96
98
|
roda (>= 3.19.0)
|
97
99
|
tty-logger (>= 0.3, < 1.0)
|
98
100
|
rotp (6.2.2)
|
99
|
-
thor (1.2.
|
101
|
+
thor (1.2.2)
|
100
102
|
tilt (2.1.0)
|
101
|
-
timeout (0.3.
|
103
|
+
timeout (0.3.2)
|
102
104
|
tty-color (0.6.0)
|
103
105
|
tty-logger (0.6.0)
|
104
106
|
pastel (~> 0.8)
|
105
107
|
tzinfo (2.0.6)
|
106
108
|
concurrent-ruby (~> 1.0)
|
107
|
-
zeitwerk (2.6.
|
109
|
+
zeitwerk (2.6.8)
|
108
110
|
|
109
111
|
PLATFORMS
|
110
112
|
ruby
|
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 sqlite sqlite-dev nodejs npm yarn shared-mime-info git build-base libc6-compat curl bash openjdk11-jre python2 sassc
|
11
|
+
RUN apk add --no-cache postgresql-dev libffi-dev tzdata gettext wget sudo sqlite sqlite-dev nodejs npm yarn shared-mime-info git build-base libc6-compat 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
|
@@ -143,7 +143,8 @@ module EtFullSystem
|
|
143
143
|
def setup
|
144
144
|
setup_depencencies
|
145
145
|
install_bundler if rvm_installed?
|
146
|
-
|
146
|
+
install_rvm if options.in_docker_compose? && rvm_required?
|
147
|
+
setup_ruby_versions
|
147
148
|
setup_services
|
148
149
|
end
|
149
150
|
|
@@ -168,11 +169,8 @@ module EtFullSystem
|
|
168
169
|
|
169
170
|
desc "setup_ruby_versions", "Install all ruby versions required"
|
170
171
|
def setup_ruby_versions
|
171
|
-
versions = Dir.glob(File.join(PROJECT_PATH, 'systems', '*', '.ruby-version')).map do |version_file|
|
172
|
-
File.read(version_file).split("\n").first.gsub(/\Aruby-/, '')
|
173
|
-
end.uniq - [RUBY_VERSION]
|
174
172
|
|
175
|
-
|
173
|
+
additional_ruby_versions.each do |version|
|
176
174
|
puts "------------------------------------------------ SETTING UP ruby #{version} ---------------------------------------------------"
|
177
175
|
cmd = "bash --login -c \"rvm install #{version}\""
|
178
176
|
puts cmd
|
@@ -507,6 +505,29 @@ module EtFullSystem
|
|
507
505
|
!`which rvm`.empty?
|
508
506
|
end
|
509
507
|
|
508
|
+
def install_rvm
|
509
|
+
return if rvm_installed?
|
510
|
+
|
511
|
+
puts "------------------------------------------------ Installing rvm ---------------------------------------------------"
|
512
|
+
cmds = ["gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"]
|
513
|
+
cmds << "bash --login -c \"cd #{PROJECT_PATH} && curl -sSL https://get.rvm.io | bash -s stable\""
|
514
|
+
|
515
|
+
cmds.each do |cmd|
|
516
|
+
puts cmd
|
517
|
+
external_command cmd, 'rvm setup'
|
518
|
+
end
|
519
|
+
end
|
520
|
+
|
521
|
+
def additional_ruby_versions
|
522
|
+
@additional_ruby_versions = Dir.glob(File.join(PROJECT_PATH, 'systems', '*', '.ruby-version')).map do |version_file|
|
523
|
+
File.read(version_file).split("\n").first.gsub(/\Aruby-/, '')
|
524
|
+
end.uniq - [RUBY_VERSION]
|
525
|
+
end
|
526
|
+
|
527
|
+
def rvm_required?
|
528
|
+
additional_ruby_versions.any?
|
529
|
+
end
|
530
|
+
|
510
531
|
def install_bundler
|
511
532
|
puts "------------------------------------------------ Installing bundler ---------------------------------------------------"
|
512
533
|
cmd ="bash --login -c \"cd #{PROJECT_PATH} && gem install bundler:1.17.3\""
|
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: 8.0.
|
4
|
+
version: 8.1.0.pre.rc2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Gary Taylor
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-06-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|
@@ -175,7 +175,7 @@ homepage: https://github.com/ministryofjustice/et-full-system
|
|
175
175
|
licenses:
|
176
176
|
- MIT
|
177
177
|
metadata: {}
|
178
|
-
post_install_message:
|
178
|
+
post_install_message:
|
179
179
|
rdoc_options: []
|
180
180
|
require_paths:
|
181
181
|
- lib
|
@@ -186,12 +186,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
186
186
|
version: '0'
|
187
187
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
188
188
|
requirements:
|
189
|
-
- - "
|
189
|
+
- - ">"
|
190
190
|
- !ruby/object:Gem::Version
|
191
|
-
version:
|
191
|
+
version: 1.3.1
|
192
192
|
requirements: []
|
193
193
|
rubygems_version: 3.1.6
|
194
|
-
signing_key:
|
194
|
+
signing_key:
|
195
195
|
specification_version: 4
|
196
196
|
summary: Runs the employment tribunals system - all services and background jobs
|
197
197
|
test_files: []
|