et_full_system 0.1.87 → 1.0.0.pre2

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 (9) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +16 -16
  3. data/README.md +2 -1
  4. data/docker/Dockerfile +3 -3
  5. data/foreman/Procfile +9 -9
  6. data/foreman/traefik.toml +1 -1
  7. data/lib/et_full_system/cli/local.rb +1 -1
  8. data/lib/et_full_system/version.rb +1 -1
  9. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2e49a0f7e6535711ae457ed971569586d443d9f97f59d6fde2d516fa50a0ecd9
4
- data.tar.gz: 5babdee4c9f143a73baf0aa65fe3f28ed4c7ef989721615aed9b1b9e8f6a7daa
3
+ metadata.gz: 21a4c68d825a1a24103013ab4138af431a35b5f66ee9a4dc3a799856b9f791e9
4
+ data.tar.gz: 19a33470f903bedad732bf76baaf1f6e929b15abc8fdcb56bfd2274423bf1284
5
5
  SHA512:
6
- metadata.gz: a4d41c35807fbd37f25c5c403d5e3cef097addd22d5b6e60c81ed59a3e8bf0b9ee9e4ec82e30ce35e76c7663a63095e89beae1c294be2a0b53c1b13fb0cdd34a
7
- data.tar.gz: 26378b66049a8b1e19738b77a48c4d264121c9664f1c8cf6ee8186e996f2b0874d484720f29933457f356df25f4c0627f4dbde746b8fd645f4830d4330f24d56
6
+ metadata.gz: fe165a2e5b6ddb1d1ca09b43520193239d978032ed8fefd12e48a1fa83277f0c004aca1ee542a668fbd353746d2f42fbb5cf94fdec5090b64ab266746f0d44b9
7
+ data.tar.gz: d7f4105f6202727d1d270ee26d349d009df25a39940ff799bdcd5646f0096f39796a236e3e37368381287313dfa88e3bb7eaf27983ecce5c46fee9847a7291a8
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- et_full_system (0.1.87)
4
+ et_full_system (1.0.0.pre2)
5
5
  aws-sdk-s3 (~> 1.9)
6
6
  azure-storage (~> 0.15.0.preview)
7
7
  dotenv (~> 2.7, >= 2.7.2)
@@ -13,9 +13,9 @@ PATH
13
13
  GEM
14
14
  remote: https://rubygems.org/
15
15
  specs:
16
- activemodel (5.2.3)
17
- activesupport (= 5.2.3)
18
- activesupport (5.2.3)
16
+ activemodel (5.2.4.1)
17
+ activesupport (= 5.2.4.1)
18
+ activesupport (5.2.4.1)
19
19
  concurrent-ruby (~> 1.0, >= 1.0.2)
20
20
  i18n (>= 0.7, < 2)
21
21
  minitest (~> 5.1)
@@ -23,17 +23,17 @@ GEM
23
23
  addressable (2.7.0)
24
24
  public_suffix (>= 2.0.2, < 5.0)
25
25
  aws-eventstream (1.0.3)
26
- aws-partitions (1.242.0)
27
- aws-sdk-core (3.80.0)
26
+ aws-partitions (1.257.0)
27
+ aws-sdk-core (3.86.0)
28
28
  aws-eventstream (~> 1.0, >= 1.0.2)
29
29
  aws-partitions (~> 1, >= 1.239.0)
30
30
  aws-sigv4 (~> 1.1)
31
31
  jmespath (~> 1.0)
32
- aws-sdk-kms (1.25.0)
32
+ aws-sdk-kms (1.27.0)
33
33
  aws-sdk-core (~> 3, >= 3.71.0)
34
34
  aws-sigv4 (~> 1.1)
35
- aws-sdk-s3 (1.57.0)
36
- aws-sdk-core (~> 3, >= 3.77.0)
35
+ aws-sdk-s3 (1.60.0)
36
+ aws-sdk-core (~> 3, >= 3.83.0)
37
37
  aws-sdk-kms (~> 1)
38
38
  aws-sigv4 (~> 1.1)
39
39
  aws-sigv4 (1.1.0)
@@ -65,16 +65,16 @@ GEM
65
65
  rotp (~> 5.1)
66
66
  thor (~> 0.20.3)
67
67
  tilt (~> 2.0, >= 2.0.9)
68
- faraday (0.17.0)
68
+ faraday (0.17.1)
69
69
  multipart-post (>= 1.2, < 3)
70
70
  faraday_middleware (0.13.1)
71
71
  faraday (>= 0.7.4, < 1.0)
72
- httparty (0.17.1)
72
+ httparty (0.17.3)
73
73
  mime-types (~> 3.0)
74
74
  multi_xml (>= 0.5.2)
75
75
  i18n (1.7.0)
76
76
  concurrent-ruby (~> 1.0)
77
- iodine (0.7.37)
77
+ iodine (0.7.38)
78
78
  jmespath (1.4.0)
79
79
  json-schema (2.8.1)
80
80
  addressable (>= 2.4)
@@ -87,15 +87,15 @@ GEM
87
87
  multi_xml (0.6.0)
88
88
  multipart-post (2.1.1)
89
89
  mustermann (1.0.3)
90
- nokogiri (1.10.5)
90
+ nokogiri (1.10.7)
91
91
  mini_portile2 (~> 2.4.0)
92
92
  public_suffix (4.0.1)
93
- puma (3.12.1)
94
- rack (2.0.7)
93
+ puma (3.12.2)
94
+ rack (2.0.8)
95
95
  rack-protection (2.0.7)
96
96
  rack
97
97
  rake (10.5.0)
98
- roda (3.26.0)
98
+ roda (3.27.0)
99
99
  rack
100
100
  rotp (5.1.0)
101
101
  addressable (~> 2.5)
data/README.md CHANGED
@@ -22,7 +22,7 @@ so that all services can be accessed using a standard subdomain based url system
22
22
  * et1.et.127.0.0.1.nip.io:3100 For ET1
23
23
  * et1.et.127.0.0.1.nip.io:3100 For ET1
24
24
 
25
- The services are run all together using 'forego' (like foreman - runs a Procfile) and once the port number for each
25
+ The services are run all together using 'invoker' (like foreman - runs a Procfile) and once the port number for each
26
26
  service is known, traefik is told about it - so it all just works.
27
27
 
28
28
  There are other services as well that are run - which are there for testing - these are :-
@@ -52,6 +52,7 @@ To run without docker, you need a few tools
52
52
  * Minio (https://github.com/minio/minio)
53
53
  * Azurite (https://github.com/Azure/Azurite)
54
54
  * godotenv (https://github.com/joho/godotenv)
55
+ * freeport (https://github.com/phayes/freeport)
55
56
 
56
57
  I will not include installation instructions here for them - please visit their web sites and install them on your platform.
57
58
  For OSX users check out the homebrew repository - there are formulas for some of these.
data/docker/Dockerfile CHANGED
@@ -68,8 +68,8 @@ RUN /pd_build/nodejs.sh
68
68
  # Enable the Redis service.
69
69
  RUN rm -f /etc/service/redis/down
70
70
 
71
- # Install forego (for Procfile running)
72
- RUN bash -lc "wget https://bin.equinox.io/c/ekMN3bCZFUn/forego-stable-linux-amd64.deb && apt install ./forego-stable-linux-amd64.deb && rm ./forego-stable-linux-amd64.deb"
71
+ # Install go, then freeport, then remove go
72
+ RUN apt-get update && apt-get -y install --no-install-recommends golang && export GOPATH=/home/app/go && mkdir -p /home/app/go && go get github.com/phayes/freeport && apt-get -y remove golang && apt -y autoremove && rm -rf /var/lib/apt/lists/* && cp /home/app/go/bin/freeport /usr/bin/ && rm -rf /home/app/go
73
73
 
74
74
  # Install traefik (For front end reverse proxy)
75
75
  RUN bash -lc "wget https://github.com/containous/traefik/releases/download/v1.7.10/traefik_linux-amd64 && mv ./traefik_linux-amd64 /usr/bin/traefik && chmod +x /usr/bin/traefik"
@@ -109,7 +109,7 @@ RUN bash --login -c "rvm --default use 2.5.1"
109
109
  RUN bash --login -c "gem install bundler"
110
110
 
111
111
  # Install gems required outside of any bundle.
112
- RUN bash --login -c "rvm use && gem install dotenv et_full_system et_fake_acas_server"
112
+ RUN bash --login -c "rvm use && gem install dotenv et_full_system et_fake_acas_server invoker"
113
113
 
114
114
  WORKDIR /home/app/full_system
115
115
 
data/foreman/Procfile CHANGED
@@ -1,14 +1,14 @@
1
- traefik: bash --login -c "traefik --file.filename=${FOREMAN_PATH}/traefik.toml"
2
- et1_web: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url et1 http://localhost:${PORT} && cd systems/et1 && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et1.env ./run.sh"
1
+ traefik: bash --login -c "traefik --configfile=${FOREMAN_PATH}/traefik.toml"
2
+ et1_web: bash --login -c "export PORT=$(freeport) && cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url et1 http://localhost:$PORT && cd systems/et1 && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et1.env ./run.sh"
3
3
  et1_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && cd systems/et1 && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et1.env ./run_sidekiq.sh"
4
- et3_web: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url et3 http://localhost:${PORT} && cd systems/et3 && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et3.env ./run.sh"
5
- mail_web: bash --login -c "source ./mailhog.env && mailhog &> /dev/null"
6
- api_web: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url api http://localhost:${PORT} && cd systems/api && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_api.env ./run.sh"
4
+ et3_web: bash --login -c "export PORT=$(freeport) && cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url et3 http://localhost:$PORT && cd systems/et3 && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et3.env ./run.sh"
5
+ mail_web: bash --login -c "source ${FOREMAN_PATH}/mailhog.env && mailhog"
6
+ api_web: bash --login -c "export PORT=$(freeport) && cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url api http://localhost:$PORT && cd systems/api && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_api.env ./run.sh"
7
7
  api_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && cd systems/api && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_api.env ./run_sidekiq.sh"
8
- admin_web: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url admin http://localhost:${PORT} && cd systems/admin && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_admin.env ./run.sh"
9
- atos_api_web: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url atos_api http://localhost:${PORT} && cd systems/atos && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_atos.env ./run.sh"
8
+ admin_web: bash --login -c "export PORT=$(freeport) && cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url admin http://localhost:$PORT && cd systems/admin && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_admin.env ./run.sh"
9
+ atos_api_web: bash --login -c "export PORT=$(freeport) && cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url atos_api http://localhost:$PORT && cd systems/atos && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_atos.env ./run.sh"
10
10
  s3_web: bash --login -c "godotenv -f ${FOREMAN_PATH}/minio.env minio server ${MINIO_STORAGE_PATH}"
11
11
  azure_blob_web: bash --login -c "azurite -l ${AZURITE_STORAGE_PATH} -d ${AZURITE_STORAGE_PATH}/debug.log"
12
- fake_acas_web: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_acas http://localhost:${PORT} && rvm use && et_fake_acas_server --port=$PORT --threads=1:5"
13
- fake_ccd_web: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_ccd http://localhost:${PORT} && rvm use && et_fake_ccd start --port=$PORT --create_case_schema=./systems/et_ccd_export/spec/json_schemas/case_create.json"
12
+ fake_acas_web: bash --login -c "export PORT=$(freeport) && cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_acas http://localhost:$PORT && rvm use && et_fake_acas_server --port=$PORT --threads=1:5"
13
+ fake_ccd_web: bash --login -c "export PORT=$(freeport) && cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_ccd http://localhost:$PORT && rvm use && et_fake_ccd start --port=4011 --create_case_schema=./systems/et_ccd_export/spec/json_schemas/case_create.json"
14
14
  et_ccd_export_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && cd systems/et_ccd_export && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_ccd_export.env ./run_sidekiq.sh"
data/foreman/traefik.toml CHANGED
@@ -1,5 +1,5 @@
1
1
  [file]
2
-
2
+ logLevel = "DEBUG"
3
3
  [entryPoints]
4
4
  [entryPoints.http]
5
5
  address = ":3100"
data/lib/et_full_system/cli/local.rb CHANGED
@@ -95,7 +95,7 @@ module EtFullSystem
95
95
  puts "Starting Procfile"
96
96
  ::Bundler.with_original_env do
97
97
  concurrency = " -c #{procfile_concurrency_without(options[:without]).join(',')}"
98
- cmd = "CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} AZURITE_STORAGE_PATH=\"#{options[:azurite_storage_path]}\" MINIO_STORAGE_PATH=\"#{options[:minio_storage_path]}\" FS_ROOT_PATH=#{PROJECT_PATH} FOREMAN_PATH=#{GEM_PATH}/foreman forego start -f \"#{GEM_PATH}/foreman/Procfile\" -e \"#{GEM_PATH}/foreman/.env\" -r#{concurrency}"
98
+ cmd = "CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} AZURITE_STORAGE_PATH=\"#{options[:azurite_storage_path]}\" MINIO_STORAGE_PATH=\"#{options[:minio_storage_path]}\" FS_ROOT_PATH=#{PROJECT_PATH} FOREMAN_PATH=#{GEM_PATH}/foreman godotenv -f #{GEM_PATH}/foreman/.env invoker start \"#{GEM_PATH}/foreman/Procfile\" --port=4000"
99
99
  STDERR.puts cmd
100
100
  exec(cmd)
101
101
  end
data/lib/et_full_system/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EtFullSystem
2
- VERSION = "0.1.87"
2
+ VERSION = "1.0.0.pre2"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: et_full_system
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.87
4
+ version: 1.0.0.pre2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gary Taylor
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2019-11-21 00:00:00.000000000 Z
11
+ date: 2019-12-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -195,9 +195,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
195
195
  version: '0'
196
196
  required_rubygems_version: !ruby/object:Gem::Requirement
197
197
  requirements:
198
- - - ">="
198
+ - - ">"
199
199
  - !ruby/object:Gem::Version
200
- version: '0'
200
+ version: 1.3.1
201
201
  requirements: []
202
202
  rubyforge_project:
203
203
  rubygems_version: 2.7.7