et_full_system 6.0.0.pre.rc11 → 6.0.0.pre.rc15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bb602c2b207d0a039415c4b8bb08ce2f5cfe2e80486816376d9fd4aaaecc6c6
-  data.tar.gz: ce70e62d4839f7a2d50e58e81e9de024835f4721373599bbde0354be38edd9fb
+  metadata.gz: 042413ba29c11a40f416d54c1289e759484d1982099b44e972da550805e52add
+  data.tar.gz: 5ce80e56bec78502d40d13143ebb3c5bcfef4d1c3a0ce3735dcb0ae279111e21
 SHA512:
-  metadata.gz: fd58f19c8f02261a7acf02cca7fec7038c9aaacb56a5ae3383c49ef6d4612638466d244b4d1431c6888d7404ca16c254e6a297bd10904d9b591bc46094e82f5d
-  data.tar.gz: d3f19dde1d83870a8b5422988b2aa929b95e0d13e5939fd97d29e50f70740ece37ed28d8de15a38c08fbbaa0b627a5fe876f94cca3d30257c93a291910fb3f3c
+  metadata.gz: ecc31a170df6ae4b7b011d395f858e3c135082b89eeab9e5a200caa86a6e6a3e9f5894e6db824ebf99b42b0b56ebce045fc3891d51ee8e2d617bcb6d12fdadef
+  data.tar.gz: '049366ceb42cbe223c04356376bfddf216a3d065b8e6d8b746ea01bdc54732b88e98a3c93b66ffb8226438238d2a892ae6a97d313e6ef7930feec6a832b58d92'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (6.0.0.pre.rc11)
+    et_full_system (6.0.0.pre.rc15)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
@@ -24,7 +24,7 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.2.0)
-    aws-partitions (1.531.0)
+    aws-partitions (1.532.0)
     aws-sdk-core (3.122.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -33,7 +33,7 @@ GEM
     aws-sdk-kms (1.51.0)
       aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.105.1)
+    aws-sdk-s3 (1.106.0)
       aws-sdk-core (~> 3, >= 3.122.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)

data/docker/docker-compose.yml

@@ -15,6 +15,13 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
       - et_full_system
+    links:
+      - db
+      - redis
+      - minio
+      - azurite
+      - mailhog
+      - et
   et:
     image: 'et_full_system:1.0.0.pre'
     build:
@@ -83,9 +90,6 @@ services:
       CCD_SIDAM_USERNAME: ${CCD_SIDAM_USERNAME:-m@m.com}
       CCD_SIDAM_PASSWORD: ${CCD_SIDAM_PASSWORD:-p}
     command: /bin/bash --login -c "cd /home/app/full_system && et_full_system local server --in-docker-compose ${SERVER_ARGS}"
-    links:
-      - "db"
-      - "redis"
     networks:
       et_full_system:
         aliases:
@@ -148,6 +152,9 @@ services:
       - traefik.http.routers.s3-router.rule=Host(`s3.et.127.0.0.1.nip.io`)
       - traefik.http.routers.s3-router.service=et1-service
       - traefik.http.services.s3-service.loadbalancer.server.port=9000
+    command:
+      - server
+      - /data
     networks:
       - et_full_system
   mailhog:

data/lib/et_full_system/cli/docker/server.rb

@@ -10,10 +10,6 @@ module EtFullSystem
         method_option :without, type: :array, default: [], banner: "service1 service2", desc: "If specified, disables the specified services from running. The services are et1_web, et1_sidekiq, et3_web, mail_web, api_web, api_sidekiq, admin_web, atos_api_web, s3_web, azure_blob_web, fake_acas_web, fake_ccd_web"
         method_option :ccd_docker, type: :boolean, default: false, aliases: 'ccd-docker', desc: "If specified, instead of using the built in fake ccd server, the system will connect to your local machine (see ccd-docker-host option also)"
         method_option :ccd_docker_host, type: :string, default: 'docker.for.mac.localhost', aliases: 'ccd-docker-host', desc: "Only used if ccd-docker=true.  This specifies the host name of your machine when viewed from inside the docker container.  This defaults to docker.for.mac.localhost which is suitable for mac OSX only.  Consult docker documentation for other systems"
-        method_option :with_test, type: :boolean, default: false, aliases: 'with-test'
-        method_option :use_selenium, type: :boolean, default: false, aliases: 'use-selenium', desc: 'Only used if with_test is true - says to use selenium in preference to zalenium'
-        method_option :chrome_instances, type: :numeric, default: 1, aliases: 'chrome-instances', desc: 'Specify the number of chrome instances for selenium'
-        method_option :firefox_instances, type: :numeric, default: 1, aliases: 'firefox-instances', desc: 'Specify the number of firefox instances for selenium'
         method_option :minimal, type: :boolean, default: false, desc: 'Set to true to only start the minimum (db, redis, mail, s3, azure blob, fake_acas, fake_ccd)'
         def up(*args)
           unbundled do
@@ -35,12 +31,6 @@ module EtFullSystem
               env_vars << "CCD_GENERATE_ETHOS_CASE_REFERENCE=true"
             end
             extra_args = []
-            if options.with_test? && options.use_selenium?
-              extra_args.concat(["--scale chrome=#{options.chrome_instances}"])
-              extra_args.concat(["--scale firefox=#{options.firefox_instances}"])
-            else
-              extra_args.concat(['--scale selenium-hub=0', '--scale chrome=0', '--scale firefox=0'])
-            end
             env_vars << "DB_PORT=#{ENV.fetch('DB_PORT', EtFullSystem.is_port_open?(5432) ? 0 : 5432)}"
             env_vars << "REDIS_PORT=#{ENV.fetch('REDIS_PORT', EtFullSystem.is_port_open?(6379) ? 0 : 6379)}"
             gem_root = File.absolute_path('../../../..', __dir__)

data/lib/et_full_system/cli/local.rb

@@ -338,11 +338,14 @@ module EtFullSystem
     end
 
     def external_command(cmd, tag)
-      IO.popen(cmd) do |io|
+      ret = IO.popen(cmd) do |io|
         io.each do |line|
           puts "| #{tag} | #{line}"
         end
       end
+      raise "Command failed" unless $?.exitstatus.zero?
+
+      ret
     end
 
     def setup_et1_service
@@ -351,7 +354,7 @@ module EtFullSystem
       puts cmd
       external_command cmd, 'et1 setup'
 
-      cmd = "bash --login -c \"cd #{PROJECT_PATH}/systems/et1 && npm install\""
+      cmd = "bash --login -c \"cd #{PROJECT_PATH}/systems/et1 && yarn install\""
       puts cmd
       external_command cmd, 'et1 setup'
 

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "6.0.0.pre.rc11"
+  VERSION = "6.0.0.pre.rc15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.rc11
+  version: 6.0.0.pre.rc15
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor