et_full_system 0.1.37 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe84809ad5afb3b644912d1a0cc3afc92823a043c054b3a390d75e5f91f7b3eb
-  data.tar.gz: a5ffbb484c3bbfddb04aa3b5a7749bc5250a7b144128f1dbe6b4aab31f967a98
+  metadata.gz: 71e6cb9f546eb6ecf377b5a1ee7da32749e7a3a06351104c3f8cb7e5a0cd23eb
+  data.tar.gz: adb49f55872d8a212ce1457c44f71cfea3944d1c40d8345a17631e21ced62db6
 SHA512:
-  metadata.gz: b9c6f4a191757c0bdfa322eab3237cfe58f9d97db1a3a17e279771a1267b40b62d080665cb097c7e509169a895253a6b14a5f70a5f01185863a48c631593ca50
-  data.tar.gz: 94e4e9f7d7c3a331829b290cfa3467dfe32ad3855a77127c2416993e9e26e6c853d344f4bc717aca7a442c512162339f41da134d06b7f7d856fb3a9f00599a4b
+  metadata.gz: 3ec05769c9126a118257e0528838e8394453393db7ad394c1a319d5bcdbd792978154c18300c972b889145b67333fe3ab9bbe49605f0a38385124bf50293cabb
+  data.tar.gz: 9be72af77c00be3d1b15483979f3ae253280c2818f8dae3ef719218cd47ac08193ca690f1d2b9686838c7ce86986eaca9b1b17cfbcf75198c8e22e0ad03ee5a6

data/Gemfile

@@ -3,5 +3,4 @@ source "https://rubygems.org"
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in et_full_system.gemspec
-gem 'et_fake_acas_server', git: 'https://github.com/ministryofjustice/et_fake_acas_server.git', ref: 'bca2a727c0bd8a16915eee499d0bb3e97ddc5cf0'
 gemspec

data/Gemfile.lock

@@ -1,23 +1,11 @@
-GIT
-  remote: https://github.com/ministryofjustice/et_fake_acas_server.git
-  revision: bca2a727c0bd8a16915eee499d0bb3e97ddc5cf0
-  ref: bca2a727c0bd8a16915eee499d0bb3e97ddc5cf0
-  specs:
-    et_fake_acas_server (0.1.0)
-      activesupport (~> 5.2)
-      nokogiri (~> 1.8, >= 1.8.2)
-      puma (~> 3.12)
-      ruby-mcrypt (~> 0.2)
-      sinatra (~> 2.0, >= 2.0.3)
-      sinatra-contrib (~> 2.0)
-
 PATH
   remote: .
   specs:
-    et_full_system (0.1.37)
+    et_full_system (0.1.38)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
+      et_fake_acas_server (~> 0.1)
       httparty (~> 0.16)
       thor (~> 0.20)
 
@@ -54,9 +42,16 @@ GEM
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       nokogiri (~> 1.6, >= 1.6.8)
-    backports (3.13.0)
+    backports (3.14.0)
     concurrent-ruby (1.1.5)
     dotenv (2.7.2)
+    et_fake_acas_server (0.1.6)
+      activesupport (~> 5.2)
+      nokogiri (~> 1.8, >= 1.8.2)
+      puma (~> 3.12)
+      ruby-mcrypt (~> 0.2)
+      sinatra (~> 2.0, >= 2.0.3)
+      sinatra-contrib (~> 2.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
@@ -76,7 +71,7 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.1.0)
     mustermann (1.0.3)
-    nokogiri (1.10.2)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     puma (3.12.1)
     rack (2.0.7)
@@ -107,7 +102,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.16)
-  et_fake_acas_server!
   et_full_system!
   rake (~> 10.0)
 

data/docker/Dockerfile

@@ -82,18 +82,10 @@ USER app
 RUN bash --login -c "rvm --default use 2.5.1"
 RUN bash --login -c "gem install bundler"
 
-# Bundle install the gem itself to fetch all its dependencies defined in the Gemfile (git deps - hence the complex stuff) - then build and install the full system gem and fake acas server so they are available
-# as commands not needing bundle exec etc...
-COPY . /home/app/system_gems/et_full_system
-WORKDIR /home/app/system_gems/et_full_system
-RUN sudo chown -R app:app .
-RUN bash --login -c "ls -al /home/app/system_gems/et_full_system"
-RUN bash --login -c "rvm use && bundle install"
-RUN bash --login -c "rvm use && gem install dotenv et_full_system"
-RUN bash --login -c "rvm use && cd /usr/local/rvm/gems/ruby-2.5.1/bundler/gems/et_fake_acas_server* && gem build et_fake_acas_server -o /tmp/et_fake_acas_server.gem && gem install /tmp/et_fake_acas_server.gem && rm //tmp/et_fake_acas_server.gem"
+# Install gems required outside of any bundle.
+RUN bash --login -c "rvm use && gem install dotenv et_full_system et_fake_acas_server"
 
 WORKDIR /home/app/full_system
 
-
 RUN cd /home/app
 ENV HOME /home/app

data/docker/docker-compose.yml

@@ -40,7 +40,7 @@ services:
       CLOUD_PROVIDER: ${CLOUD_PROVIDER:-amazon}
       AZURITE_STORAGE_PATH: /home/app/azure_storage_data
       MINIO_STORAGE_PATH: /home/app/minio_data
-    command: /bin/bash --login -c "cd /home/app/full_system && et_full_system local server ${SERVER_ARGS}"
+    command: /bin/bash --login -c "cd /home/app/full_system && et_full_system local server --azurite-storage-path=/home/app/azure_storage_data --minio-storage-path=/home/app/minio_data ${SERVER_ARGS}"
     links:
       - "db"
       - "redis"

data/et_full_system.gemspec

@@ -36,6 +36,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk-s3', '~> 1.9'
   spec.add_dependency 'azure-storage', '~> 0.15.0.preview'
   spec.add_dependency 'dotenv', '~> 2.7', '>= 2.7.2'
+  spec.add_dependency 'et_fake_acas_server', '~> 0.1'
+
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
 end

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "0.1.37"
+  VERSION = "0.1.38"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.38
 platform: ruby
 authors:
 - Gary Taylor
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.2
+- !ruby/object:Gem::Dependency
+  name: et_fake_acas_server
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement