et_full_system 6.0.0.pre.rc36 → 6.0.0.pre.rc40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85696dc17f10df9ea6865bc218539a8809512c2a31e253070ac1cc6d02d57ddc
-  data.tar.gz: cd551a4ac3758c12b2c36c51af5765c9de53b623fa691ca8aae04418dc34a105
+  metadata.gz: cd9572d285845cb3a87bff3300715ca780419f020043454efd4892349009b8bc
+  data.tar.gz: 1cc165a83bcc86a28219f2a617bc1e3913949031eaf6532a2d6764fb674fd13f
 SHA512:
-  metadata.gz: 51ea47c6ae4f18b93ad17e7192e8b1557466cde39929d13af352a42c0963c2cf8e12cb236cb9c69f3f643cc9ed501c0d9432f4333e7ad11d4e833757c8599b10
-  data.tar.gz: 4fa93dbabd373ac77d3854f8dc8362bf22bcc25ecc39b7051163c402839a73ff574cd922db445d6eb4f5a08831cf24a33c29b4dc245330fd888c4bf28f9a0b1d
+  metadata.gz: 31d402f2e477c16774b03d1980750640fdbda86620dea34791e87dfd714b9be6eef394647dd1871d6ed40b02aa5ce74d2bf06ca3b7b15ca73ca8bad03e0bc592
+  data.tar.gz: 9fdfb5c191f8acf0132df98218063c55f8ddf132948ab2dae9a3d09042c682f438d5f7ddc7b22c46509b7c8d94d1759bdd796352af21c904d37d2016da8f2afd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (6.0.0.pre.rc36)
+    et_full_system (6.0.0.pre.rc40)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)

data/docker/docker-compose.yml

@@ -18,6 +18,14 @@ services:
           - s3.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
           - azure_blob_storage.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
           - notify.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
+          - api.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
+          - 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}
+          - azure.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
+          - atos.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
+          - ccd.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
+          - acas.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
 
     links:
       - db
@@ -101,16 +109,7 @@ services:
       CCD_SIDAM_PASSWORD: ${CCD_SIDAM_PASSWORD:-p}
     command: /bin/bash --login -c "cd /home/app/full_system && et_full_system local server --in-docker-compose ${SERVER_ARGS}"
     networks:
-      et_full_system:
-        aliases:
-          - api.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
-          - 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}
-          - azure.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
-          - atos.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
-          - mail.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
-          - ccd.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
+      - et_full_system
     labels:
       - traefik.http.routers.et1-router.rule=Host(`et1.et.127.0.0.1.nip.io`)
       - traefik.http.routers.et1-router.service=et1-service
@@ -172,7 +171,9 @@ services:
       - traefik.http.routers.mail-router.service=mail-service
       - traefik.http.services.mail-service.loadbalancer.server.port=8025
     networks:
-      - et_full_system
+      et_full_system:
+        aliases:
+          - mail.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
   azurite:
     image: touchify/azurite:2.7
     labels:

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "6.0.0.pre.rc36"
+  VERSION = "6.0.0.pre.rc40"
 end

data/shell_scripts/docker_bootstrap.sh

@@ -15,4 +15,4 @@ sudo chown app:app /home/app/full_system/systems/et1/.bundle && \
 sudo chown app:app /home/app/full_system/systems/et3/.bundle && \
 sudo chown app:app /home/app/full_system/systems/api/.bundle && \
 sudo chown app:app /home/app/full_system/systems/admin/.bundle && \
-sudo chown app:app /home/app/full_system/systems/atos/.bundle && \
+sudo chown app:app /home/app/full_system/systems/atos/.bundle

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.rc36
+  version: 6.0.0.pre.rc40
 platform: ruby
 authors:
 - Gary Taylor