takelage 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab8abe1d25c97442acec36bb9ab580d2c49efb64572ececd587f4caa7ab30892
-  data.tar.gz: 49253eba927e0091bcc151d6f20424df56436df23c97669f18654202a7d40257
+  metadata.gz: 8addb80341d57218461d5625ae970eadf0999a62f90751856ce8c7be3c5ae0f4
+  data.tar.gz: 4f04e5223e1d79ea612018d61cc541a965cb65806133db9e233d31133791ed16
 SHA512:
-  metadata.gz: e8c69a6cbe268b971f2eb07b786cf3b6f4ea8d333dd0e8c047bbdc5394727fc3a6e3b35cbb03bac3676c3b1ce5d4eda64d71c990ffff2d49c43d95967d4cdd8d
-  data.tar.gz: f643e564fe3db829fad180f9948cc2381782c5410efa9d2386e05f7bc9cc0d45ff50ff24c7a4586a838e8f3e6c369eac445a2aa6db4bb97609371347060d8bdd
+  metadata.gz: 4e90bb0a41ab5642afed06094fa6d70038651701778dcc91a41d3f7fa6ece70e60f42860dd50778b049cf11bb5b4b34f40471934e36c47b851501cf081f5c722
+  data.tar.gz: caefc99ff51fa28769d6801347cccc320ceb5434573013dca2c0638749d8a548f54c0f585513b24dcb90decf4f7d674c4917aa642710fb4e0b5925d2b60d7be8

data/README.md

@@ -53,19 +53,20 @@ tau [bit clipboard paste](features/takelage/bit/bit.clipboard.paste.feature) [CO
 tau [bit clipboard pull](features/takelage/bit/bit.clipboard.pull.feature) | Pull all updates for bit components from bit remote scopes
 tau [bit clipboard push](features/takelage/bit/bit.clipboard.push.feature) | Push all updates of bit components to bit remote scopes
 tau [bit scope add](features/takelage/bit/bit.scope.add.feature) [SCOPE] | Add a bit [SCOPE]
-tau [bit scope list](features/takelage/bit/bit.scope.list.feature) | List bit remote scopes
 tau [bit scope inbit](features/takelage/bit/bit.scope.inbit.feature) | Log in to bit remote server
+tau [bit scope list](features/takelage/bit/bit.scope.list.feature) | List bit remote scopes
 tau [bit scope new](features/takelage/bit/bit.scope.new.feature) [SCOPE] | Init a new bit [SCOPE]
 tau [completion bash](features/takelage/completion/completion.bash.feature) | Print bash completion code
 tau [docker check running](features/takelage/docker/docker.check.running.feature) | Check if docker daemon is running
 tau [docker container check existing](features/takelage/docker/docker.container.check.existing.feature) [CONTAINER] | Check if docker [CONTAINER] is existing
-tau [docker container check orphaned](features/takelage/docker/docker.container.check.orphaned.feature) [CONTAINER] | Check if docker [CONTAINER] is orphaned
 tau [docker container check network](features/takelage/docker/docker.container.check.network.feature) [NETWORK] | Check if docker [NETWORK] is existing
+tau [docker container check orphaned](features/takelage/docker/docker.container.check.orphaned.feature) [CONTAINER] | Check if docker [CONTAINER] is orphaned
 tau [docker container command](features/takelage/docker/docker.container.command.feature) [CMD] | Run [CMD] in a docker container
 tau [docker container daemon](features/takelage/docker/docker.container.daemon.feature) | Run docker container in daemon mode
 tau [docker container login](features/takelage/docker/docker.container.login.feature) | Log in to latest local docker container
 tau [docker container nuke](features/takelage/docker/docker.container.nuke.feature) | Remove all docker containers
 tau [docker container purge](features/takelage/docker/docker.container.purge.feature) | Remove orphaned docker containers
+tau [docker image check outdated](features/takelage/docker/docker.image.check.outdated.feature) | Check if a docker image is outdated
 tau [docker image tag check local](features/takelage/docker/docker.image.tag.check.local.feature) [TAG] | Check if local docker image [TAG] exists
 tau [docker image tag check remote](features/takelage/docker/docker.image.tag.check.remote.feature) [TAG] | Check if remote docker image [TAG] exists
 tau [docker image tag latest local](features/takelage/docker/docker.image.tag.latest.local.feature) | Print latest local docker image tag
@@ -73,14 +74,16 @@ tau [docker image tag latest remote](features/takelage/docker/docker.image.tag.l
 tau [docker image tag list local](features/takelage/docker/docker.image.tag.list.local.feature) | Print local docker image tags
 tau [docker image tag list remote](features/takelage/docker/docker.image.tag.list.remote.feature) | Print remote docker image tags
 tau [docker image update](features/takelage/docker/docker.image.update.feature) | Get latest remote docker container
+tau [docker socket host](features/takelage/docker/docker.socket.host.feature) | Print docker socket host ip address
+tau [docker socket scheme](features/takelage/docker/docker.socket.scheme.feature) | Print docker socket scheme
 tau [docker socket start](features/takelage/docker/docker.socket.start.feature) | Start sockets for docker container
 tau [docker socket stop](features/takelage/docker/docker.socket.stop.feature) | Stop sockets for docker container
 tau [git check clean](features/takelage/git/git.check.clean.feature) | Check if the git workspace is clean
 tau [git check master](features/takelage/git/git.check.master.feature) | Check if we are on the git master branch
 tau [git check workspace](features/takelage/git/git.check.workspace.feature) | Check if a git workspace exists
 tau [info project active](features/takelage/info/info.project.active.feature) | Print active project info
-tau [info project private](features/takelage/info/info.project.private.feature) | Print private project info
 tau [info project main](features/takelage/info/info.project.main.feature) | Print main project info
+tau [info project private](features/takelage/info/info.project.private.feature) | Print private project info
 tau [self config active](features/takelage/self/self.config.active.feature) | Print active takelage configuration
 tau [self config default](features/takelage/self/self.config.default.feature) | Print takelage default configuration
 tau [self config home](features/takelage/self/self.config.home.feature) | Print takelage home config file configuration

data/lib/takelage/default.yml

@@ -23,7 +23,7 @@ cmd_docker_check_running_docker_info: 'docker info'
 cmd_docker_container_check_existing_docker_ps: 'docker ps --filter name=^%{container}$ --quiet'
 cmd_docker_container_check_network_docker_network: 'docker network ls --quiet --filter name=^%{network}$'
 cmd_docker_container_check_orphaned_docker_exec: 'docker exec --interactive %{container} ps a'
-cmd_docker_container_create: 'docker run --detach --env GOOGLE_APPLICATION_CREDENTIALS=/srv/google/default.json --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}/.config/gcloud:/srv/gcloud --volume %{homedir}/.google:/srv/google --volume %{homedir}:/homedir --volume %{workdir}:/project %{volume_dev} --workdir /project %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} %{entrypoint_options}'
+cmd_docker_container_create: 'docker run %{addhost} --detach --env GOOGLE_APPLICATION_CREDENTIALS=/srv/google/default.json --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}/.config/gcloud:/srv/gcloud --volume %{homedir}/.google:/srv/google --volume %{homedir}:/homedir --volume %{workdir}:/project %{volume_dev} --workdir /project %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} %{entrypoint_options}'
 cmd_docker_container_create_network: 'docker network create %{network}'
 cmd_docker_container_enter_container: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
 cmd_docker_container_get_container_name: 'docker ps --filter id=%{container} --format "{{.Names}}"'
@@ -36,8 +36,9 @@ cmd_docker_image_tag_list_local_docker_images: 'docker images %{docker_user}\/%{
 cmd_docker_image_update_docker_pull_latest: 'docker pull %{docker_user}/%{docker_repo}:%{tag_latest_remote}'
 cmd_docker_socket_stop_docker_socket_ps: 'sudo ps a -o pid,command'
 cmd_docker_socket_stop_docker_socket_kill: 'sudo kill -SIGTERM %{pid}'
-cmd_docker_socket_get_socket_socat: 'sudo socat TCP-LISTEN:%{port},bind=%{host},reuseaddr,fork UNIX-CLIENT:%{path}'
-cmd_docker_socket_get_socket_gpgconf: 'gpgconf --list-dirs'
+cmd_docker_socket_get_start: 'sudo socat TCP-LISTEN:%{port},bind=%{host},reuseaddr,fork UNIX-CLIENT:%{path}'
+cmd_docker_socket_config_agent_socket_path: 'gpgconf --list-dirs agent-socket'
+cmd_docker_socket_config_agent_ssh_socket_path: 'gpgconf --list-dirs agent-ssh-socket'
 cmd_docker_socket_start_sudo_true: 'sudo true'
 cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
 cmd_git_check_clean_git_uncommitted: 'git diff --cached --exit-code'
@@ -49,10 +50,8 @@ docker_debug: 'ansible/roles/takel-takelage/files/pyscripts'
 docker_entrypoint_options: ''
 docker_registry: 'https://registry.hub.docker.com'
 docker_repo: 'takelage'
-docker_socket_agent_port: 20000
-docker_socket_agent_ssh_port: 20001
-docker_socket_agent_extra_port: 20002
-docker_socket_agent_browser_port: 20003
+docker_socket_agent_socket_port: 20000
+docker_socket_agent_ssh_socket_port: 20001
 docker_tag: 'latest'
 docker_user: 'takelage'
 info_project_main: 'project.yml'

data/lib/takelage/docker/container/cli.rb

@@ -12,9 +12,10 @@ module Takelage
     include DockerImageTagLatestModule
     include DockerImageTagListModule
     include DockerImageTagCheckModule
+    include DockerImageCheckModule
     include DockerSocketModule
 
-    # Initialize takelage docker container
+    # Initialize docker container
     def initialize(args=[], local_options={}, configuration={})
 
       # initialize thor parent class
@@ -40,24 +41,8 @@ module Takelage
 
       @timezone = 'Europe/Berlin'
 
-      @sockets = {
-          :'agent-socket' => {
-              :path => nil,
-              :host => '127.0.0.1',
-              :port => config.active['docker_socket_agent_port']},
-          :'agent-ssh-socket' => {
-              :path => nil,
-              :host => '127.0.0.1',
-              :port => config.active['docker_socket_agent_ssh_port']},
-          :'agent-extra-socket' => {
-              :path => nil,
-              :host => '127.0.0.1',
-              :port => config.active['docker_socket_agent_extra_port']},
-          :'agent-browser-socket' => {
-              :path => nil,
-              :host => '127.0.0.1',
-              :port => config.active['docker_socket_agent_browser_port']}}
-      _get_socket_paths
+      @socket_host = docker_socket_host
+      @sockets = docker_socket_scheme
     end
 
     desc 'check [COMMAND]', 'Check docker container'

data/lib/takelage/docker/container/module.rb

@@ -30,6 +30,15 @@ module DockerContainerModule
 
     return false unless docker_check_running
 
+    unless @docker_tag == 'latest'
+      outdated = docker_image_check_outdated @docker_tag
+      if outdated
+        tag_latest_remote = docker_image_tag_latest_remote
+        say "Your takelage version \"#{@docker_tag}\" is outdated"
+        say "A new takelage version \"#{tag_latest_remote}\" is available"
+      end
+    end
+
     docker_socket_start
 
     _create_network @hostname unless docker_container_check_network @hostname
@@ -96,6 +105,10 @@ module DockerContainerModule
       return false
     end
 
+    unless @socket_host == '127.0.0.1'
+      addhost = "--add-host host.docker.internal:#{@socket_host}"
+    end
+
     entrypoint = '/entrypoint.py '
     volume_dev = ''
     if options[:development]
@@ -105,6 +118,7 @@ module DockerContainerModule
 
     cmd_docker_create =
         config.active['cmd_docker_container_create'] % {
+            addhost: addhost,
             workdir: @workdir,
             timezone: @timezone,
             container: container,

data/lib/takelage/docker/image/check/cli.rb

@@ -0,0 +1,40 @@
+module Takelage
+
+  # takelage docker image check
+  class DockerImageCheck < SubCommandBase
+
+    include LoggingModule
+    include SystemModule
+    include ConfigModule
+    include DockerCheckModule
+    include DockerImageTagListModule
+    include DockerImageTagLatestModule
+    include DockerImageCheckModule
+
+    # Initialize takelage docker image check
+    def initialize(args = [], local_options = {}, configuration = {})
+
+      # initialize thor parent class
+      super args, local_options, configuration
+
+      @docker_user = config.active['docker_user']
+      @docker_repo = config.active['docker_repo']
+      @docker_registry = config.active['docker_registry']
+      @docker_tag = config.active['docker_tag']
+    end
+
+    #
+    # docker image check outdated
+    #
+    desc 'outdated', 'Check if a docker image is outdated'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Check if a docker image is outdated
+    LONGDESC
+    # Check if a docker image is outdated.
+    def outdated
+      outdated = docker_image_check_outdated @docker_tag
+      say "Your takelage version \"#{@docker_tag}\" is outdated" if outdated
+      exit outdated
+    end
+  end
+end

data/lib/takelage/docker/image/check/module.rb

@@ -0,0 +1,27 @@
+# takelage docker image check module
+module DockerImageCheckModule
+
+  # Backend method for docker image check outdated.
+  # @return [Boolean] is docker image tag older than latest remote docker image tag?
+  def docker_image_check_outdated(tag)
+    log.debug "Check if docker image version \"#{tag}\" is outdated"
+
+    return false unless docker_check_running
+
+    if tag == 'latest'
+      log.debug "Docker image version \"latest\" is by definition never outdated"
+      return false
+    end
+
+    tag_latest_remote = docker_image_tag_latest_remote
+    tags = [tag, tag_latest_remote]
+    outdated = tag != VersionSorter.sort(tags).last
+
+    if outdated
+      "Docker image version \"#{tag}\" is outdated"
+      "Docker image version \"#{tag_latest_remote}\" is available"
+    end
+
+    outdated
+  end
+end

data/lib/takelage/docker/image/cli.rb

@@ -22,6 +22,9 @@ module Takelage
       @docker_registry = config.active['docker_registry']
     end
 
+    desc 'check [COMMAND]', 'Check docker image'
+    subcommand 'check', DockerImageCheck
+
     desc 'tag [COMMAND]', 'Handle docker image tags'
     subcommand 'tag', DockerImageTag
 

data/lib/takelage/docker/socket/cli.rb

@@ -4,8 +4,8 @@ module Takelage
   class DockerSocket < SubCommandBase
 
     include LoggingModule
-    include ConfigModule
     include SystemModule
+    include ConfigModule
     include DockerCheckModule
     include DockerSocketModule
 
@@ -15,24 +15,34 @@ module Takelage
       # initialize thor parent class
       super args, local_options, configuration
 
-      @sockets = {
-          :'agent-socket' => {
-              :path => nil,
-              :host => '127.0.0.1',
-              :port => config.active['docker_socket_agent_port']},
-          :'agent-ssh-socket' => {
-              :path => nil,
-              :host => '127.0.0.1',
-              :port => config.active['docker_socket_agent_ssh_port']},
-          :'agent-extra-socket' => {
-              :path => nil,
-              :host => '127.0.0.1',
-              :port => config.active['docker_socket_agent_extra_port']},
-          :'agent-browser-socket' => {
-              :path => nil,
-              :host => '127.0.0.1',
-              :port => config.active['docker_socket_agent_browser_port']}}
-      _get_socket_paths
+      @socket_host = docker_socket_host
+      @sockets = docker_socket_scheme
+    end
+
+    #
+    # docker socket host
+    #
+    desc 'host', 'Print docker socket host ip address'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Print docker socket host ip address
+    LONGDESC
+    # Print docker socket host ip address.
+    def host
+      say @socket_host
+      true
+    end
+
+    #
+    # docker socket scheme
+    #
+    desc 'scheme', 'Print docker socket scheme'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Print docker socket scheme
+    LONGDESC
+    # Print docker socket scheme.
+    def scheme
+      say hash_to_yaml(@sockets)
+      true
     end
 
     #

data/lib/takelage/docker/socket/module.rb

@@ -1,6 +1,67 @@
 # takelage docker socket module
 module DockerSocketModule
 
+  # Backend method for docker socket scheme.
+  def docker_socket_scheme
+    log.debug 'Getting docker socket scheme'
+
+    cmd_agent_socket_path =
+        config.active['cmd_docker_socket_config_agent_socket_path']
+
+    agent_socket_path = run cmd_agent_socket_path
+    agent_socket_path.chomp!
+
+    agent_socket_port =
+        config.active['docker_socket_agent_socket_port']
+
+    cmd_agent_ssh_socket_path =
+        config.active['cmd_docker_socket_config_agent_ssh_socket_path']
+
+    agent_ssh_socket_path = run cmd_agent_ssh_socket_path
+    agent_ssh_socket_path.chomp!
+
+    agent_ssh_socket_port =
+        config.active['docker_socket_agent_ssh_socket_port']
+
+    socket_scheme = {
+        'agent-socket' => {
+            'path' => agent_socket_path,
+            'host' => @socket_host,
+            'port' => agent_socket_port
+        },
+        'agent-ssh-socket' => {
+            'path' => agent_ssh_socket_path,
+            'host' => @socket_host,
+            'port' => agent_ssh_socket_port
+        }
+    }
+
+    log.debug "Docker socket scheme is \n\"\"\"\n#{hash_to_yaml socket_scheme}\"\"\""
+
+    socket_scheme
+  end
+
+  # Backend method for docker socket host.
+  def docker_socket_host
+    log.debug 'Getting docker socket host ip address'
+
+    socket_host = '127.0.0.1'
+
+    addr_infos = Socket.getifaddrs
+
+    # if interface docker0 exists (== linux host)
+    # then return the ip address
+    addr_infos.each do |addr_info|
+      if addr_info.name == 'docker0'
+        socket_host = addr_info.addr.ip_address if addr_info.addr.ipv4?
+      end
+    end
+
+    log.debug "Docker socket host ip address is \"#{socket_host}\""
+
+    socket_host
+  end
+
   # Backend method for docker socket start.
   def docker_socket_start
     log.debug 'Starting sockets for docker container'
@@ -76,11 +137,11 @@ module DockerSocketModule
     # loop over sockets
     @sockets.each do |socket, socket_config|
       cmd_start_socket =
-          config.active['cmd_docker_socket_get_socket_socat'] % {
-          host: socket_config[:host],
-          port: socket_config[:port],
-          path: socket_config[:path],
-      }
+          config.active['cmd_docker_socket_get_start'] % {
+              port: socket_config['port'],
+              host: socket_config['host'],
+              path: socket_config['path'],
+          }
 
       if sockets_up
         if _socket_up? socket, socket_config
@@ -96,29 +157,12 @@ module DockerSocketModule
     cmds_start_socket
   end
 
-  # get socket paths
-  def _get_socket_paths
-    cmd_gpgconf_listdirs =
-        config.active['cmd_docker_socket_get_socket_gpgconf']
-
-    stdout_str = run cmd_gpgconf_listdirs
-
-    stdout_str.split(/\n+/).each do |gpg_path|
-      @sockets.each do |socket, socket_config|
-        gpg_socket = gpg_path.split(':')
-        if gpg_socket[0] == socket.to_s
-          @sockets[socket][:path] = gpg_socket[1]
-        end
-      end
-    end
-  end
-
   # check if a socket is available
   # but trying to connect to it via TCP
   def _socket_up? socket, socket_config
-    host = socket_config[:host]
-    port = socket_config[:port]
-    path = socket_config[:path]
+    host = socket_config['host']
+    port = socket_config['port']
+    path = socket_config['path']
 
     error_message = "failed to connect to " +
         "socket \"#{socket}\" " +

data/lib/takelage/lib/system.rb

@@ -11,7 +11,7 @@ module SystemModule
     if hash == {}
       return nil.to_yaml
     end
-    return hash.to_yaml(options = {:line_width => -1})
+    hash.to_yaml(options = {:line_width => -1})
   end
 
   # @return [Hash] content of yaml file

data/lib/takelage/version

@@ -1 +1 @@
-0.10.0
+0.11.0

data/lib/takelage.rb

@@ -39,6 +39,8 @@ require_relative 'takelage/docker/image/tag/latest/cli'
 require_relative 'takelage/docker/image/tag/check/module'
 require_relative 'takelage/docker/image/tag/check/cli'
 require_relative 'takelage/docker/image/tag/cli'
+require_relative 'takelage/docker/image/check/module'
+require_relative 'takelage/docker/image/check/cli'
 require_relative 'takelage/docker/image/module'
 require_relative 'takelage/docker/image/cli'
 require_relative 'takelage/docker/container/check/module'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Geospin
@@ -221,6 +221,8 @@ files:
 - lib/takelage/docker/container/check/module.rb
 - lib/takelage/docker/container/cli.rb
 - lib/takelage/docker/container/module.rb
+- lib/takelage/docker/image/check/cli.rb
+- lib/takelage/docker/image/check/module.rb
 - lib/takelage/docker/image/cli.rb
 - lib/takelage/docker/image/module.rb
 - lib/takelage/docker/image/tag/check/cli.rb