sct 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c949eeff7191cb2699ed0ed1ba26559d7a47ca5111e154204b4e1da42356069
-  data.tar.gz: 7c021037a4e3fc764d011e7d2e76024344a6a2b3e05672de4bc5dc0cad985042
+  metadata.gz: ea8384d7d7c3ab04eb3d184f66953b6f4cc4ce7e669da1ce82533d8964fa2f3a
+  data.tar.gz: 45e6800f8369e921f19452c191f27c9ced727676923952590fc9af8ad9bad558
 SHA512:
-  metadata.gz: 9022840b61e7414056aef611325122d8c4e1c1dce4c370f99d2b67d5ddda35b9e395444ffc6b7d79b01d530d40117cfc08159148b276263d9b8958cce488e8c5
-  data.tar.gz: d5f967cd37ad3447f3566051894195b08ecda28773a95a9bdecc7f61bbb59efc339d6541c826b1f5a0efd6e06bc3519e1d1cce32c096b784ca1ad4518f71e0c3
+  metadata.gz: e87a61ac439d0e0737963d42bba9f81e0cb43b529fa78a6d1e638e56356760d050daa3fbb84dad74f8ba550277d2cd59a18434996d9cf04018ec21ba57776594
+  data.tar.gz: 8d0bd664311e72d1b980fb0485c90d3da29ce302f2d2045df76595ca0d9747811d4732fe70974c68d39aa3a9675338434cfcbbf3079335ed54e1b1a136d3830b

data/sct/lib/sct/commands/dev.rb

@@ -10,12 +10,12 @@ module Sct
       exit 1
     end
 
-    def dc command
-      system "docker-compose -f ~/development/spend-cloud/docker-compose.yml #{command}"
+    def dc command, env = {}
+      system env, "docker-compose #{command}"
     end
 
-    def local_dc command
-      system "docker-compose -f #{@@file} #{command}"
+    def dc_dev command, env = {}
+      dc "-f #{@@file} #{command}", env
     end
 
     def manifest
@@ -38,12 +38,14 @@ module Sct
       container = service_spec["container_name"]
       command = service_spec["command"] || ""
 
+      env = { "PUID" => `id -u`.chomp, "PGID" => `id -g`.chomp }
+
       if options.pull
-        return unless local_dc "pull"
+        return unless dc_dev "pull"
       end
 
       if options.build
-        return unless local_dc "build --build-arg PUID=$(id -u) --build-arg PGID=$(id -g) #{options.pull ? "--pull" : ""}"
+        return unless dc_dev "build #{options.pull ? "--pull" : ""}", env
       end
 
       if options.pull or options.build
@@ -52,7 +54,7 @@ module Sct
 
       return unless dc "rm --stop --force #{service}"
 
-      local_dc "run --rm --service-ports --name #{container} #{service} #{command}"
+      dc_dev "run --rm --service-ports --name #{container} #{service} #{command}", env
 
       dc "up --detach #{service}"
     end

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored