et_full_system 8.1.0.pre.rc1 → 8.1.0.pre.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16b38008980e266ef8a4739a6f077232a8fb89a0d017861706890b4eb637717f
-  data.tar.gz: a16617a9c8f0d0bacd1265258a96075fc67074dacfb49ac74836189fb4824a51
+  metadata.gz: e71031820c9c1e5f2ca9cf4360dcb5ddbf1bb7d0be1890946164e74f2ac55102
+  data.tar.gz: 76d435c3ae4d29c5fa83a75e5d093eba3d09caf6bba9eda6cb2a3f8a7d680b31
 SHA512:
-  metadata.gz: 453d6ee7cc9d71e9caf16ed66989b3658abff3b547f4f3d5fd68c5a3822ba0daefc2a161551e9b66396e0e82840a8dd29e82385a60bb43e76bfdf43a9d03a510
-  data.tar.gz: 7855a8dc90c98aaf8000f0ddc62c94f7b43e781314f1b262e9c70bdd693bb5a7058b31029ed4ed3ca5c4fbb923bd6630ac1565e4db94c3d70542a0f9d2a2cd59
+  metadata.gz: bdf4c8912f11aac69531a4867a89e8475ec697c2d65a228317a0fe7043c5840980b86eb631aed246a3cc2ca46ee6512933824258be964183d37c0b561f917b7a
+  data.tar.gz: 3fdd1637354d3a249814d302da8ec2e6372f885441e822f4ff5787cd87eb044c6f55925b559ad76f9e961986fba9268de35a8fce1d3e550f4249a31d95b31716

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (8.1.0.pre.rc1)
+    et_full_system (8.1.0.pre.rc3)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
       et_fake_ccd (~> 1.0)

data/docker/Dockerfile

@@ -8,7 +8,7 @@ ARG GEM_VERSION=>0
 ARG user_id=1000
 # Get latest rubygems
 RUN gem update --system
-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
+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
 RUN addgroup app --gid 1000
 RUN adduser -SD -u 1000 --shell /bin/bash --home /home/app app app
 RUN chown -R app:app /usr/local/bundle

data/lib/et_full_system/cli/local.rb

@@ -143,6 +143,7 @@ module EtFullSystem
     def setup
       setup_depencencies
       install_bundler if rvm_installed?
+      install_rvm if options.in_docker_compose? && rvm_required?
       setup_ruby_versions
       setup_services
     end
@@ -168,12 +169,8 @@ module EtFullSystem
 
     desc "setup_ruby_versions", "Install all ruby versions required"
     def setup_ruby_versions
-      versions = Dir.glob(File.join(PROJECT_PATH, 'systems', '*', '.ruby-version')).map do |version_file|
-        File.read(version_file).split("\n").first.gsub(/\Aruby-/, '')
-      end.uniq - [RUBY_VERSION]
 
-      install_rvm
-      versions.each do |version|
+      additional_ruby_versions.each do |version|
         puts "------------------------------------------------ SETTING UP ruby #{version} ---------------------------------------------------"
         cmd = "bash --login -c \"rvm install #{version}\""
         puts cmd
@@ -511,10 +508,8 @@ module EtFullSystem
     def install_rvm
       return if rvm_installed?
 
-      raise "Refusing to install rvm locally - please install yourself" if !in_docker_compose?
-
       puts "------------------------------------------------ Installing rvm ---------------------------------------------------"
-      cmds = ["gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"]
+      cmds = ["gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"]
       cmds << "bash --login -c \"cd #{PROJECT_PATH} && curl -sSL https://get.rvm.io | bash -s stable\""
 
       cmds.each do |cmd|
@@ -523,6 +518,16 @@ module EtFullSystem
       end
     end
 
+    def additional_ruby_versions
+      @additional_ruby_versions = Dir.glob(File.join(PROJECT_PATH, 'systems', '*', '.ruby-version')).map do |version_file|
+        File.read(version_file).split("\n").first.gsub(/\Aruby-/, '')
+      end.uniq - [RUBY_VERSION]
+    end
+
+    def rvm_required?
+      additional_ruby_versions.any?
+    end
+
     def install_bundler
       puts "------------------------------------------------ Installing bundler ---------------------------------------------------"
       cmd ="bash --login -c \"cd #{PROJECT_PATH} && gem install bundler:1.17.3\""

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "8.1.0-rc1"
+  VERSION = "8.1.0-rc3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 8.1.0.pre.rc1
+  version: 8.1.0.pre.rc3
 platform: ruby
 authors:
 - Gary Taylor