et_full_system 6.0.0.pre.rc12 → 6.0.0.pre.rc16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a04c2f753508d53b4e99f90fc408d2014001406524d76d71763fa446a72316ab
-  data.tar.gz: 0cb697fb22d0df794d99ee0872a62049fff650ad902a1f49506e882cea4ff731
+  metadata.gz: 749455aaebe7fb9dcbeec8db503922030884d0caa7bc2b24aeb6df083dd8fc9c
+  data.tar.gz: c520723a123660c41cdd64fecb9a7ca3162bfdcbca9a11d06e70549b0101d6e5
 SHA512:
-  metadata.gz: e9ccce99749ee6cbc40068c45ae31dd1147c1c09a70ddab40ed29c0885fc8a5c217cd3c8515ecdda6f9eb1efbd8119eeecb027fe11ee6db596bd57348f5eb237
-  data.tar.gz: 363b9e9b2e9d7abaaca0c74ea0bf963bed8aca8b7a128f2fcd66a299b7b64bb93f24dad4f6497d00cb26d7dfcb217a50bd81a1f36e7ac2d19a1ef6de9b46d0e7
+  metadata.gz: e585066882f81e50080b172044b9ed4b48d7051ff3dc691c20d6fede67498d3e5dcecd1f9feaae7f8fa2c64dcceebe170614c702d4b4bbd6af3400384469bf47
+  data.tar.gz: f3b7652b5d6ae53c90085204b4131ec765be8ed396a3cbc9991465ce8e34226b8b8e8c8608d9bb86188b3467eee2e0607f3309aa16acab348713da9675609c9d

data/Gemfile.lock

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

data/docker/docker-compose.yml

@@ -15,6 +15,13 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
       - et_full_system
+    links:
+      - db
+      - redis
+      - minio
+      - azurite
+      - mailhog
+      - et
   et:
     image: 'et_full_system:1.0.0.pre'
     build:
@@ -28,6 +35,12 @@ services:
       - '${SERVER_PORT:-3100}:${SERVER_PORT:-3100}'
       - '${TRAEFIX_PORT:-3200}:${TRAEFIK_PORT:-3200}'
       - '${SMTP_PORT:-1025}:${SMTP_PORT:-1025}'
+    links:
+      - db
+      - redis
+      - minio
+      - azurite
+      - mailhog
     extra_hosts:
       - "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP}"
     volumes:
@@ -83,9 +96,6 @@ services:
       CCD_SIDAM_USERNAME: ${CCD_SIDAM_USERNAME:-m@m.com}
       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}"
-    links:
-      - "db"
-      - "redis"
     networks:
       et_full_system:
         aliases:
@@ -148,6 +158,9 @@ services:
       - 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.services.s3-service.loadbalancer.server.port=9000
+    command:
+      - server
+      - /data
     networks:
       - et_full_system
   mailhog:

data/lib/et_full_system/cli/local.rb

@@ -338,11 +338,14 @@ module EtFullSystem
     end
 
     def external_command(cmd, tag)
-      IO.popen(cmd) do |io|
+      ret = IO.popen(cmd) do |io|
         io.each do |line|
           puts "| #{tag} | #{line}"
         end
       end
+      raise "Command failed" unless $?.exitstatus.zero?
+
+      ret
     end
 
     def setup_et1_service
@@ -351,7 +354,7 @@ module EtFullSystem
       puts cmd
       external_command cmd, 'et1 setup'
 
-      cmd = "bash --login -c \"cd #{PROJECT_PATH}/systems/et1 && npm install\""
+      cmd = "bash --login -c \"cd #{PROJECT_PATH}/systems/et1 && yarn install\""
       puts cmd
       external_command cmd, 'et1 setup'
 

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "6.0.0.pre.rc12"
+  VERSION = "6.0.0.pre.rc16"
 end

metadata

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