miniexec 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23d8470c6289646978702f3c917e7a8d6e98df6aef7b2a6d8c810eecbaf9e797
-  data.tar.gz: bb5725ff2ff691bce7c0a2aa55860889efcd8300bb39add2347415ef4dff516c
+  metadata.gz: 6097e4b1de5d81d2e75d5817d9fd6a722ad40c9add96a1ff817cbbe64614f5e2
+  data.tar.gz: 9d639bc96b249926a411662b4a54027ebbb8381bcda243b56261eb5ed7530077
 SHA512:
-  metadata.gz: cc22648aa2042168eab09e192e89ad140ae188f20da8250e5817da3218019a580d5b7140320720bd212fbc44d2323c6f41aa1e722d7eb8973be877b6a5727c10
-  data.tar.gz: 6a4365689aa47b7be9272d8f6297c939159df7de03862965aa39e2b10c6fa07860d951b208c10b938cfa9b6c2d9b7a5b0660ff46859e732e565cfaa179b9cfea
+  metadata.gz: 042ac22614eedb274be50d0cbac5f13e1e8bc05bf8421559206dcf433365b205b892dab091aff64dd07ec7da2e782a9a0f4e63ecc0341424032d56a8070755a0
+  data.tar.gz: b62dd5d5dddd6e0abb6057052b25cdcef90f9167c068e7821de9f928a215e06b57593fdced5c3b92f686254afe95cf37fb320cec3aa88531b34e02988840937e

data/lib/miniexec.rb

@@ -25,12 +25,14 @@ module MiniExec
     end
 
     attr_accessor :script
+    attr_reader :runlog
 
     def initialize(job,
                    project_path: self.class.project_path,
                    docker_url: nil,
                    binds: [],
-                   env: {})
+                   env: {},
+                   mount_cwd: true)
       @job_name = job
       @project_path = project_path
       @workflow = YAML.load(File.read("#{@project_path}/#{MiniExec.workflow_file}"))
@@ -38,7 +40,9 @@ module MiniExec
       @job['name'] = job
       @default_image = @workflow['image'] || 'debian:buster-slim'
       @image = set_job_image
+      @entrypoint = set_job_entrypoint
       @binds = binds
+      @mount_cwd = mount_cwd
       @env = {}
       [
         env,
@@ -49,6 +53,7 @@ module MiniExec
         @env.merge!(var_set.transform_values { |v| Util.expand_var(v.to_s, @env) }) if var_set
       end
       @script = compile_script
+      @runlog = []
       configure_logger
       Docker.options[:read_timeout] = 6000
       Docker.url = docker_url if docker_url
@@ -59,26 +64,48 @@ module MiniExec
       @logger.info "Fetching image #{@image}"
       Docker::Image.create(fromImage: @image)
       @logger.info 'Image fetched'
+
+      config = Docker::Image.get(@image).info['Config']
+      working_dir = if config['WorkingDir'].empty?
+                      '/gitlab'
+                    else
+                      config['WorkingDir']
+                    end
+      binds = @binds
+      binds.push "#{ENV['PWD']}:#{working_dir}" if @mount_cwd
       Dir.chdir(@project_path) do
         @logger.info 'Creating container'
         container = Docker::Container.create(
-          Cmd: ['/bin/bash', script_path],
           Image: @image,
+          Cmd: ['/usr/bin/env', 'bash', script_path],
+          WorkingDir: working_dir,
+          Entrypoint: @entrypoint,
           Volumes: @binds.map { |b| { b => { path_parent: 'rw' } } }.inject(:merge),
           Env: @env.map { |k, v| "#{k}=#{v}" }
         )
         container.store_file(script_path, @script)
         container.start({ Binds: [@binds] })
-        container.tap(&:start).attach { |_, chunk| puts chunk }
+        container.tap(&:start).attach { |_, chunk| puts chunk; @runlog.push chunk}
+        @logger.info 'Job finished. Removing container.'
+        # After running, we want to remove the container.
+        container.remove
+        @logger.info 'Container removed.'
       end
     end
 
     private
 
     def set_job_image
-      return @job['image'] if @job['image']
+      if @job['image']
+        image = @job['image'] if @job['image'].instance_of?(String)
+        image = @job['image']['name'] if @job['image'].instance_of?(Hash)
+      end
+
+      image || @default_image
+    end
 
-      @default_image
+    def set_job_entrypoint
+      @job['image']['entrypoint'] if @job['image'].instance_of?(Hash)
     end
 
     # Set gitlab's predefined env vars as per

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miniexec
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Martin Pugh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies: []
 description: A minimal interpretor/executor for .gitlab-ci.yml
 email: pugh@s3kr.it