et_full_system 1.0.0.pre25 → 1.0.0.pre29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf30e87b89f12fe27b013d6a107f3e692deaef4fa4aaa095d004aea2baf1162e
-  data.tar.gz: 1aaaba9f339201bf68982b2ee220c38622a0971c1f4fb7cae87e59688085c924
+  metadata.gz: dbee5bddfbf87aeef64f1d29860f6459207605633545d65d4354a0964be6840f
+  data.tar.gz: 997b39a8c280121f03e6e5e3ea856e73db0124477782e34811a89149a19be51f
 SHA512:
-  metadata.gz: d2dc2f83cdcc789599b82ddd0868171f39cce77044216268345c75b0c423252325276723c60e36114973aa2ed55c4efc06010980d3fd19631857b9382f06144f
-  data.tar.gz: 8b293bc0aa9eb0b938589114da4e5489c98ccd5915cbc60c6211c5be0db3e1d2e3c5e3e1a6ccb3d1dc64a222af9b137dd29142fe2cc2f66336f57613316cd430
+  metadata.gz: caee6a149972b213d37a08af23352f9488a6875524433ae179cbcca6459570684ab2fe726f04eaab26b8c4b67c783b0c639e93ffa03bdd353c3ce04469d54dba
+  data.tar.gz: 0c0d1b3773b3b9ec56e9344671324442c5c1567a6875377e63bc91864322911b438a4e8d393dbf9b148abb8949b4fd2f9714fe5a694eef9f440e3b79ebf37195

data/Gemfile.lock

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

data/foreman/et1.env

@@ -16,5 +16,4 @@ FLATTEN_PDF=false
 SIDEKIQ_ALIVE_PORT=7434
 DISABLE_SIDEKIQ_ALIVE=true
 SERVICE_NOW_EMAIL=fake@servicenow.fake.com
-AZURE_APP_INSIGHTS_ROLE_NAME=et1-fs
-PORT=${FREEPORT}
+AZURE_APP_INSIGHTS_ROLE_NAME=et1-fs

data/lib/et_full_system/cli/docker.rb

@@ -88,6 +88,7 @@ module EtFullSystem
         result = `#{compose_cmd}`
         replace_db_host_port(result)
         replace_redis_host_port(result)
+        replace_smtp_host_port(result)
         puts result
       end
     end
@@ -131,14 +132,24 @@ module EtFullSystem
       env.gsub!(/^REDIS_PORT=.*$/, "REDIS_PORT=#{redis_port}")
     end
 
+    def replace_smtp_host_port(env)
+      env.gsub!(/^SMTP_HOSTNAME=.*$/, 'SMTP_HOSTNAME=localhost')
+      env.gsub!(/^SMTP_PORT=.*$/, "SMTP_PORT=#{smtp_port}")
+    end
+
     def db_port
       result = run_compose_command :port, :db, 5432
-      result.split(':').last
+      result.split(':').last.strip
     end
 
     def redis_port
       result = run_compose_command :port, :redis, 6379
-      result.split(':').last
+      result.split(':').last.strip
+    end
+
+    def smtp_port
+      result = run_compose_command :port, :et, 1025
+      result.split(':').last.strip
     end
   end
 end

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "1.0.0.pre25"
+  VERSION = "1.0.0.pre29"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre25
+  version: 1.0.0.pre29
 platform: ruby
 authors:
 - Gary Taylor