indocker 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b625051ee86d20ec224e8f277b5fc884ce7c02ef671a18533836e9e654c1fcf
-  data.tar.gz: 1867b3210ab2134bd52366a2ded1abc0e24ef122ecc8337a5213f5f0460526a5
+  metadata.gz: 69e124a571ae32781f28cbe640d3f406914c9cbbf88ebe5178d31280844c0ea6
+  data.tar.gz: 78f3b3a06fd08188b48ad8fedae468a62ea6d9dc348442bf22fc9fdd1b6cf93d
 SHA512:
-  metadata.gz: 8298028d5eea2ac46b1ebf67fb5b19b0846c96a1bc731b6717869412f802d7781d3ee80fa15e7ae75336f5fa878fa9ea90fcfbb5e7a668bcc500d2f5bc4a97d5
-  data.tar.gz: 9f2a4091d1def4b6f86aef36c240a5f5439ee0c604f516b7f52b215b7285b53cbe41800530e517ee97159bda7b99665bfa9a1cf92371e7011c9671f15ddf20b1
+  metadata.gz: d169e30efdcf9ae6c97bf01a836be681c9bdc6cf9515fc61d30b4ae57ad9368a96e7619703fe0ad54cba968123de6ce6da6b96f1272cd7eab95ea73e7ed6416c
+  data.tar.gz: e4b61302d306cc10d85edfffd37db51b668399a6c0ebb214451693394318b389bcf106fc116ee9f2ad1cf17f301c9ba17b1b4d6031a1218351f6c5210b3bd7b0

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    indocker (0.1.1)
+    indocker (0.1.6)
+      net-ssh
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
+    net-ssh (6.1.0)
     rake (10.5.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)

data/README.md

@@ -4,29 +4,16 @@ Docker Containers Deployment
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'indocker'
+```
+$ gem install indocker
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install indocker
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+## Development: Launch example app
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```ruby
+cd example
+bundle exec indocker/bin/deploy -C dev -c ruby -d
+```
 
 ## License
 

data/example/indocker/bin/deploy

@@ -0,0 +1,120 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require_relative 'utils/configurations'
+
+configurations = list_configurations(File.expand_path(File.join(__dir__, '../configurations')))
+
+ARGV << '-h' if ARGV.empty?
+
+options = {
+  skip_build: false,
+  force_restart: false,
+  skip_tags: [],
+  skip_force_restart: [],
+}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: indocker/bin/deploy [options]"
+
+  opts.on("-d", "--debug", "Debug mode") do |val|
+    options[:debug] = true
+  end
+
+  opts.on("-C", "--configuration REQUIRED", String, "Configuration name") do |val|
+    options[:configuration] = val
+  end
+
+  opts.on("-c", "--container OPTIONAL", String, "Deploy by container name") do |val|
+    options[:containers] ||= []
+    options[:containers].push(val.to_sym)
+  end
+
+  opts.on("-t", "--tag OPTIONAL", String, "Deploy containers by tag") do |val|
+    options[:tags] ||= []
+    options[:tags].push(val)
+  end
+
+  opts.on("-s", "--skip OPTIONAL", String, "Skip container during deployment") do |val|
+    options[:skip_containers] ||= []
+    options[:skip_containers] << val.to_sym
+  end
+
+  opts.on("-S", "--server OPTIONAL", String, "Deploy containers that include specfic server") do |val|
+    options[:servers] ||= []
+    options[:servers].push(val.to_sym)
+  end
+
+  opts.on("-D", "--skip-dependent", "Do not deploy dependent containers") do |val|
+    options[:skip_dependent] = true
+  end
+
+  opts.on("-f", "--force-restart", "Force to restart each container") do |val|
+    options[:force_restart] = true
+  end
+
+  opts.on("-F", "--skip-force-restart OPTIONAL", "Skip force restart of specific container for force restart mode") do |val|
+    options[:skip_force_restart].push(val.to_sym)
+  end
+
+  opts.on("-B", "--skip-build", "Skip image build") do |val|
+    options[:skip_build] = true
+  end
+
+  opts.on("-y", "--auto-confirm", "Automatically confirm deployment") do |val|
+    options[:auto_confirm] = true
+  end
+
+  opts.on("-r", "--require-confirmation", "Require deploy confirmation") do |val|
+    options[:require_confirmation] = true
+  end
+
+  opts.on("-T", "--skip-tag OPTIONAL", "Skip containers tagged by specific tags") do |val|
+    options[:skip_tags].push(val)
+  end
+
+  opts.on_tail("-h", "--help", "Show help") do
+    puts opts
+    exit
+  end
+end.parse!
+
+if !options.has_key?(:configuration)
+  puts "You should specify configuration using -C or --configuration option.\nAvailable configurations: #{configurations.sort.join(', ')}"
+  exit 1
+end
+
+if !configurations.include?(options[:configuration])
+  puts "Invalid configuration provided: #{options[:configuration]}.\nAvailable configurations: #{configurations.inspect}"
+  exit 1
+end
+
+begin
+  require 'indocker'
+rescue LoadError
+  puts "InDocker has been moved into a separate gem. Please install using `gem install indocker`"
+  exit
+end
+
+if options[:debug]
+  Indocker.set_log_level(Logger::DEBUG)
+else
+  Indocker.set_log_level(Logger::INFO)
+end
+
+Indocker.set_configuration_name(options[:configuration])
+require_relative '../setup'
+
+Indocker.deploy(
+  containers: options[:containers] || [],
+  tags: options[:tags] || [],
+  skip_containers: options[:skip_containers] || [],
+  skip_dependent: !!options[:skip_dependent],
+  servers: options[:servers] || [],
+  skip_build: options[:skip_build],
+  force_restart: options[:force_restart],
+  skip_tags: options[:skip_tags] || [],
+  skip_force_restart: options[:skip_force_restart] || [],
+  auto_confirm: !!options[:auto_confirm],
+  require_confirmation: !!options[:require_confirmation],
+)

data/example/indocker/bin/remote/compile

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require_relative '../utils/configurations'
+
+configurations = list_configurations(File.expand_path(File.join(__dir__, '../../configurations')))
+
+ARGV << '-h' if ARGV.empty?
+
+options = {}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: indocker/bin/remote/compile [options] (only on remote server)"
+
+  opts.on("-C", "--configuration REQUIRED", String, "Configuration name") do |val|
+    options[:configuration] = val
+  end
+
+  opts.on("-d", "--debug", "Debug mode") do |val|
+    options[:debug] = true
+  end
+
+  opts.on("-i", "--image REQUIRED", String, "Image to be compiled") do |val|
+    options[:images] ||= []
+    options[:images].push(val.to_sym)
+  end
+
+  opts.on("-s", "--skip-dependent", String, "Do not compile dependent images") do |val|
+    options[:skip_dependent] = true
+  end
+
+  opts.on_tail("-h", "--help", "Show help") do
+    puts opts
+    exit
+  end
+end.parse!
+
+if !options.has_key?(:configuration)
+  puts "You should specify configuration using -C or --configuration option.\nAvailable configurations: #{configurations.sort.join(', ')}"
+  exit 1
+end
+
+if !configurations.include?(options[:configuration])
+  puts "Invalid configuration provided: #{options[:configuration]}.\nAvailable configurations: #{configurations.inspect}"
+  exit 1
+end
+
+if !options.has_key?(:images)
+  puts "At least one image should be provided"
+end
+
+begin
+  require 'indocker'
+rescue LoadError
+  puts "InDocker has been moved into a separate gem. Please install using `gem install indocker`"
+  exit 1
+end
+
+if options[:debug]
+  Indocker.set_log_level(Logger::DEBUG)
+else
+  Indocker.set_log_level(Logger::INFO)
+end
+
+Indocker.set_configuration_name(options[:configuration])
+require_relative '../../setup'
+
+
+Indocker.compile(
+  images: options[:images] || [],
+  skip_dependent: !!options[:skip_dependent]
+)

data/example/indocker/bin/remote/run

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require_relative '../utils/configurations'
+
+configurations = list_configurations(File.expand_path(File.join(__dir__, '../../configurations')))
+
+ARGV << '-h' if ARGV.empty?
+
+options = {
+  force_restart: false,
+}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: indocker/bin/remote/run [options] (only on remove server)"
+
+  opts.on("-C", "--configuration REQUIRED", String, "Configuration name") do |val|
+    options[:configuration] = val
+  end
+
+  opts.on("-d", "--debug", "Debug mode") do |val|
+    options[:debug] = true
+  end
+
+  opts.on("-c", "--container REQUIRED", String, "Container name") do |val|
+    options[:container] = val.to_sym
+  end
+
+  opts.on("-f", "--force-restart", "Force to restart each container") do |val|
+    options[:force_restart] = true
+  end
+
+  opts.on_tail("-h", "--help", "Show help") do
+    puts opts
+    exit
+  end
+end.parse!
+
+if !options.has_key?(:configuration)
+  puts "You should specify configuration using -C or --configuration option.\nAvailable configurations: #{configurations.sort.join(', ')}"
+  exit 1
+end
+
+if !configurations.include?(options[:configuration])
+  puts "Invalid configuration provided: #{options[:configuration]}.\nAvailable configurations: #{configurations.inspect}"
+  exit 1
+end
+
+begin
+  require 'indocker'
+rescue LoadError
+  puts "InDocker has been moved into a separate gem. Please install using `gem install indocker`"
+  exit 1
+end
+
+if options[:debug]
+  Indocker.set_log_level(Logger::DEBUG)
+else
+  Indocker.set_log_level(Logger::INFO)
+end
+
+Indocker.set_configuration_name(options[:configuration])
+require_relative '../../setup'
+
+
+Indocker.run(options[:container], options[:force_restart])

data/example/indocker/bin/utils/configurations.rb

@@ -0,0 +1,3 @@
+def list_configurations(configurations_dir)
+  Dir[File.join(configurations_dir, '**/*.rb')].map {|c| c.split('/').last.gsub('.rb', '')}
+end

data/example/indocker/bounded_contexts/shared/ruby/Dockerfile

@@ -0,0 +1,10 @@
+FROM ruby:2.5.0
+
+RUN dpkg --add-architecture i386 \
+  && apt-get update \
+  && apt-get install vim curl -y \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir /app
+WORKDIR /app

data/example/indocker/bounded_contexts/shared/ruby/container.rb

@@ -0,0 +1,5 @@
+Indocker
+  .define_container(:ruby)
+  .tags('ruby', 'console=true')
+  .image(:ruby)
+  .networks(:app_net)

data/example/indocker/bounded_contexts/shared/ruby/image.rb

@@ -0,0 +1,3 @@
+Indocker
+  .define_image(:ruby)
+  .registry(:default)

data/example/indocker/configurations/dev.rb

@@ -0,0 +1,9 @@
+Indocker
+  .build_configuration(:dev)
+  .use_registry(:dev, as: :default)
+  .use_build_server(:local_bs)
+  .enabled_containers(
+    ruby: {
+      servers: [:localhost],
+    }
+  )

data/example/indocker/infrastructure/build_servers.rb

@@ -0,0 +1,8 @@
+Indocker.add_build_server(
+  Indocker::BuildServer.new(
+    name: :local_bs,
+    host: 'localhost',
+    user: `whoami`.strip,
+    port: 22
+  )
+)

data/example/indocker/infrastructure/networks.rb

@@ -0,0 +1 @@
+Indocker.define_network(:app_net)

data/example/indocker/infrastructure/registries.rb

@@ -0,0 +1,3 @@
+Indocker.add_registry(
+  Indocker::Registries::Local.new(:dev)
+)

data/example/indocker/infrastructure/servers.rb

@@ -0,0 +1,8 @@
+Indocker.add_server(
+  Indocker::Server.new(
+    name: :localhost,
+    host: 'localhost',
+    user: `whoami`.strip,
+    port: 22
+  )
+)

data/example/indocker/setup.rb

@@ -0,0 +1,24 @@
+require 'indocker'
+
+root_dir = File.join(__dir__, '..', '..')
+
+Indocker.set_root_dir(__dir__)
+Indocker.set_deploy_dir(File.join(root_dir, 'tmp', 'deployment'))
+
+Indocker.set_dockerignore [
+  'Dockerfile',
+  '.DS_Store',
+  '**/.DS_Store',
+  '**/*.log',
+  '.vscode',
+  'tmp',
+]
+
+require_relative 'infrastructure/registries'
+require_relative 'infrastructure/servers'
+require_relative 'infrastructure/build_servers'
+require_relative 'infrastructure/networks'
+
+Indocker.set_bounded_contexts_dir(File.join(__dir__, 'bounded_contexts'))
+
+require_relative "configurations/#{Indocker.configuration_name}"

data/indocker.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "net-ssh"
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/indocker/configuration_deployer.rb

@@ -67,13 +67,15 @@ class Indocker::ConfigurationDeployer
       )
 
       remote_operations = sync_indocker(servers)
+      wait_remote_operations(remote_operations)
 
+      remote_operations = sync_env_files(deploy_servers, configuration.env_files)
       wait_remote_operations(remote_operations)
 
-      remote_operations += sync_env_files(deploy_servers, configuration.env_files)
-      remote_operations += pull_repositories(clonner, build_servers, configuration.repositories)
-      remote_operations += sync_artifacts(clonner, configuration.artifact_servers)
+      remote_operations = pull_repositories(clonner, build_servers, configuration.repositories)
+      wait_remote_operations(remote_operations)
 
+      remote_operations = sync_artifacts(clonner, configuration.artifact_servers)
       wait_remote_operations(remote_operations)
 
       update_crontab_redeploy_rules(configuration, build_servers.first)
@@ -380,33 +382,35 @@ class Indocker::ConfigurationDeployer
         @progress.start_syncing_artifact(server, artifact)
 
         thread = Thread.new do
-          session = Indocker::SshSession.new(
-            host: server.host,
-            user: server.user,
-            port: server.port,
-            logger: @logger
-          )
+          server.synchronize do
+            session = Indocker::SshSession.new(
+              host: server.host,
+              user: server.user,
+              port: server.port,
+              logger: @logger
+            )
 
-          @logger.info("Pulling git artifact  #{artifact.name.to_s.green} for #{server.user}@#{server.host}")
-          result = clonner.clone(session, artifact.repository)
+            @logger.info("Pulling git artifact  #{artifact.name.to_s.green} for #{server.user}@#{server.host}")
+            result = clonner.clone(session, artifact.repository)
 
-          if result.exit_code != 0
-            @logger.error("Artifact repository :#{artifact.repository.name} was not clonned")
-            @logger.error(result.stderr_data)
-            exit 1
-          end
+            if result.exit_code != 0
+              @logger.error("Artifact repository :#{artifact.repository.name} was not clonned")
+              @logger.error(result.stderr_data)
+              exit 1
+            end
 
-          source_path = File.join(artifact.repository.clone_path, artifact.source_path)
-          result = session.exec!("mkdir -p #{artifact.target_path}")
-          result = session.exec!("cp -r #{source_path} #{artifact.target_path}")
+            source_path = File.join(artifact.repository.clone_path, artifact.source_path)
+            result = session.exec!("mkdir -p #{artifact.target_path}")
+            result = session.exec!("cp -r #{source_path} #{artifact.target_path}")
 
-          if !result.success?
-            @logger.error(result.stdout_data)
-            @logger.error(result.stderr_data)
-            exit 1
-          end
+            if !result.success?
+              @logger.error(result.stdout_data)
+              @logger.error(result.stderr_data)
+              exit 1
+            end
 
-          @progress.finish_syncing_artifact(server, artifact)
+            @progress.finish_syncing_artifact(server, artifact)
+          end
         end
 
         RemoteOperation.new(thread, server, :artifact_sync)

data/lib/indocker/context_args.rb

@@ -14,9 +14,8 @@ class Indocker::ContextArgs
     end
 
     value = @context_args.fetch(name) do
-      Indocker.logger.error("build arg '#{format_arg(name)}' is not defined#{@container ? " for container :#{@container.name}" : ""}")
-      Indocker.logger.error("available args: #{@context_args.inspect}")
-      exit 1
+      Indocker.logger.warn("build arg '#{format_arg(name)}' is not defined#{@container ? " for container :#{@container.name}" : ""}")
+      Indocker.logger.warn("available args: #{@context_args.inspect}")
     end
 
     if value.is_a?(Hash)

data/lib/indocker/docker_run_args.rb

@@ -60,6 +60,14 @@ class Indocker::DockerRunArgs
         end
       end
 
+      sysctl = container.get_start_option(:sysctl)
+      
+      if sysctl
+        Array(sysctl).each do |val|
+          args.push("--sysctl #{val}")
+        end
+      end
+
       if container.is_daemonized?
         args.push("--detach")
       end

data/lib/indocker/repositories/clonner.rb

@@ -10,6 +10,8 @@ class Indocker::Repositories::Clonner
     raise ArgumenError.new("only git repositories should be clonned") if !repository.is_git?
 
     session.exec!("rm -rf #{repository.clone_path} && mkdir -p #{repository.clone_path}")
-    session.exec!("git clone -b #{repository.branch} --depth 1 #{repository.remote_url} #{repository.clone_path}")
+    
+    git_command = "git clone -b #{repository.branch} --depth 1 #{repository.remote_url} #{repository.clone_path}"
+    session.exec!("ssh-agent bash -c 'ssh-add ~/.ssh/#{repository.ssh_key}; #{git_command}'")
   end
 end

data/lib/indocker/repositories/git.rb

@@ -1,13 +1,16 @@
 class Indocker::Repositories::Git < Indocker::Repositories::Abstract
-  attr_reader :remote_url, :remote_name, :email, :password, :branch
+  attr_reader :remote_url, :remote_name, :email, :password, :branch, :ssh_key
 
-  def setup(remote_name:, remote_url:, email: nil, password: nil, branch:, clone_path: nil)
+  DEFAULT_SSH_KEY = "id_rsa"
+
+  def setup(remote_name:, remote_url:, email: nil, password: nil, branch:, clone_path: nil, ssh_key: DEFAULT_SSH_KEY)
     @remote_name = remote_name
     @remote_url = remote_url
     @email = email
     @password = password
     @branch = branch
     @clone_path = clone_path
+    @ssh_key = ssh_key
     self
   end
 

data/lib/indocker/server.rb

@@ -17,4 +17,14 @@ class Indocker::Server
       super
     end
   end
+
+  def synchronize(&block)
+    semaphore.synchronize do
+      block.call if block_given?
+    end
+  end
+
+  def semaphore
+    @semaphore ||= Mutex.new
+  end
 end

data/lib/indocker/version.rb

@@ -1,3 +1,3 @@
 module Indocker
-  VERSION = "0.1.1"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,16 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 - Iskander Khaziev
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +84,19 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- example/indocker/bin/deploy
+- example/indocker/bin/remote/compile
+- example/indocker/bin/remote/run
+- example/indocker/bin/utils/configurations.rb
+- example/indocker/bounded_contexts/shared/ruby/Dockerfile
+- example/indocker/bounded_contexts/shared/ruby/container.rb
+- example/indocker/bounded_contexts/shared/ruby/image.rb
+- example/indocker/configurations/dev.rb
+- example/indocker/infrastructure/build_servers.rb
+- example/indocker/infrastructure/networks.rb
+- example/indocker/infrastructure/registries.rb
+- example/indocker/infrastructure/servers.rb
+- example/indocker/setup.rb
 - indocker.gemspec
 - lib/indocker.rb
 - lib/indocker/artifacts/git.rb
@@ -132,7 +159,7 @@ homepage: https://github.com/ArtStation/indocker
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,8 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Docker Containers Deployment
 test_files: []