et_full_system 0.1.51 → 0.1.52.pre

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/README.md +12 -4
  4. data/docker/docker-compose.yml +4 -3
  5. data/foreman/et_ccd_export.env +1 -1
  6. data/lib/et_full_system/cli/docker/server.rb +12 -3
  7. data/lib/et_full_system/version.rb +1 -1
  8. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6ffd3e68cea206a51499bf423a62dcdad79388cd203df7f4cf15beafc58c75dd
4
- data.tar.gz: 2765bce570610f5f0546df15d454cbb3039b1b887ff4ecbb0a6b3f6684025cf1
3
+ metadata.gz: 6115c503f3b7c572c937f62c8e70cb8d5ed78964607a2577b99dda971134df72
4
+ data.tar.gz: 609c36f84c34d6d53ad7fb189c472ad9888fb5cba80eb03dc1f821dbf008b450
5
5
  SHA512:
6
- metadata.gz: c614fbc4809e15744a5e604005500d13e3d68e1422e9602c0d49e921c8b08fbbb54aa672d362475b5f6617c40b6f389753d7e0e439465d964d2e70964aea31f1
7
- data.tar.gz: 166cf3b1596de0eaa1393eac0e81afdd8c90c9fd20476dc6e32a2bfabf77f2cc5d31690a3268fe78b68183c22c7939404747435918fa4d64c3c367f86f8f405e
6
+ metadata.gz: d6a42c04216769ded8dd38a3f17aa4725f8a770a3f15bee3cb85de6f838716767efbabd63d7897dd88c29a71e166bcc5c85cf9165a635063216799624498166d
7
+ data.tar.gz: ded823f44d172a83f7f7d47b9535b2d48b5d80e280ec3afa7dbf8b1521aceba08be52280d266f420e6960809420266d9c4965867dba61fa6f314f8fa3d4ed0b5
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- et_full_system (0.1.51)
4
+ et_full_system (0.1.52.pre)
5
5
  aws-sdk-s3 (~> 1.9)
6
6
  azure-storage (~> 0.15.0.preview)
7
7
  dotenv (~> 2.7, >= 2.7.2)
data/README.md CHANGED
@@ -53,22 +53,30 @@ To run without docker, you need a few tools
53
53
  * Azurite (https://github.com/Azure/Azurite)
54
54
  * godotenv (https://github.com/joho/godotenv)
55
55
 
56
+ I will not include installation instructions here for them - please visit their web sites and install them on your platform.
57
+ For OSX users check out the homebrew repository - there are formulas for some of these.
58
+
56
59
  ### Running With CCD
57
60
 
58
61
  If you intend to connect to ccd-docker and export cases all the way through, the following env vars are
59
- passed through to the et-ccd-export service. Note that these all default to docker.for.mac.localhost:<port>
60
- so if you are running on a mac, it should hopefully work.
62
+ passed through to the et-ccd-export service. Note that these all default to the correct values
63
+ for the 'fake ccd' service as setting up ccd-docker is hard.
61
64
 
62
65
  ```
63
66
  CCD_AUTH_BASE_URL
64
67
  CCD_IDAM_BASE_URL
65
68
  CCD_DATA_STORE_BASE_URL
69
+ CCD_USE_SIDAM
66
70
 
67
71
 
68
72
  ```
69
73
 
70
- I will not include installation instructions here for them - please visit their web sites and install them on your platform.
71
- For OSX users check out the homebrew repository - there are formulas for some of these.
74
+ Whilst you can set these manually, there is a shortcut - see below (docker example given)
75
+
76
+ ```
77
+ et_full_system docker start --ccd-docker=true --ccd-docker-host=<hostname to use for ccd docker - defaults to docker.for.mac.localhost>
78
+
79
+ ```
72
80
 
73
81
  ## Installation
74
82
 
data/docker/docker-compose.yml CHANGED
@@ -41,9 +41,10 @@ services:
41
41
  AZURITE_STORAGE_PATH: /home/app/azure_storage_data
42
42
  MINIO_STORAGE_PATH: /home/app/minio_data
43
43
  SHOW_DOWNTIME_BANNER:
44
- CCD_AUTH_BASE_URL: ${CCD_AUTH_BASE_URL:-http://docker.for.mac.localhost:4502}
45
- CCD_IDAM_BASE_URL: ${CCD_IDAM_BASE_URL:-http://docker.for.mac.localhost:4501}
46
- CCD_DATA_STORE_BASE_URL: ${CCD_DATA_STORE_BASE_URL:-http://docker.for.mac.localhost:4452}
44
+ CCD_AUTH_BASE_URL: ${CCD_AUTH_BASE_URL:-http://ccd.et.127.0.0.1.nip.io/auth}
45
+ CCD_IDAM_BASE_URL: ${CCD_IDAM_BASE_URL:-http://ccd.et.127.0.0.1.nip.io/idam}
46
+ CCD_DATA_STORE_BASE_URL: ${CCD_DATA_STORE_BASE_URL:-http://ccd.et.127.0.0.1.nip.io/data_store}
47
+ CCD_USE_SIDAM: ${CCD_USE_SIDAM:-true}
47
48
 
48
49
  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}"
49
50
  links:
data/foreman/et_ccd_export.env CHANGED
@@ -5,4 +5,4 @@ RAVEN_DSN=https://0ac125aa9b0240c793e081753671c041:531ce66cc13748fbbc87e0fe66d05
5
5
  CCD_AUTH_BASE_URL=${CCD_AUTH_BASE_URL}
6
6
  CCD_IDAM_BASE_URL=${CCD_IDAM_BASE_URL}
7
7
  CCD_DATA_STORE_BASE_URL=${CCD_DATA_STORE_BASE_URL}
8
- CCD_USE_SIDAM=false
8
+ CCD_USE_SIDAM=${CCD_USE_SIDAM}
data/lib/et_full_system/cli/docker/server.rb CHANGED
@@ -7,14 +7,23 @@ module EtFullSystem
7
7
  class ServerCommand < Thor
8
8
  BEFORE_BOOT_SCRIPT =
9
9
  desc "up", "Starts the full system server on docker"
10
- 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"
10
+ 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"
11
+ method_option :ccd_docker, type: :boolean, default: false, aliases: 'ccd-docker'
12
+ method_option :ccd_docker_host, type: :string, default: 'docker.for.mac.localhost', aliases: 'ccd-docker-host'
11
13
  def up(*args)
12
14
  Bundler.with_original_env do
13
15
  server_args = []
14
16
  server_args << "--without=#{options[:without].join(' ')}" unless options[:without].empty?
15
- env_vars = "SERVER_ARGS='#{server_args.join(' ')}'"
17
+ env_vars = ["SERVER_ARGS='#{server_args.join(' ')}'"]
18
+ if options.ccd_docker?
19
+ env_vars << "CCD_AUTH_BASE_URL=http://#{options.ccd_docker_host}:4502"
20
+ env_vars << "CCD_IDAM_BASE_URL=http://#{options.ccd_docker_host}:4501"
21
+ env_vars << "CCD_DATA_STORE_BASE_URL=http://#{options.ccd_docker_host}:4452"
22
+ env_vars << "CCD_USE_SIDAM=false"
23
+ end
24
+
16
25
  gem_root = File.absolute_path('../../../..', __dir__)
17
- cmd = "#{env_vars} docker-compose -f #{gem_root}/docker/docker-compose.yml up #{args.join(' ')}"
26
+ cmd = "#{env_vars.join(' ')} docker-compose -f #{gem_root}/docker/docker-compose.yml up #{args.join(' ')}"
18
27
  puts cmd
19
28
  exec(cmd)
20
29
  end
data/lib/et_full_system/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EtFullSystem
2
- VERSION = "0.1.51"
2
+ VERSION = "0.1.52.pre"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: et_full_system
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.51
4
+ version: 0.1.52.pre
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gary Taylor
@@ -206,9 +206,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
206
206
  version: '0'
207
207
  required_rubygems_version: !ruby/object:Gem::Requirement
208
208
  requirements:
209
- - - ">="
209
+ - - ">"
210
210
  - !ruby/object:Gem::Version
211
- version: '0'
211
+ version: 1.3.1
212
212
  requirements: []
213
213
  rubygems_version: 3.0.4
214
214
  signing_key: