et_full_system 1.0.0.pre47 → 1.0.0.pre48

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +4 -4
  3. data/docker/.empty +0 -0
  4. data/docker/docker-compose.yml +13 -0
  5. data/exe/et_full_system +1 -0
  6. data/foreman/et1.env +1 -0
  7. data/foreman/et3.env +2 -1
  8. data/foreman/et_admin.env +1 -0
  9. data/foreman/et_api.env +1 -0
  10. data/lib/et_full_system/cli/docker/server.rb +2 -0
  11. data/lib/et_full_system/version.rb +1 -1
  12. data/lib/et_full_system.rb +22 -1
  13. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b7db1ab3a4464d46b6e9d0bb849c593a0422725a9f56f12cbaff07bcbf8e43b7
4
- data.tar.gz: 8f774b63fc64c4b22b1298d79ce6c4eff7cbb8825293da85c83332430b174f08
3
+ metadata.gz: 8a40402dbdd13b76618180fed70e7a48bdf3d22e764f9db77ed4c379f6cee60c
4
+ data.tar.gz: 9b1b4edcc25d8f2e93c01aa21c9c93731f4bfe51fa96af867c7e7e5219d67c19
5
5
  SHA512:
6
- metadata.gz: b2be352794173b72b529c1499441af719b9fc3581ec07d4dee09f02a8f1a39109583d696892a95496332445198fac213816d39ce6e69dd0a1f671a012b683330
7
- data.tar.gz: b948781ab3766516465733309fdf99f0da5479fa0b7cd038a90b547ad37eb494a33368aef320bc3ea4a4b0ce0471837ab030e7cd4b56a4d65e16a6a328081c7a
6
+ metadata.gz: 8341e62b04e29ae3b6601601fb8a0420a319d3a46a3873ae04f018b876626c0022ac4a7ee99f3778c65c44e3b82170325845aa38353fad17ab45930fa35445b8
7
+ data.tar.gz: 36d09986ccf658c718c596ec3df975530ffb9545b53c9db547561b9daab4de6204cf91ed23623865f0408bc48164074f0996cb0e0b9af5d80bad8aa4152c6166
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- et_full_system (1.0.0.pre47)
4
+ et_full_system (1.0.0.pre48)
5
5
  aws-sdk-s3 (~> 1.9)
6
6
  azure-storage (~> 0.15.0.preview)
7
7
  dotenv (~> 2.7, >= 2.7.2)
@@ -23,7 +23,7 @@ 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.261.0)
26
+ aws-partitions (1.262.0)
27
27
  aws-sdk-core (3.86.0)
28
28
  aws-eventstream (~> 1.0, >= 1.0.2)
29
29
  aws-partitions (~> 1, >= 1.239.0)
@@ -72,7 +72,7 @@ GEM
72
72
  httparty (0.17.3)
73
73
  mime-types (~> 3.0)
74
74
  multi_xml (>= 0.5.2)
75
- i18n (1.7.0)
75
+ i18n (1.7.1)
76
76
  concurrent-ruby (~> 1.0)
77
77
  iodine (0.7.38)
78
78
  jmespath (1.4.0)
@@ -101,7 +101,7 @@ GEM
101
101
  rotp (5.1.0)
102
102
  addressable (~> 2.5)
103
103
  ruby-mcrypt (0.2.0)
104
- ruby2_keywords (0.0.1)
104
+ ruby2_keywords (0.0.2)
105
105
  sinatra (2.0.8.1)
106
106
  mustermann (~> 1.0)
107
107
  rack (~> 2.0)
data/docker/.empty ADDED
File without changes
data/docker/docker-compose.yml CHANGED
@@ -32,6 +32,19 @@ services:
32
32
  - api_bundle:/home/app/full_system/systems/api/.bundle
33
33
  - atos_bundle:/home/app/full_system/systems/atos/.bundle
34
34
  - admin_bundle:/home/app/full_system/systems/admin/.bundle
35
+ - admin_bundle:/home/app/full_system/systems/et_ccd_export/.bundle
36
+ - ./.empty:/home/app/full_system/systems/et1/.env
37
+ - ./.empty:/home/app/full_system/systems/et3/.env
38
+ - ./.empty:/home/app/full_system/systems/api/.env
39
+ - ./.empty:/home/app/full_system/systems/atos/.env
40
+ - ./.empty:/home/app/full_system/systems/admin/.env
41
+ - ./.empty:/home/app/full_system/systems/et_ccd_export/.env
42
+ - ./.empty:/home/app/full_system/systems/et1/.env.local
43
+ - ./.empty:/home/app/full_system/systems/et3/.env.local
44
+ - ./.empty:/home/app/full_system/systems/api/.env.local
45
+ - ./.empty:/home/app/full_system/systems/atos/.env.local
46
+ - ./.empty:/home/app/full_system/systems/admin/.env.local
47
+ - ./.empty:/home/app/full_system/systems/et_ccd_export/.env.local
35
48
  environment:
36
49
  DISABLE_CLOUDWATCH: 'true'
37
50
  DB_HOST: 'db'
data/exe/et_full_system CHANGED
@@ -2,6 +2,7 @@
2
2
  # frozen_string_literal: true
3
3
  require "rubygems"
4
4
  require "thor"
5
+ require "et_full_system"
5
6
  require "et_full_system/cli"
6
7
  require "et_full_system/version"
7
8
  module EtFullSystem
data/foreman/et1.env CHANGED
@@ -1,6 +1,7 @@
1
1
  HTTP_OPEN_TIMEOUT_S=15
2
2
  HTTP_READ_TIMEOUT_S=15
3
3
  REDIS_DATABASE=5
4
+ DB_NAME=etdb
4
5
  S3_UPLOAD_BUCKET='et1bucket'
5
6
  RAVEN_DSN='https://1b78623c8bab4dfb9aeb6f5dbb31ae34:0f4a38359e7e47f99e7e69449b32ef2b@sentry.io/1355286'
6
7
  AWS_ACCESS_KEY_ID=accessKey1
data/foreman/et3.env CHANGED
@@ -1,4 +1,5 @@
1
1
  REDIS_URL=redis://redis:6379/5
2
2
  RAVEN_DSN='https://7f2374c2e0cd4650bf5129c9fe45215e:e0ae53d01bd7454da963790ee204ffa0@sentry.io/1376078'
3
3
  ET_API_URL='http://api.et.127.0.0.1.nip.io:3100/api'
4
- AZURE_APP_INSIGHTS_ROLE_NAME=et3-fs
4
+ AZURE_APP_INSIGHTS_ROLE_NAME=et3-fs
5
+ DB_NAME=et3_production
data/foreman/et_admin.env CHANGED
@@ -1,5 +1,6 @@
1
1
  DEVISE_SECRET_KEY=JK3N45KH56743JN25J1B5H43B24H35BJ6575KN21NRNKFASDF89DU23I4NK5TGKFD
2
2
  REDIS_DATABASE=2
3
+ DB_NAME='et_api_production'
3
4
  RAILS_SERVE_STATIC_FILES='true'
4
5
  SEED_EXAMPLE_USERS='true'
5
6
  S3_UPLOAD_BUCKET='etapibucket'
data/foreman/et_api.env CHANGED
@@ -1,6 +1,7 @@
1
1
  WEB_CONCURRENCY=1
2
2
  SECRET_KEY_BASE=sdlkjewfkjhfviuhduihenrjk435r89esfd7cv983qh2n4r3q27yh4u5rtfg
3
3
  REDIS_DATABASE=2
4
+ DB_NAME='et_api_production'
4
5
  S3_UPLOAD_BUCKET='etapibucket'
5
6
  S3_DIRECT_UPLOAD_BUCKET='etapidirectbucket'
6
7
  RAVEN_DSN='https://929365547a42468fb521248a96100646:139af8327fa340b88088efeae059fca8@sentry.io/1254109'
data/lib/et_full_system/cli/docker/server.rb CHANGED
@@ -41,6 +41,8 @@ module EtFullSystem
41
41
  unless options.with_test? && !options.use_selenium?
42
42
  extra_args.concat(['--scale zalenium=0'])
43
43
  end
44
+ env_vars << "DB_PORT=#{ENV.fetch('DB_PORT', EtFullSystem.is_port_open?(5432) ? 0 : 5432)}"
45
+ env_vars << "REDIS_PORT=#{ENV.fetch('REDIS_PORT', EtFullSystem.is_port_open?(6379) ? 0 : 6379)}"
44
46
  gem_root = File.absolute_path('../../../..', __dir__)
45
47
  cmd = "GEM_VERSION=#{EtFullSystem::VERSION} #{env_vars.join(' ')} docker-compose -f #{gem_root}/docker/docker-compose.yml up #{(extra_args + args).join(' ')}"
46
48
  puts cmd
data/lib/et_full_system/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EtFullSystem
2
- VERSION = "1.0.0.pre47"
2
+ VERSION = "1.0.0.pre48"
3
3
  end
data/lib/et_full_system.rb CHANGED
@@ -1,5 +1,26 @@
1
1
  require "et_full_system/version"
2
+ require 'socket'
2
3
 
3
4
  module EtFullSystem
4
- # Your code goes here...
5
+
6
+ def self.is_port_open?(port, ip: '0.0.0.0')
7
+ s = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
8
+ sa = Socket.sockaddr_in(port, ip)
9
+
10
+ begin
11
+ s.connect_nonblock(sa)
12
+ rescue Errno::EINPROGRESS
13
+ if IO.select(nil, [s], nil, 1)
14
+ begin
15
+ s.connect_nonblock(sa)
16
+ rescue Errno::EISCONN
17
+ return true
18
+ rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
19
+ return false
20
+ end
21
+ end
22
+ end
23
+
24
+ return false
25
+ end
5
26
  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: 1.0.0.pre47
4
+ version: 1.0.0.pre48
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gary Taylor
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-01-06 00:00:00.000000000 Z
11
+ date: 2020-01-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -148,6 +148,7 @@ files:
148
148
  - Rakefile
149
149
  - bin/console
150
150
  - bin/setup
151
+ - docker/.empty
151
152
  - docker/Dockerfile
152
153
  - docker/docker-compose.yml
153
154
  - docker/pdftk