miniexec 0.0.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c459ebbf1b0b28551c9d8243d323552518f19594ebf1cd327db16a0e4a629c5
-  data.tar.gz: 03c7bb377700b97f4bace54b20c1ca10d75be95f6e773e7347204d17fbed6a9a
+  metadata.gz: 550158d86f5f2784056c277e222f8b446df695deccd78dfa6e585ec4ff755852
+  data.tar.gz: e6b1ca3987365aabf54d3f126b153a0b527e1b5b2075395b57ecb3c240a046ca
 SHA512:
-  metadata.gz: dceeeb43f8835bc188b7bf1f7dab09b0666563b04eb3428434debe5d1125b1962fe07c0efcba15685db7b8d27bb23927558cafecb6d55d20591fa29ee89e4431
-  data.tar.gz: 61f032f5532532db3b935fea5538b0d5591bbe44d1cc63d8ac9a9d9d5335a5b15043dc8c52651131e0f444362a33e4c09a9b28963eadadff36050fe7c9272418
+  metadata.gz: c3483cdf517a9fec48c1c0146ead79f323986892420cc5a5d7bf918f8ff2f02ff7734ed324bf75df81b8b10e7258376b8ba185d6de3914f4aeccb550553832f7
+  data.tar.gz: 19b604234de06aa7276e15fa73ea00c2f6f4419ee3f6414b2c2768d5c1cae61bcc91b51370f639a48ab5cdc195a6c93dbf2efa01c0731ff8e99ff83a9f91a7d0

data/bin/miniexec

@@ -10,7 +10,8 @@ options = {
   binds: [],
   env: {},
   path: '.',
-  docker: ENV['DOCKER_HOST'] || '/run/docker.sock'
+  docker: ENV['DOCKER_HOST'] || '/run/docker.sock',
+  cwd: true
 }
 
 OptionParser.new do |opts|
@@ -40,13 +41,18 @@ OptionParser.new do |opts|
           'Location of the docker socket') do |sock|
     options[:docker] = sock
   end
+  opts.on('-n', '--no-mount-cwd',
+          'Don\'t mount the CWD in the container\'s WORKDIR by default.') do
+    options[:cwd] = false
+  end
 end.parse!
 
 raise OptionParser::MissingArgument, 'Specify a job with -j' if options[:job].nil?
 
-MiniExec.config(project_path: options[:path])
-exec = MiniExec.new options[:job],
-                    docker_url: options[:docker],
-                    binds: options[:binds],
-                    env: options[:env]
+MiniExec::MiniExec.config(project_path: options[:path])
+exec = MiniExec::MiniExec.new options[:job],
+                              docker_url: options[:docker],
+                              binds: options[:binds],
+                              env: options[:env],
+                              mount_cwd: options[:cwd] || false
 exec.run_job

data/lib/miniexec.rb

@@ -1,121 +1,159 @@
 # frozen_string_literal: true
 
 # Main class
-class MiniExec
-  require 'logger'
-  require 'docker-api'
-  require 'json'
-  require 'tempfile'
-  require 'yaml'
-  require 'git'
-  # Class instance variables
-  @project_path = '.'
-  @workflow_file = '.gitlab-ci.yml'
+module MiniExec
+  class MiniExec
+    require 'logger'
+    require 'docker-api'
+    require 'json'
+    require 'tempfile'
+    require 'yaml'
+    require 'git'
+    require_relative './util'
+    # Class instance variables
+    @project_path = '.'
+    @workflow_file = '.gitlab-ci.yml'
 
-  class << self
-    attr_accessor :project_path, :workflow_file
-  end
+    class << self
+      attr_accessor :project_path, :workflow_file
+    end
 
-  def self.config(project_path: @project_path, workflow_file: @workflow_file)
-    @project_path = project_path
-    @workflow_file = workflow_file
-    self
-  end
+    def self.config(project_path: @project_path, workflow_file: @workflow_file)
+      @project_path = project_path
+      @workflow_file = workflow_file
+      self
+    end
 
-  attr_accessor :script
+    attr_accessor :script
+    attr_reader :runlog
 
-  def initialize(job,
-                 project_path: self.class.project_path,
-                 docker_url: nil,
-                 binds: [],
-                 env: {})
-    @job_name = job
-    @project_path = project_path
-    @workflow = YAML.load(File.read("#{@project_path}/#{MiniExec.workflow_file}"))
-    @job = @workflow[job]
-    @job['name'] = job
-    @default_image = @workflow['image'] || 'debian:buster-slim'
-    @image = set_job_image
-    @script = compile_script
-    @binds = binds
-    @env = env.merge gitlab_env, variables
-    configure_logger
-    Docker.options[:read_timeout] = 6000
-    Docker.url = docker_url if docker_url
-  end
+    def initialize(job,
+                   project_path: self.class.project_path,
+                   docker_url: nil,
+                   binds: [],
+                   env: {},
+                   mount_cwd: true)
+      @job_name = job
+      @project_path = project_path
+      @workflow = YAML.load(File.read("#{@project_path}/#{MiniExec.workflow_file}"))
+      @job = @workflow[job]
+      @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,
+        gitlab_env,
+        @workflow['variables'],
+        @job['variables']
+      ].each do |var_set|
+        @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
+    end
+
+    def run_job
+      script_path = "/tmp/#{@job['name']}.sh"
+      @logger.info "Fetching image #{@image}"
+      Docker::Image.create(fromImage: @image)
+      @logger.info 'Image fetched'
 
-  def run_job
-    script_path = "/tmp/#{@job['name']}.sh"
-    @logger.info "Fetching image #{@image}"
-    Docker::Image.create(fromImage: @image)
-    @logger.info 'Image fetched'
-    Dir.chdir(@project_path) do
-      @logger.info 'Creating container'
-      container = Docker::Container.create(
-        Cmd: ['/bin/bash', script_path],
-        Image: @image,
-        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 }
+      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(
+          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; @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
-  end
 
-  private
+    private
 
-  def set_job_image
-    return @job['image'] if @job['image']
+    def set_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
 
-    @default_image
-  end
+      image || @default_image
+    end
 
-  # Set gitlab's predefined env vars as per
-  # https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
-  def gitlab_env
-    g = Git.open(@project_path)
-    commit = g.gcommit 'HEAD'
-    tag = g.tags.find { |t| t.objectish == commit.sha }
-    commit_branch = g.branch.name
-    if tag.nil?
-      ref_name = g.branch.name
-      commit_tag = nil
-    else
-      ref_name = tag.name
-      commit_tag = ref_name
+    def set_job_entrypoint
+      @job['image']['entrypoint'] if @job['image'].instance_of?(Hash)
     end
-    {
-      'CI': true,
-      'CI_COMMIT_REF_SHA': commit.sha,
-      'CI_COMMIT_SHORT_SHA': commit.sha[0, 8],
-      'CI_COMMIT_REF_NAME': ref_name,
-      'CI_COMMIT_BRANCH': commit_branch,
-      'CI_COMMIT_TAG': commit_tag,
-      'CI_COMMIT_MESSAGE': commit.message,
-      'CI_COMMIT_REF_PROTECTED': false,
-      'CI_COMMIT_TIMESTAMP': commit.date.strftime('%FT%T')
-    }.transform_keys(&:to_s)
-  end
 
-  def variables
-    globals = @workflow['variables'] || {}
-    job_locals = @job['variables'] || {}
-    globals.merge job_locals
-  end
+    # Set gitlab's predefined env vars as per
+    # https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
+    def gitlab_env
+      g = Git.open(@project_path)
+      commit = g.gcommit 'HEAD'
+      tag = g.tags.find { |t| t.objectish == commit.sha }
+      commit_branch = g.branch.name
+      if tag.nil?
+        ref_name = g.branch.name
+        commit_tag = nil
+      else
+        ref_name = tag.name
+        commit_tag = ref_name
+      end
+      {
+        'CI': true,
+        'CI_COMMIT_REF_SHA': commit.sha,
+        'CI_COMMIT_SHORT_SHA': commit.sha[0, 8],
+        'CI_COMMIT_REF_NAME': ref_name,
+        'CI_COMMIT_BRANCH': commit_branch,
+        'CI_COMMIT_TAG': commit_tag,
+        'CI_COMMIT_MESSAGE': commit.message,
+        'CI_COMMIT_REF_PROTECTED': false,
+        'CI_COMMIT_TIMESTAMP': commit.date.strftime('%FT%T')
+      }.transform_keys(&:to_s)
+    end
 
-  def configure_logger
-    @logger = Logger.new($stdout)
-    @logger.formatter = proc do |severity, _, _, msg|
-      "[#{severity}]: #{msg}\n"
+    def variables
+      globals = @workflow['variables'] || {}
+      job_locals = @job['variables'] || {}
+      globals.merge job_locals
+    end
+
+    def configure_logger
+      @logger = Logger.new($stdout)
+      @logger.formatter = proc do |severity, _, _, msg|
+        "[#{severity}]: #{msg}\n"
+      end
+      @logger.level = ENV['LOGLEVEL'] || Logger::INFO
     end
-    @logger.level = ENV['LOGLEVEL'] || Logger::INFO
-  end
 
-  def compile_script
-    before_script = @job['before_script'] || ''
-    script = @job['script'] || ''
-    after_script = @job['after_script'] || ''
-    [before_script, script, after_script].flatten.join("\n").strip
+    def compile_script
+      before_script = @job['before_script'] || ''
+      script = @job['script'] || ''
+      after_script = @job['after_script'] || ''
+      [before_script, script, after_script].flatten.join("\n").strip
+    end
   end
 end

data/lib/util.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module MiniExec
+  module Util
+    # Given a string and an env, replace any instance of shell-style variables
+    # with their value in the env. NOT POSIX COMPLIANT, just mostly hacky so
+    # I can get gitlab-ci.yml parsing to work properly. Required in MiniExec
+    # because of https://docs.gitlab.com/ee/ci/variables/where_variables_can_be_used.html#gitlab-internal-variable-expansion-mechanism
+    def self.expand_var(string, env)
+      # Match group 1 = the text to replace
+      # Match group 2 = the key from env we want to replace it with
+      regex = /(\${?(\w+)}?)/
+      string.scan(regex).uniq.each do |match|
+        string.gsub! match[0], env[match[1]].to_s
+      end
+      string
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miniexec
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.2.1
 platform: ruby
 authors:
 - Martin Pugh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies: []
 description: A minimal interpretor/executor for .gitlab-ci.yml
 email: pugh@s3kr.it
@@ -19,6 +19,7 @@ extra_rdoc_files: []
 files:
 - bin/miniexec
 - lib/miniexec.rb
+- lib/util.rb
 homepage: https://github.com/s3krit/miniexec
 licenses:
 - AGPL-3.0-or-later