et_full_system 0.1.51 → 0.1.52.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ffd3e68cea206a51499bf423a62dcdad79388cd203df7f4cf15beafc58c75dd
-  data.tar.gz: 2765bce570610f5f0546df15d454cbb3039b1b887ff4ecbb0a6b3f6684025cf1
+  metadata.gz: 6115c503f3b7c572c937f62c8e70cb8d5ed78964607a2577b99dda971134df72
+  data.tar.gz: 609c36f84c34d6d53ad7fb189c472ad9888fb5cba80eb03dc1f821dbf008b450
 SHA512:
-  metadata.gz: c614fbc4809e15744a5e604005500d13e3d68e1422e9602c0d49e921c8b08fbbb54aa672d362475b5f6617c40b6f389753d7e0e439465d964d2e70964aea31f1
-  data.tar.gz: 166cf3b1596de0eaa1393eac0e81afdd8c90c9fd20476dc6e32a2bfabf77f2cc5d31690a3268fe78b68183c22c7939404747435918fa4d64c3c367f86f8f405e
+  metadata.gz: d6a42c04216769ded8dd38a3f17aa4725f8a770a3f15bee3cb85de6f838716767efbabd63d7897dd88c29a71e166bcc5c85cf9165a635063216799624498166d
+  data.tar.gz: ded823f44d172a83f7f7d47b9535b2d48b5d80e280ec3afa7dbf8b1521aceba08be52280d266f420e6960809420266d9c4965867dba61fa6f314f8fa3d4ed0b5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (0.1.51)
+    et_full_system (0.1.52.pre)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)

data/README.md

@@ -53,22 +53,30 @@ To run without docker, you need a few tools
 * Azurite (https://github.com/Azure/Azurite)
 * godotenv (https://github.com/joho/godotenv)
 
+I will not include installation instructions here for them - please visit their web sites and install them on your platform.
+For OSX users check out the homebrew repository - there are formulas for some of these.
+
 ### Running With CCD
 
 If you intend to connect to ccd-docker and export cases all the way through, the following env vars are
-passed through to the et-ccd-export service.  Note that these all default to docker.for.mac.localhost:<port>
-so if you are running on a mac, it should hopefully work.
+passed through to the et-ccd-export service.  Note that these all default to the correct values
+for the 'fake ccd' service as setting up ccd-docker is hard.
 
 ```
     CCD_AUTH_BASE_URL
     CCD_IDAM_BASE_URL
     CCD_DATA_STORE_BASE_URL
+    CCD_USE_SIDAM
 
 
 ```
 
-I will not include installation instructions here for them - please visit their web sites and install them on your platform.
-For OSX users check out the homebrew repository - there are formulas for some of these.
+Whilst you can set these manually, there is a shortcut - see below (docker example given)
+
+```
+et_full_system docker start --ccd-docker=true --ccd-docker-host=<hostname to use for ccd docker - defaults to docker.for.mac.localhost>
+
+```
 
 ## Installation
 

data/docker/docker-compose.yml

@@ -41,9 +41,10 @@ services:
       AZURITE_STORAGE_PATH: /home/app/azure_storage_data
       MINIO_STORAGE_PATH: /home/app/minio_data
       SHOW_DOWNTIME_BANNER:
-      CCD_AUTH_BASE_URL: ${CCD_AUTH_BASE_URL:-http://docker.for.mac.localhost:4502}
-      CCD_IDAM_BASE_URL: ${CCD_IDAM_BASE_URL:-http://docker.for.mac.localhost:4501}
-      CCD_DATA_STORE_BASE_URL: ${CCD_DATA_STORE_BASE_URL:-http://docker.for.mac.localhost:4452}
+      CCD_AUTH_BASE_URL: ${CCD_AUTH_BASE_URL:-http://ccd.et.127.0.0.1.nip.io/auth}
+      CCD_IDAM_BASE_URL: ${CCD_IDAM_BASE_URL:-http://ccd.et.127.0.0.1.nip.io/idam}
+      CCD_DATA_STORE_BASE_URL: ${CCD_DATA_STORE_BASE_URL:-http://ccd.et.127.0.0.1.nip.io/data_store}
+      CCD_USE_SIDAM: ${CCD_USE_SIDAM:-true}
 
     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:

data/foreman/et_ccd_export.env

@@ -5,4 +5,4 @@ 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_USE_SIDAM=false
+CCD_USE_SIDAM=${CCD_USE_SIDAM}

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

@@ -7,14 +7,23 @@ module EtFullSystem
       class ServerCommand < Thor
         BEFORE_BOOT_SCRIPT =
         desc "up", "Starts the full system server on docker"
-        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"
+        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'
+        method_option :ccd_docker_host, type: :string, default: 'docker.for.mac.localhost', aliases: 'ccd-docker-host'
         def up(*args)
           Bundler.with_original_env do
             server_args = []
             server_args << "--without=#{options[:without].join(' ')}" unless options[:without].empty?
-            env_vars = "SERVER_ARGS='#{server_args.join(' ')}'"
+            env_vars = ["SERVER_ARGS='#{server_args.join(' ')}'"]
+            if options.ccd_docker?
+              env_vars << "CCD_AUTH_BASE_URL=http://#{options.ccd_docker_host}:4502"
+              env_vars << "CCD_IDAM_BASE_URL=http://#{options.ccd_docker_host}:4501"
+              env_vars << "CCD_DATA_STORE_BASE_URL=http://#{options.ccd_docker_host}:4452"
+              env_vars << "CCD_USE_SIDAM=false"
+            end
+
             gem_root = File.absolute_path('../../../..', __dir__)
-            cmd = "#{env_vars} docker-compose -f #{gem_root}/docker/docker-compose.yml up #{args.join(' ')}"
+            cmd = "#{env_vars.join(' ')} docker-compose -f #{gem_root}/docker/docker-compose.yml up #{args.join(' ')}"
             puts cmd
             exec(cmd)
           end

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "0.1.51"
+  VERSION = "0.1.52.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 0.1.51
+  version: 0.1.52.pre
 platform: ruby
 authors:
 - Gary Taylor
@@ -206,9 +206,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.4
 signing_key: