et_full_system 6.0.0.pre.rc22 → 6.0.0.pre.rc26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b071cea1a5940cb40cea920d7d0fdf5d2f4df8e28ba5ca3943a5af93ecc44bfc
-  data.tar.gz: ccf1d0bace1f20687a34b5dfe9e62b257a4371128f63f5206b86bd9f22d9a6c2
+  metadata.gz: c03e67b76268e8534828d618c954db8b294399b6691badaacdfdfac0f1a3d834
+  data.tar.gz: 55e03623be158771400e2b124b30c6ba1a121e73671eea0d4a0db46650a28dbd
 SHA512:
-  metadata.gz: ab472d1d8f69f32d446dc603d397f71829f83c294b8576d082216e74c8122fe644979b493acffe4a6210b197367e0eb1480a862ae7a66ce318b7fc30bfd8fcc1
-  data.tar.gz: f85e2972bbb82aba6699ac5ce0205d8a38703c4148122eca7492a0c36b2391675f9ad2d362dc444aa36c37ad66b8ffd8adeb413efc81c08b4d6c9a1dfeabe766
+  metadata.gz: 85a64c94042d7369c3de3851e0564345548abc450ea51307b30114825f583e56fe79674bc21be0c46b7d6787d47544476c8db758c8beebb7cdbc467cd41576e6
+  data.tar.gz: 3bbd7eeb2e6d0896b9d7dd86656bb75f7f3efd6e5010e466f6e5547424599ffea7d80b30d40825fd83fb3abaddb5354126b5685d11f355b23778f52c5ed96fa5

data/Gemfile.lock

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

data/foreman/ComposeProcfile

@@ -1,5 +1,5 @@
 et1_web:  export godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et1.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/et1 && bundle exec iodine -port $PORT"
-et3_web:  godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et3.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system && cd systems/et3 && bundle exec iodine -port $PORT"
+et3_web:  godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et3.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/et3 && bundle exec iodine -port $PORT"
 api_web: godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_api.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/api && bundle exec iodine -port $PORT"
 admin_web: godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_admin.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/admin && bundle exec iodine -port $PORT"
 atos_api_web: godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_atos.env bash --login -c "cd ${FS_ROOT_PATH} && cd systems/atos && bundle exec iodine -port $PORT"

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.rc22"
+  VERSION = "6.0.0.pre.rc26"
 end

metadata

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