minos 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0142872ab6be8e8cee71cdbe2705bb6df2569c758d41d97ec6849787d7293c2
-  data.tar.gz: 8815a55df821773940a81d5fd58a96e0d03ac2be5e0bd47e702558683d4add8b
+  metadata.gz: 34694b91db8e98e5972dba9235a74d13f8d4e552bf5a5919c0150a7642bd3733
+  data.tar.gz: 3e94a19b7831ed8ca7e3a050ab8def2b32902c3bb042cda1fac202827c56c53d
 SHA512:
-  metadata.gz: 7e56c8ad28f97066253cd00fd2a9245955df2bbd061779560bd053f64c5fa0cf7d9c6f360608a3f788fea14b85bc6085c2ba44b6a6cedc06e589945402b14c18
-  data.tar.gz: 8e69df547ee98a68c203a64eee4bd9ac596bd3206d79941e18b44ff85d64930cd418ea026259fd457d32bd84d66a8849c07da69e7f71268590d4ef336fb89bf7
+  metadata.gz: 21a6c18652ca8a839960af8d27e9a34375c58ca7f1678b72d49c02c0bbeccd7392bd8aec3b687c2ace9e94f8e7d6125d617499045dc31d99d1d1f2563216cd9f
+  data.tar.gz: 465ff2b0f778c3d16fa2fddaacf6abb752ab2f047ce87ac4c78a52c85bb0c278530e589ac97ab1a26df8a68f015b59096beddc5f1c32fe5c07c072f416c61289

data/.ruby-version

@@ -1 +1 @@
-2.5.3
+3.2.2

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.2.2

data/Dockerfile

@@ -0,0 +1,6 @@
+FROM ruby:2.5.3-alpine3.7
+
+WORKDIR /home/runner
+
+RUN apk add --update --no-cache docker && \
+    gem install --no-document minos

data/README.md

@@ -21,11 +21,31 @@ Minos is divided into two components:
   1. Building and publishing docker artifacts
   2. Deploying docker artifacts on a Kubernetes cluster
 
+You can use minos from docker as well:
+
+1. Build the docker image
+
+```sh
+docker build -t textmasterapps/minos:latest .
+```
+
+2. Run:
+
+```sh
+docker run \
+  -e REVISION=$REVISION \
+  -v /var/run/docker.sock:/var/run/docker.sock \
+  -v `pwd`:/home/runner/ \
+  textmasterapps/minos:latest minos build --manifest examples/minos.yaml
+```
+
+*Mount your `.docker` directory if you want to connect to docker repository from within minos docker image*
+
 ### Build
 
-To build docker artifacts, Minos use a declarative config file written in YAML.
+To build docker artifacts, Minos uses a declarative config file written in YAML.
 By default Minos will look for a file called `minos.yaml` under the
-current directory. See `--manifest` option to provide in different config file.
+current directory. See `--manifest` option to provide a different config file.
 For example:
 
 ```yaml
@@ -34,14 +54,15 @@ build:
   - name: builder
     image: textmasterapps/foo
     tags:
-    - "$TARGET-latest"
+    - "$TARGET"
+    - "$TARGET-$REVISION"
     docker:
       # file: MyDockerfile
       tag: "$IMAGE:$TARGET" # $IMAGE and $TARGET are automatically populated as env vars for you
       target: builder
       cacheFrom:
       - textmasterapps/foo:builder
-      - textmasterapps/foo:builder-latest
+      - textmasterapps/foo:builder-$REVISION
   - name: release
     image: textmasterapps/foo
     tags:
@@ -56,6 +77,7 @@ build:
         REVISION: "$REVISION"
       cacheFrom:
       - textmasterapps/foo:builder
+      - textmasterapps/foo:release
       - textmasterapps/foo:$REVISION
       - textmasterapps/foo:latest
 ```
@@ -140,13 +162,9 @@ ENV REVISION $REVISION
 
 More details about our Dockerfiles at TextMaster can be found on our [Blog](https://medium.com/textmaster-engineering/how-textmaster-reduced-deployment-time-by-using-multi-stages-dockerfile-in-its-ci-pipeline-ffb5e153bfc7)
 
-### Deploy
-
-WIP
-
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/gottfrois/minos. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/textmaster/minos. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -154,4 +172,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Minos project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/gottfrois/minos/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Minos project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/textmaster/minos/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
-task :default => :spec
+task default: :spec

data/examples/minos.invalid.yaml

@@ -1,7 +1,7 @@
 build:
   artifacts:
   - name: builder
-    image: textmasterapps/nginx
+    image: textmasterapps/minos
     tags:
     - "$TARGET-$REVISION"
     - "$TARGET-latest"
@@ -10,11 +10,11 @@ build:
       tag: "$IMAGE:$TARGET" # $IMAGE and $TARGET are automatically populated as env vars for you
       target: builder
       cacheFrom:
-      - textmasterapps/nginx:builder
-      - textmasterapps/nginx:builder-$REVISION
-      - textmasterapps/nginx:builder-latest
+      - textmasterapps/minos:builder
+      - textmasterapps/minos:builder-$REVISION
+      - textmasterapps/minos:builder-latest
   - name: release
-    image: textmasterapps/nginx
+    image: textmasterapps/minos
     tags:
     - "$REVISION" # you can reference ENV variables from your shell
     - "latest"
@@ -26,7 +26,7 @@ build:
         ENV: "production"
         REVISION: "$REVISION"
       cacheFrom:
-      - textmasterapps/nginx:builder
-      - textmasterapps/nginx:release
-      - textmasterapps/nginx:$REVISION
-      - textmasterapps/nginx:latest
+      - textmasterapps/minos:builder
+      - textmasterapps/minos:release
+      - textmasterapps/minos:$REVISION
+      - textmasterapps/minos:latest

data/examples/minos.yaml

@@ -1,20 +1,19 @@
 build:
   artifacts:
   - name: builder
-    image: textmasterapps/nginx
+    image: textmasterapps/minos
     tags:
+    - "$TARGET"
     - "$TARGET-$REVISION"
-    - "$TARGET-latest"
     docker:
       file: ./examples/Dockerfile
       tag: "$IMAGE:$TARGET" # $IMAGE and $TARGET are automatically populated as env vars for you
       target: builder
       cacheFrom:
-      - textmasterapps/nginx:builder
-      - textmasterapps/nginx:builder-$REVISION
-      - textmasterapps/nginx:builder-latest
+      - textmasterapps/minos:builder
+      - textmasterapps/minos:builder-$REVISION
   - name: release
-    image: textmasterapps/nginx
+    image: textmasterapps/minos
     tags:
     - "$REVISION" # you can reference ENV variables from your shell
     - "latest"
@@ -26,7 +25,7 @@ build:
         ENV: "production"
         REVISION: "$REVISION"
       cacheFrom:
-      - textmasterapps/nginx:builder
-      - textmasterapps/nginx:release
-      - textmasterapps/nginx:$REVISION
-      - textmasterapps/nginx:latest
+      - textmasterapps/minos:builder
+      - textmasterapps/minos:release
+      - textmasterapps/minos:$REVISION
+      - textmasterapps/minos:latest

data/lib/minos/artifact.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open3'
 require 'minos/utils'
 require 'active_support/core_ext/string/inflections'
@@ -7,6 +9,7 @@ module Minos
     include Dry::Monads::Result::Mixin
     include Dry::Monads::Task::Mixin
     include Dry::Monads::List::Mixin
+    include Dry::Monads::Try::Mixin
     include Dry::Monads::Do.for(:build, :push)
     include Thor::Shell
 
@@ -22,12 +25,7 @@ module Minos
     end
 
     def build
-      yield List::Task[
-        *caches.map.each_with_index { |cache, i| docker_pull(i, cache) }
-      ]
-      .traverse
-      .bind { |_| docker_build }
-      .to_result
+      docker_build.to_result
     end
 
     def push
@@ -40,29 +38,11 @@ module Minos
 
     private
 
-    def docker_pull(i, cache)
-      Task[:io, &-> {
-        color = select_color(i)
-        if run "docker inspect #{cache} -f '{{json .ID}}' > /dev/null 2>&1"
-          print "Using local #{cache}", color: color
-        else
-          print "Trying to pull #{cache}...", color: color
-          if run "docker pull #{cache} 2> /dev/null", color: color
-            print "Using local #{cache}", color: color
-          else
-            print "Enable to pull #{cache}", color: color
-          end
-        end
-
-        return Success()
-      }]
-    end
-
     def docker_build
       Task[:io, &-> {
         color = :green
         print "Building #{target}...", color: color
-        if run "docker build --rm #{Minos::Utils.to_args(docker)} .", color: color
+        if run "docker build --rm --build-arg BUILDKIT_INLINE_CACHE=1 #{Minos::Utils.to_args(docker)} .", color: color
           print "Successfully built #{target}", color: color
           return Success()
         else

data/lib/minos/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Minos
   class CLI < Thor
     include Thor::Shell

data/lib/minos/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Minos
   class Utils
     # Flatten args as an array, hash or string into CLI args.

data/lib/minos/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Minos
-  VERSION = '0.3.7'
+  VERSION = '0.4.0'
 end

data/lib/minos.rb

@@ -1,9 +1,8 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'thor'
-require 'dry/monads/task'
-require 'dry/monads/result'
-require 'dry/monads/list'
-require 'dry/monads/do'
+require 'dry/monads'
 
 require 'minos/artifact'
 require 'minos/cli'

metadata

@@ -1,127 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: minos
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-matcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Easy and repeatable Kubernetes deployment based on Docker images
 email:
 - pierre-louis@textmaster.com
@@ -130,16 +94,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - ".ruby-version"
+- ".tool-versions"
 - CODE_OF_CONDUCT.md
-- Gemfile
-- Gemfile.lock
+- Dockerfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - examples/Dockerfile
 - examples/Dockerfile.invalid
 - examples/minos.invalid.yaml
@@ -150,12 +111,14 @@ files:
 - lib/minos/cli.rb
 - lib/minos/utils.rb
 - lib/minos/version.rb
-- minos.gemspec
 homepage: https://github.com/textmaster/minos
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/textmaster/minos
+  source_code_uri: https://github.com/textmaster/minos
+  changelog_uri: https://github.com/textmaster/minos
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,16 +126,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Easy and repeatable Kubernetes deployment based on Docker images
 test_files: []

data/.gitignore

@@ -1,8 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/

data/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in minos.gemspec
-gemspec

data/Gemfile.lock

@@ -1,66 +0,0 @@
-PATH
-  remote: .
-  specs:
-    minos (0.3.7)
-      activesupport (~> 5.2)
-      dry-matcher (~> 0.7)
-      dry-monads (~> 1.2)
-      thor (~> 0.20)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.2.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.4)
-    diff-lcs (1.3)
-    dry-core (0.4.7)
-      concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.1)
-    dry-matcher (0.7.0)
-    dry-monads (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer
-    i18n (1.5.3)
-      concurrent-ruby (~> 1.0)
-    method_source (0.9.2)
-    minitest (5.11.3)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.17)
-  minos!
-  pry
-  rake (~> 10.0)
-  rspec
-
-BUNDLED WITH
-   1.17.3

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "minos"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/minos.gemspec

@@ -1,35 +0,0 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "minos/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "minos"
-  spec.version       = Minos::VERSION
-  spec.authors       = ["Pierre-Louis Gottfrois"]
-  spec.email         = ["pierre-louis@textmaster.com"]
-
-  spec.summary       = %q{Easy and repeatable Kubernetes deployment based on Docker images}
-  spec.description   = %q{Easy and repeatable Kubernetes deployment based on Docker images}
-  spec.homepage      = "https://github.com/textmaster/minos"
-  spec.license       = "MIT"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "activesupport", "~> 5.2"
-  spec.add_dependency "thor", "~> 0.20"
-  spec.add_dependency "dry-matcher", "~> 0.7"
-  spec.add_dependency "dry-monads", "~> 1.2"
-
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rspec"
-end