et_full_system 6.0.0.pre.rc20 → 6.0.0.pre.rc24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84261b9787f4353b4c6313592ace9dbffe8fa5b24a6a3a9047026eefb590ce2e
-  data.tar.gz: ce97e407df29b8c72f4e7f92494354e3043c931cb6fe802592c9619e36c1232a
+  metadata.gz: 95b33af6823341942cdaba84b6d9aa6f29d2878064a6fbe07cadd886e92fa49a
+  data.tar.gz: 0a3916cf274dfca304c3c48a864f61afd748b295cfabe8a6f6d1b553a0f37353
 SHA512:
-  metadata.gz: cb91e41bad51b67c1fdaddd3875912b3b563df359cda2200405fd345ac016ce4c542dfb551d4f99b49bd088f2ad2bb1a0c6cfba4256178dcf8e76fd1a8861210
-  data.tar.gz: 4a5867d1a0fd43476956b6a38ea72a739ecd360414d887219e40c09a1d53f8e9b574edf2fd557a5d8fb1ca683d501be8356de9ad1e22266924b0c70d451bd8f8
+  metadata.gz: 9dc4497e9a265ba4e8aea5422698ef30a98ee09c6c83580e1110e5c0087dfb7c48e430ca81f6de9be6628f3b72b79274f96a2fda2409897af804b8f7043cab15
+  data.tar.gz: 4d3b3d67f1e7e46bc3531a3973f2215a9d08f6c3228ba58ad8557ab73c066820a0fb906c19a6853c763b4f9971c30d66a4ddc7cc8e3462c58efd42d7a4d3304b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (6.0.0.pre.rc20)
+    et_full_system (6.0.0.pre.rc24)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
@@ -24,7 +24,7 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.2.0)
-    aws-partitions (1.532.0)
+    aws-partitions (1.533.0)
     aws-sdk-core (3.122.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)

data/docker/docker-compose.yml

@@ -4,16 +4,19 @@ services:
     # The official v2 Traefik docker image
     image: traefik:v2.5
     # Enables the web UI and tells Traefik to listen to docker
-    command: --api.insecure=true --providers.docker
+    command: --api.insecure=true --providers.docker --entryPoints.http.address=:3100 --entryPoints.traefik.address=:3200
     ports:
-      - "3100:80"
+      - "3100:3100"
       # The Web UI (enabled by --api.insecure=true)
-      - "3200:8080"
+      - "3200:3200"
     volumes:
       # So that Traefik can listen to the Docker events
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
-      - et_full_system
+      et_full_system:
+        aliases:
+          - s3.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
+
     links:
       - db
       - redis
@@ -29,11 +32,6 @@ services:
       args:
         GEM_VERSION:
         user_id: ${UID:-1000}
-
-    ports:
-      - '${SERVER_PORT:-3100}:${SERVER_PORT:-3100}'
-      - '${TRAEFIX_PORT:-3200}:${TRAEFIK_PORT:-3200}'
-      - '${SMTP_PORT:-1025}:${SMTP_PORT:-1025}'
     links:
       - db
       - redis
@@ -108,7 +106,6 @@ services:
           - admin.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
           - et1.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
           - et3.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
-          - s3.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
           - azure_blob_storage.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
           - azure.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
           - atos.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
@@ -125,19 +122,19 @@ services:
       - traefik.http.routers.api-router.service=api-service
       - traefik.http.services.api-service.loadbalancer.server.port=4002
       - traefik.http.routers.admin-router.rule=Host(`admin.et.127.0.0.1.nip.io`)
-      - traefik.http.routers.admin-router.service=api-service
+      - traefik.http.routers.admin-router.service=admin-service
       - traefik.http.services.admin-service.loadbalancer.server.port=4003
       - traefik.http.routers.atos-router.rule=Host(`atos.et.127.0.0.1.nip.io`)
-      - traefik.http.routers.atos-router.service=api-service
+      - traefik.http.routers.atos-router.service=atos-service
       - traefik.http.services.atos-service.loadbalancer.server.port=4004
       - traefik.http.routers.acas-router.rule=Host(`acas.et.127.0.0.1.nip.io`)
-      - traefik.http.routers.acas-router.service=api-service
+      - traefik.http.routers.acas-router.service=acas-service
       - traefik.http.services.acas-service.loadbalancer.server.port=4005
       - traefik.http.routers.ccd-router.rule=Host(`ccd.et.127.0.0.1.nip.io`)
-      - traefik.http.routers.ccd-router.service=api-service
+      - traefik.http.routers.ccd-router.service=ccd-service
       - traefik.http.services.ccd-service.loadbalancer.server.port=4006
       - traefik.http.routers.notify-router.rule=Host(`notify.et.127.0.0.1.nip.io`)
-      - traefik.http.routers.notify-router.service=api-service
+      - traefik.http.routers.notify-router.service=notify-service
       - traefik.http.services.notify-service.loadbalancer.server.port=4007
 
 #command: bash -lc "cd /home/app/full_system/systems/api && REDIS_DATABASE=2 bundle exec sidekiq"
@@ -161,7 +158,7 @@ services:
     image: minio/minio
     labels:
       - traefik.http.routers.s3-router.rule=Host(`s3.et.127.0.0.1.nip.io`)
-      - traefik.http.routers.s3-router.service=et1-service
+      - traefik.http.routers.s3-router.service=s3-service
       - traefik.http.services.s3-service.loadbalancer.server.port=9000
     command:
       - server
@@ -172,7 +169,7 @@ services:
     image: mailhog/mailhog:v1.0.1
     labels:
       - traefik.http.routers.mail-router.rule=Host(`mail.et.127.0.0.1.nip.io`)
-      - traefik.http.routers.mail-router.service=et1-service
+      - traefik.http.routers.mail-router.service=mail-service
       - traefik.http.services.mail-service.loadbalancer.server.port=8025
     networks:
       - et_full_system
@@ -180,7 +177,7 @@ services:
     image: mcr.microsoft.com/azure-storage/azurite
     labels:
       - traefik.http.routers.azurite-router.rule=Host(`azure_blob_storage.et.127.0.0.1.nip.io`)
-      - traefik.http.routers.azurite-router.service=et1-service
+      - traefik.http.routers.azurite-router.service=azurite-service
       - traefik.http.services.azurite-service.loadbalancer.server.port=10000
     networks:
       - et_full_system

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "6.0.0.pre.rc20"
+  VERSION = "6.0.0.pre.rc24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.rc20
+  version: 6.0.0.pre.rc24
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor