et_full_system 8.1.0.pre.rc1 → 8.1.0.pre.rc3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/docker/Dockerfile +1 -1
- data/lib/et_full_system/cli/local.rb +13 -8
- data/lib/et_full_system/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e71031820c9c1e5f2ca9cf4360dcb5ddbf1bb7d0be1890946164e74f2ac55102
|
4
|
+
data.tar.gz: 76d435c3ae4d29c5fa83a75e5d093eba3d09caf6bba9eda6cb2a3f8a7d680b31
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bdf4c8912f11aac69531a4867a89e8475ec697c2d65a228317a0fe7043c5840980b86eb631aed246a3cc2ca46ee6512933824258be964183d37c0b561f917b7a
|
7
|
+
data.tar.gz: 3fdd1637354d3a249814d302da8ec2e6372f885441e822f4ff5787cd87eb044c6f55925b559ad76f9e961986fba9268de35a8fce1d3e550f4249a31d95b31716
|
data/Gemfile.lock
CHANGED
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 gnupg2
|
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,6 +143,7 @@ module EtFullSystem
|
|
143
143
|
def setup
|
144
144
|
setup_depencencies
|
145
145
|
install_bundler if rvm_installed?
|
146
|
+
install_rvm if options.in_docker_compose? && rvm_required?
|
146
147
|
setup_ruby_versions
|
147
148
|
setup_services
|
148
149
|
end
|
@@ -168,12 +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
|
-
|
176
|
-
versions.each do |version|
|
173
|
+
additional_ruby_versions.each do |version|
|
177
174
|
puts "------------------------------------------------ SETTING UP ruby #{version} ---------------------------------------------------"
|
178
175
|
cmd = "bash --login -c \"rvm install #{version}\""
|
179
176
|
puts cmd
|
@@ -511,10 +508,8 @@ module EtFullSystem
|
|
511
508
|
def install_rvm
|
512
509
|
return if rvm_installed?
|
513
510
|
|
514
|
-
raise "Refusing to install rvm locally - please install yourself" if !in_docker_compose?
|
515
|
-
|
516
511
|
puts "------------------------------------------------ Installing rvm ---------------------------------------------------"
|
517
|
-
cmds = ["
|
512
|
+
cmds = ["gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"]
|
518
513
|
cmds << "bash --login -c \"cd #{PROJECT_PATH} && curl -sSL https://get.rvm.io | bash -s stable\""
|
519
514
|
|
520
515
|
cmds.each do |cmd|
|
@@ -523,6 +518,16 @@ module EtFullSystem
|
|
523
518
|
end
|
524
519
|
end
|
525
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
|
+
|
526
531
|
def install_bundler
|
527
532
|
puts "------------------------------------------------ Installing bundler ---------------------------------------------------"
|
528
533
|
cmd ="bash --login -c \"cd #{PROJECT_PATH} && gem install bundler:1.17.3\""
|