et_full_system 1.0.1.pre18 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 187dbddd70b80550efdca0dc292f0aabb45921e028c25439d3f2fdac19252ad6
-  data.tar.gz: c45be4c73a2f26a60f9be3b948ba00bd7c1bfca9cf70b9f9e8e3030e059dac5e
+  metadata.gz: 0d6325ae70f727c29f3782eab6462006951964f6337768af5acdbb949f20ca7a
+  data.tar.gz: 8a6e52ab4d94b8c7e72d472419cd635d79dd3903e01b0e6aab2da5bfbb40a849
 SHA512:
-  metadata.gz: 82fb30f26bbf8ef1b4c53f9a48ae9b1a1c496348be175f5f7a21048ccf46cb66b578978eac91457904ef80b0eb15b02d2420dd30d82653dbc8b5a8527a06d240
-  data.tar.gz: e337463bfbf708467207295e7d42adcb45f32593150d2ea40cc2d47e9072ebb4c7a78fca22b3f45a36e94b04a4853b356f29405d2737ec690a4cfb22da9d85e3
+  metadata.gz: 2904cc7a74fb1adb30a1098b4001539f5313b7befaadb3b21f0a83a7d441391698dfedf682755a45aec7a85d532e9c0a266e86867d2f4afa60901f5ca50a62b5
+  data.tar.gz: b7a37a684d602756c3a2660d4612c137f8b4c2cb0b9fcda69039ab380aa4c67d115dc7c0fd0f782ac984c8aa8f55d52e6903a5f897c5d4a7301fe60ee5794591

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (1.0.1.pre18)
+    et_full_system (1.0.6)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
@@ -13,31 +13,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activesupport (6.0.2.1)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.275.0)
-    aws-sdk-core (3.90.1)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.329.0)
+    aws-sdk-core (3.99.2)
+      aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.29.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-kms (1.34.1)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.60.2)
-      aws-sdk-core (~> 3, >= 3.83.0)
+    aws-sdk-s3 (1.68.1)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
+    aws-sigv4 (1.1.4)
       aws-eventstream (~> 1.0, >= 1.0.2)
     azure-core (0.1.15)
       faraday (~> 0.9)
@@ -48,7 +48,7 @@ GEM
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       nokogiri (~> 1.6, >= 1.6.8)
-    backports (3.16.1)
+    backports (3.17.2)
     concurrent-ruby (1.1.6)
     dotenv (2.7.5)
     et_fake_acas_server (0.1.10)
@@ -58,7 +58,7 @@ GEM
       ruby-mcrypt (~> 0.2)
       sinatra (~> 2.0, >= 2.0.3)
       sinatra-contrib (~> 2.0)
-    et_fake_ccd (1.0.2)
+    et_fake_ccd (1.0.8)
       activemodel (>= 5.2.3)
       iodine (~> 0.7)
       json-schema (~> 2.5)
@@ -70,33 +70,33 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
-    httparty (0.18.0)
+    httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    iodine (0.7.38)
+    iodine (0.7.40)
     jmespath (1.4.0)
     json-schema (2.8.1)
       addressable (>= 2.4)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    public_suffix (4.0.3)
+    public_suffix (4.0.5)
     rack (2.2.2)
     rack-protection (2.0.8.1)
       rack
     rake (13.0.1)
-    roda (3.29.0)
+    roda (3.32.0)
       rack
     rotp (5.1.0)
       addressable (~> 2.5)
@@ -117,9 +117,9 @@ GEM
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

data/docker/Dockerfile

@@ -2,6 +2,7 @@ FROM phusion/passenger-customizable:0.9.34
 # Set correct environment variables.
 ENV HOME /root
 ARG GEM_VERSION=>0
+ARG user_id=1000
 # Use baseimage-docker's init process.
 CMD ["/sbin/my_init"]
 
@@ -98,8 +99,8 @@ RUN mkdir -p /home/app/full_system; chown app:app /home/app/full_system
 # Install gems and binstubs to run without bundler
 RUN mkdir -p /home/app/system_gems/et_full_system && chmod 0777 /home/app/system_gems/et_full_system && chown -R app:app /home/app/system_gems
 
-RUN usermod -o -u 1000 app
-RUN groupmod -o -g 1000 app
+RUN usermod -o -u $user_id app
+RUN groupmod -o -g $user_id app
 WORKDIR /home/app/full_system
 RUN echo "app ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && chmod 0440 /etc/sudoers.d/user
 USER app

data/docker/docker-compose.yml

@@ -7,6 +7,7 @@ services:
       dockerfile: docker/Dockerfile
       args:
         GEM_VERSION:
+        user_id: ${UID:-1000}
 
     ports:
       - '${SERVER_PORT:-3100}:${SERVER_PORT:-3100}'
@@ -61,6 +62,7 @@ services:
       CCD_AUTH_BASE_URL: ${CCD_AUTH_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/auth}
       CCD_IDAM_BASE_URL: ${CCD_IDAM_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/idam}
       CCD_DATA_STORE_BASE_URL: ${CCD_DATA_STORE_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/data_store}
+      CCD_ECM_BASE_URL: ${CCD_ECM_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/ecm}
       CCD_DOCUMENT_STORE_BASE_URL: ${CCD_DOCUMENT_STORE_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/document_store}
       CCD_DOCUMENT_STORE_URL_REWRITE: ${CCD_DOCUMENT_STORE_URL_REWRITE:-false}
       CCD_USE_SIDAM: ${CCD_USE_SIDAM:-true}

data/foreman/et1.env

@@ -13,8 +13,9 @@ AWS_S3_FORCE_PATH_STYLE=true
 ET_API_URL='http://api.et.127.0.0.1.nip.io:3100/api/v2'
 SECURE_SESSION_COOKIE=false
 SENDING_HOST=et1.et.127.0.0.1.nip.io
+ROOT_URL=http://et1.et.127.0.0.1.nip.io:3100
 FLATTEN_PDF=false
 SIDEKIQ_ALIVE_PORT=7434
 DISABLE_SIDEKIQ_ALIVE=true
 SERVICE_NOW_EMAIL=fake@servicenow.fake.com
-AZURE_APP_INSIGHTS_ROLE_NAME=et1-fs
+AZURE_APP_INSIGHTS_ROLE_NAME=et1-fs

data/foreman/et_ccd_export.env

@@ -5,6 +5,7 @@ RAVEN_DSN=https://0ac125aa9b0240c793e081753671c041:531ce66cc13748fbbc87e0fe66d05
 CCD_AUTH_BASE_URL=${CCD_AUTH_BASE_URL}
 CCD_IDAM_BASE_URL=${CCD_IDAM_BASE_URL}
 CCD_DATA_STORE_BASE_URL=${CCD_DATA_STORE_BASE_URL}
+CCD_ECM_BASE_URL=${CCD_ECM_BASE_URL}
 CCD_DOCUMENT_STORE_BASE_URL=${CCD_DOCUMENT_STORE_BASE_URL}
 CCD_USE_SIDAM=${CCD_USE_SIDAM}
 CCD_MICROSERVICE_ID=${CCD_MICROSERVICE_ID}

data/lib/et_full_system/cli/docker.rb

@@ -22,7 +22,7 @@ module EtFullSystem
       unbundled do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "/bin/bash --login -c \"cd /home/app/full_system && et_full_system docker bootstrap && et_full_system local setup\""
-        compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
+        compose_cmd = "UID=#{Process.uid} GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
         puts compose_cmd
         exec(compose_cmd)
       end
@@ -32,7 +32,7 @@ module EtFullSystem
     def compose(*args)
       unbundled do
         gem_root = File.absolute_path('../../..', __dir__)
-        cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
+        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(' ')}"
         puts cmd
         exec(cmd)
       end
@@ -47,10 +47,10 @@ module EtFullSystem
     def reset
       unbundled do
         gem_root = File.absolute_path('../../..', __dir__)
-        cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml down -v"
+        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"
         puts cmd
         next unless system(cmd)
-        cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml build --no-cache"
+        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"
         puts cmd
         next unless system(cmd)
         self.class.start(['setup'])
@@ -238,7 +238,7 @@ module EtFullSystem
       unbundled do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "/bin/bash --login -c \"et_full_system local #{cmd}\""
-        compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
+        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}"
         if return_output
           `#{compose_cmd}`
         else
@@ -250,7 +250,7 @@ module EtFullSystem
     def run_compose_command(*args, silent: false)
       unbundled do
         gem_root = File.absolute_path('../../..', __dir__)
-        cmd = "GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
+        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(' ')}"
         puts cmd unless silent
         `#{cmd}`
       end

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "1.0.1.pre18"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 1.0.1.pre18
+  version: 1.0.6
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -195,11 +195,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Runs the employment tribunals system - all services and background jobs