et_full_system 6.0.0.pre.rc38 → 6.0.0.pre.rc42

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/.ruby-version +1 -1
  3. data/Gemfile.lock +18 -20
  4. data/docker/Dockerfile +2 -2
  5. data/docker/docker-compose.yml +12 -9
  6. data/lib/et_full_system/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 72db3e5a0a9a8e576a36c656ba61f2b5fee49d26f9c911466f4922f9fcdb5c49
4
- data.tar.gz: 0a05556e9b20c5db40e2d4b076ad5a9461fcb3c33a44426f646cf1be0973e9e4
3
+ metadata.gz: c32257f50417a21d4bd290d286eddcea3a010d14eb63f803d7e4cf985e7178db
4
+ data.tar.gz: 567a2636a7554587cbcc752a29ccfa08084a71171b0fbbc644c354ee7997e7ac
5
5
  SHA512:
6
- metadata.gz: 2864edb4de05c3b8fd3b2fca151f1a3149e8f5dc3c5a44fbb229ad0cfef2eb0b49c0f74f6b6345b927ac6ae79bcf54679fef141bd5cb6958e0b0eda402b30275
7
- data.tar.gz: 7948e7968769af98575ed6d66d6fd71cd4b900785eec2fda41f4ee51a6ee82ceaf64f2993cab3b555fb95bfe30b2a7378a00540ef2fd1164c84ec99525a1f225
6
+ metadata.gz: e534525ec4c79523557ee8f1679f45f290a123c4ec974b252d066ff0b5695ddf4c7def26d6c3122d1f5d25aa7422fe47e6c8d9a56727496f1cd5c3c11fef5487
7
+ data.tar.gz: d9f4c9103127483a51656899c4f9fec78ea594bc49bd9ead364f97c49e9aae5a893d65b21f3237ab67fe71c1d09a1c76cb2d8455a1b00a475ae56ac068ffe7ba
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 2.7.4
1
+ 2.7.5
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- et_full_system (6.0.0.pre.rc38)
4
+ et_full_system (6.0.0.pre.rc42)
5
5
  aws-sdk-s3 (~> 1.9)
6
6
  azure-storage (~> 0.15.0.preview)
7
7
  dotenv (~> 2.7, >= 2.7.2)
@@ -13,28 +13,27 @@ PATH
13
13
  GEM
14
14
  remote: https://rubygems.org/
15
15
  specs:
16
- activemodel (6.1.4.1)
17
- activesupport (= 6.1.4.1)
18
- activesupport (6.1.4.1)
16
+ activemodel (7.0.1)
17
+ activesupport (= 7.0.1)
18
+ activesupport (7.0.1)
19
19
  concurrent-ruby (~> 1.0, >= 1.0.2)
20
20
  i18n (>= 1.6, < 2)
21
21
  minitest (>= 5.1)
22
22
  tzinfo (~> 2.0)
23
- zeitwerk (~> 2.3)
24
23
  addressable (2.8.0)
25
24
  public_suffix (>= 2.0.2, < 5.0)
26
25
  aws-eventstream (1.2.0)
27
- aws-partitions (1.534.0)
28
- aws-sdk-core (3.122.1)
26
+ aws-partitions (1.547.0)
27
+ aws-sdk-core (3.125.1)
29
28
  aws-eventstream (~> 1, >= 1.0.2)
30
29
  aws-partitions (~> 1, >= 1.525.0)
31
30
  aws-sigv4 (~> 1.1)
32
31
  jmespath (~> 1.0)
33
- aws-sdk-kms (1.51.0)
34
- aws-sdk-core (~> 3, >= 3.122.0)
32
+ aws-sdk-kms (1.53.0)
33
+ aws-sdk-core (~> 3, >= 3.125.0)
35
34
  aws-sigv4 (~> 1.1)
36
- aws-sdk-s3 (1.106.0)
37
- aws-sdk-core (~> 3, >= 3.122.0)
35
+ aws-sdk-s3 (1.111.1)
36
+ aws-sdk-core (~> 3, >= 3.125.0)
38
37
  aws-sdk-kms (~> 1)
39
38
  aws-sigv4 (~> 1.4)
40
39
  aws-sigv4 (1.4.0)
@@ -76,7 +75,7 @@ GEM
76
75
  multi_xml (>= 0.5.2)
77
76
  i18n (1.8.11)
78
77
  concurrent-ruby (~> 1.0)
79
- iodine (0.7.44)
78
+ iodine (0.7.45)
80
79
  jmespath (1.4.0)
81
80
  json-schema (2.8.1)
82
81
  addressable (>= 2.4)
@@ -85,14 +84,14 @@ GEM
85
84
  mini_mime (>= 0.1.1)
86
85
  mime-types (3.4.1)
87
86
  mime-types-data (~> 3.2015)
88
- mime-types-data (3.2021.1115)
87
+ mime-types-data (3.2022.0105)
89
88
  mini_mime (1.1.2)
90
- mini_portile2 (2.6.1)
91
- minitest (5.14.4)
89
+ mini_portile2 (2.7.1)
90
+ minitest (5.15.0)
92
91
  multi_xml (0.6.0)
93
92
  multipart-post (2.1.1)
94
- nokogiri (1.12.5)
95
- mini_portile2 (~> 2.6.1)
93
+ nokogiri (1.13.0)
94
+ mini_portile2 (~> 2.7.0)
96
95
  racc (~> 1.4)
97
96
  pastel (0.8.0)
98
97
  tty-color (~> 0.5)
@@ -100,20 +99,19 @@ GEM
100
99
  racc (1.6.0)
101
100
  rack (2.2.3)
102
101
  rake (13.0.1)
103
- roda (3.50.0)
102
+ roda (3.51.0)
104
103
  rack
105
104
  roda-enhanced_logger (0.4.0)
106
105
  roda (>= 3.19.0)
107
106
  tty-logger (>= 0.3, < 1.0)
108
107
  rotp (6.2.0)
109
- thor (1.1.0)
108
+ thor (1.2.1)
110
109
  tilt (2.0.10)
111
110
  tty-color (0.6.0)
112
111
  tty-logger (0.6.0)
113
112
  pastel (~> 0.8)
114
113
  tzinfo (2.0.4)
115
114
  concurrent-ruby (~> 1.0)
116
- zeitwerk (2.5.1)
117
115
 
118
116
  PLATFORMS
119
117
  ruby
data/docker/Dockerfile CHANGED
@@ -1,7 +1,7 @@
1
- FROM golang:alpine3.14 AS golang
1
+ FROM golang:alpine3.15 AS golang
2
2
  RUN go install github.com/joho/godotenv/cmd/godotenv@latest
3
3
 
4
- FROM ruby:2.7.4-alpine
4
+ FROM ruby:2.7.5-alpine
5
5
  # Set correct environment variables.
6
6
  COPY --from=golang /go/bin/godotenv /usr/local/bin/
7
7
  ARG GEM_VERSION=>0
data/docker/docker-compose.yml CHANGED
@@ -18,6 +18,14 @@ services:
18
18
  - s3.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
19
19
  - azure_blob_storage.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
20
20
  - notify.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
21
+ - api.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
22
+ - admin.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
23
+ - et1.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
24
+ - et3.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
25
+ - azure.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
26
+ - atos.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
27
+ - ccd.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
28
+ - acas.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
21
29
 
22
30
  links:
23
31
  - db
@@ -101,15 +109,7 @@ services:
101
109
  CCD_SIDAM_PASSWORD: ${CCD_SIDAM_PASSWORD:-p}
102
110
  command: /bin/bash --login -c "cd /home/app/full_system && et_full_system local server --in-docker-compose ${SERVER_ARGS}"
103
111
  networks:
104
- et_full_system:
105
- aliases:
106
- - api.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
107
- - admin.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
108
- - et1.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
109
- - et3.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
110
- - azure.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
111
- - atos.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
112
- - ccd.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
112
+ - et_full_system
113
113
  labels:
114
114
  - traefik.http.routers.et1-router.rule=Host(`et1.et.127.0.0.1.nip.io`)
115
115
  - traefik.http.routers.et1-router.service=et1-service
@@ -164,6 +164,9 @@ services:
164
164
  - /data
165
165
  networks:
166
166
  - et_full_system
167
+ environment:
168
+ MINIO_ACCESS_KEY: accessKey1
169
+ MINIO_SECRET_KEY: verySecretKey1
167
170
  mailhog:
168
171
  image: mailhog/mailhog:v1.0.1
169
172
  labels:
data/lib/et_full_system/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EtFullSystem
2
- VERSION = "6.0.0.pre.rc38"
2
+ VERSION = "6.0.0.pre.rc42"
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: 6.0.0.pre.rc38
4
+ version: 6.0.0.pre.rc42
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gary Taylor
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-11-23 00:00:00.000000000 Z
11
+ date: 2022-01-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor