rascal 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 410f63a35a3389098195b39badbc4e1c36f6ac9f534f8741ca92489b0bfbd083
-  data.tar.gz: 38c474e407a4217c8750de66eabbb123a6214c4f921308ea64fb7d17831b1095
+  metadata.gz: 572abe30bc6bf324db027831465e8727645f9a3baa86099f17b183990dadc112
+  data.tar.gz: a3f022201df4025e5f967db4482bf25b9cfc8c20b99518ce905671415610ca90
 SHA512:
-  metadata.gz: da2100bea61c066b3c7c3eb72b7b321c69cb39f697de0c04cdc81ece950e10d2d60ddab0b6c7b74de6fa8e7f3ea3b767be9a74bf909dde7794fc3560c6664586
-  data.tar.gz: 404cf6adc8d6977f1946cb1e8ecbe60647c38b9683a0f411cad51731d3ff8d45d8c44556c907088d0a2aac1f3be16727751025bc80710692999534d2b9d32bbe
+  metadata.gz: bb8692dd074d0ed5f6b266df552652dafcc79e89a7cbfbf17c4c624caf7d0a8fb96760d0feb8f4aabd384bb3ae5b809c99539faba3cb36f1ef13a1ff3f259542
+  data.tar.gz: 07e7e1980a7b275c274448c4bd4961bd5a3a33a310c65453ab604ab27f7c9d1103e3d470d693066298b596c87dd43024dc2ac41b1d0a86fd5995055f8f0d6ede

data/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented here.
 
 Rascal follows semantic versioning. This has little consequence pre 1.0, so expect breaking changes.
 
+## 0.3.1 (2020-10-01)
+
+- Pass env variables to service containers.
+
+
 ## 0.3.0 (2020-09-23)
 
 - Mount /repo into all service volumes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rascal (0.3.0)
+    rascal (0.3.1)
       thor (~> 0.20.3)
 
 GEM

data/lib/rascal/docker/container.rb

@@ -40,12 +40,13 @@ module Rascal
         !!id
       end
 
-      def start(network: nil, network_alias: nil, volumes: [])
+      def start(network: nil, network_alias: nil, volumes: [], env: {})
         say "Starting container for #{@name}"
         create(network: network, network_alias: network_alias, volumes: volumes) unless exists?
         Docker.interface.run(
           'container',
           'start',
+          *env_args(env),
           id,
         )
       end
@@ -75,7 +76,7 @@ module Rascal
           '--tty',
           *(['-w', working_dir] if working_dir),
           *(volumes.flat_map { |v| ['-v', v.to_param] }),
-          *(env.flat_map { |key, value| ['-e', "#{key}=#{value}"] }),
+          *env_args(env),
           *(['--network', network.id] if network),
           @image,
           *command,
@@ -148,6 +149,10 @@ module Rascal
           id,
         )
       end
+
+      def env_args(env)
+        env.flat_map { |key, value| ['-e', "#{key}=#{value}"] }
+      end
     end
   end
 end

data/lib/rascal/environments_definition/gitlab.rb

@@ -69,15 +69,16 @@ module Rascal
               name = config.get('name', key)
               full_name = "#{@base_name}-#{name}"
               shared_volumes = [build_repo_volume(docker_repo_dir), build_builds_volume(full_name)]
+              env_variables = (config.get('variables', {}))
               Environment.new(full_name,
                 name: name,
                 image: config.get('image'),
-                env_variables: (config.get('variables', {})),
                 volumes: [
                   *shared_volumes,
                   *build_volumes(full_name, config.get('volumes', {}))
                 ],
-                services: build_services(full_name, config.get('services', []), volumes: shared_volumes),
+                env_variables: env_variables,
+                services: build_services(full_name, config.get('services', []), volumes: shared_volumes, env_variables: env_variables),
                 before_shell: config.get('before_shell', []),
                 after_shell: config.get('after_shell', []),
                 working_dir: docker_repo_dir,
@@ -110,13 +111,14 @@ module Rascal
         end
       end
 
-      def build_services(name, services, volumes: [])
+      def build_services(name, services, volumes: [], env_variables: {})
         services.collect do |service_config|
           service_alias = service_config['alias']
           Service.new("#{name}_#{service_alias}",
             alias_name: service_config['alias'],
             image: service_config['name'],
             volumes: volumes,
+            env_variables: env_variables,
           )
         end
       end

data/lib/rascal/service.rb

@@ -1,12 +1,13 @@
 module Rascal
   class Service
-    attr_reader :name, :container, :alias
+    attr_reader :name, :container, :alias, :env_variables
 
-    def initialize(name, image:, alias_name:, volumes: [])
+    def initialize(name, env_variables: {}, image:, alias_name:, volumes: [])
       @name = name
       @container = Docker::Container.new(name, image)
       @alias = alias_name
       @volumes = volumes
+      @env_variables = env_variables
     end
 
     def download_missing
@@ -15,7 +16,7 @@ module Rascal
 
     def start_if_stopped(network: nil)
       unless @container.running?
-        @container.start(network: network, network_alias: @alias, volumes: @volumes)
+        @container.start(network: network, network_alias: @alias, volumes: @volumes, env: @env_variables)
       end
     end
 

data/lib/rascal/version.rb

@@ -1,3 +1,3 @@
 module Rascal
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rascal
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor