et_full_system 6.0.0.pre.rc19 → 6.0.0.pre.rc23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 757e7134a605f2541a7593a4c784f44bddf502eb659f53308305a72fc943eb89
-  data.tar.gz: 5766b4a13bbe96745699418e3928a4882c4cd4a8e2e724767086d6cd2f76d5dc
+  metadata.gz: 8c1e74837a8dc597871ed02aab372f14d81fefdc4f4ae5ea1b565e1837cba528
+  data.tar.gz: 72d5a4ec37a2158b17aed084c0a5560727c16cb0d60a946feb65c4ecf8976b39
 SHA512:
-  metadata.gz: a54138a93e857a3363dbeb3268e0827730c35cf6d144decd78709109dd91defd9a2a90bf8b49cff13294e93b8669f2eacb61bebdde4c005d61e7909514e4d81c
-  data.tar.gz: fcd8acbd1e21ccee456fbc2485fe39c4138293ce40f7012cd0b6641ba935ac3b91c5f9242847508f19a4beeb9c31d15a9bb44c245582122b87b9117f08085d15
+  metadata.gz: 9d5801a2d842d85f972c4fba5d478bcddf4344cdcc391e52b5085ccfe0edc2a5719d8e90f948d1614807259606ff1da19470faf8a1ee2190341ae2f27047f501
+  data.tar.gz: dee4e9c9b482b4bc7862a1d60f8483f58d3cf9bbdfb3dc962ab63364f1ffa41065755dd1802d8c209a129f01ae90be9b54bd7b23b55af10ac8fe8ac44852dd5a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (6.0.0.pre.rc19)
+    et_full_system (6.0.0.pre.rc23)
       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

@@ -6,15 +6,17 @@ services:
     # Enables the web UI and tells Traefik to listen to docker
     command: --api.insecure=true --providers.docker
     ports:
-      # The HTTP port
-      - "80:80"
+      - "3100:80"
       # The Web UI (enabled by --api.insecure=true)
-      - "8080:8080"
+      - "3200:8080"
     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
@@ -30,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
@@ -109,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}
@@ -126,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"
@@ -162,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
@@ -173,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
@@ -181,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.rc19"
+  VERSION = "6.0.0.pre.rc23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.rc19
+  version: 6.0.0.pre.rc23
 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