et_full_system 6.0.0.pre.rc21 → 6.0.0.pre.rc25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 749c21c89abe9f0c89970f0d4d1cce11209a46bb00b9c05ba7bcfcaf9bea2d16
-  data.tar.gz: a4ed4580e0ee957a058aadcc904b6627900e8502aadf993cd7912f5e26d60216
+  metadata.gz: c1d3a4c406708c9b931c6e193f37a4506063187618c88c3a8d3b93c1350f7a3e
+  data.tar.gz: 1a67f7bab5f463c8455b2eebd47936963a9824dddec84215574330210197e9d9
 SHA512:
-  metadata.gz: 33437b20ba4256040038b2572be589e83c392788a0fce948b5438acfaa0705d2bcd99895c2cbd2bc10ef9742566881ba64efba7d5bebfdae3bd49ce76f9aca96
-  data.tar.gz: 5798475f1365d2a9291b00e0787a1a76b0f5f522417a826780cf26aa19b1d29f8264f7892ef0e1b6054937ae74091381f51795cf6ce9af9584a845e9d4376a90
+  metadata.gz: 5a87cc4092dd1655303b9163d42fa8352e64db88398657836c5f86666a4241363f4f28623b6aad4e7afbf5e3697ee212a397a6520ed64a81abe0ad9e3ad5b513
+  data.tar.gz: 550085fe24376dc44ff26c1ab54b6e6dd78cce7b442aef482032bc9365b930b372149eea864d1f9f8cb99f86063680106ce7857f5cf85f7f6dcafe7295c3e67e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (6.0.0.pre.rc21)
+    et_full_system (6.0.0.pre.rc25)
       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
@@ -103,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}
@@ -120,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"
@@ -156,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
@@ -167,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
@@ -175,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/cli/docker.rb

@@ -21,7 +21,7 @@ module EtFullSystem
     def setup
       unbundled do
         gem_root = File.absolute_path('../../..', __dir__)
-        cmd = "/bin/bash --login -c \"cd /home/app/full_system && et_full_system docker bootstrap && et_full_system local setup\""
+        cmd = "/bin/bash --login -c \"cd /home/app/full_system && et_full_system docker bootstrap && et_full_system local setup --in-docker-compose\""
         compose_cmd = "UID=#{Process.uid} GEM_VERSION=#{EtFullSystem::VERSION} LOCALHOST_FROM_DOCKER_IP=#{host_ip} docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
         puts compose_cmd
         exec(compose_cmd)

data/lib/et_full_system/cli/local/file_storage.rb

@@ -55,7 +55,7 @@ module EtFullSystem
 
         def setup_azure_storage
           unbundled do
-            puts `bash --login -c "export RAILS_ENV=production && cd systems/api && rvm use && dotenv -f \"#{GEM_PATH}/foreman/.env\" dotenv -f \"#{GEM_PATH}/foreman/et_api.env\" bundle exec rails configure_azure_storage_containers configure_azure_storage_cors"`
+            puts `bash --login -c "export RAILS_ENV=production && cd systems/api && godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_api.env\" bundle exec rails configure_azure_storage_containers configure_azure_storage_cors"`
 
           end
         end

data/lib/et_full_system/cli/local.rb

@@ -130,9 +130,10 @@ module EtFullSystem
     desc "setup", "Sets up everything ready for first run"
     method_option :rails_env, type: :string, default: ENV.fetch('RAILS_ENV', 'production')
     method_option :cloud_provider, type: :string, default: ENV.fetch('CLOUD_PROVIDER', 'amazon')
+    method_option :in_docker_compose, type: :boolean, default: false, desc: 'Set to true to assume certain services are in docker compose'
     def setup
       setup_depencencies
-      setup_ruby_versions
+      setup_ruby_versions unless options.in_docker_compose?
       setup_services
     end
 

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "6.0.0.pre.rc21"
+  VERSION = "6.0.0.pre.rc25"
 end

metadata

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