takelage 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c97cc9d492c1532db93e5090ebf54357a46bf74ffa17f9ad55ad90d8a4595032
-  data.tar.gz: 59bca9e854ffe6441cfb80abf847c97b16390b86fef6c74d13aa6a6adfd5b66d
+  metadata.gz: f056ac86a2b967f091ead1e03112a8e3b18bef868564d4ae21a9038835441c57
+  data.tar.gz: 552f4ca19930fb953845fe11b52e0cff28b48e6c9ec6df15579511514ff8984f
 SHA512:
-  metadata.gz: ce47bc65c2f5c45685eafb643b30461562d3c24993378332f9d45a9fb590f106dab71d090ac4180ee5ac7fadb1574cd70e44ec37023cdcee275a9dd455ccd5ad
-  data.tar.gz: 217ac20d55861f557a4df55304f0888fa7bb58a773400f912405d0c48c9aee5db0cf300fa0da3187d19de513ea7ea13169daa57c7676ff1bc41985db817ce299
+  metadata.gz: bb22fb45d69ba4bba30b323f89d8c18cb127a8bce24fa334c71b2f91510ab12c28b73b26ce1ab351f8640af0add7d7dbe3bf1f3fcfc815980d29c8ff05e2446c
+  data.tar.gz: 15ec0e60da02d0e6152fe63ab55d17c31604db0dcbfd5f547da52733576f26d3577486dac07a3468219a1f76484985232fcecb09f3d187aa6ba41760606652e3

data/lib/takelage/default.yml

@@ -38,6 +38,7 @@ cmd_docker_container_stop_container: 'docker stop %{container}'
 cmd_docker_image_tag_check_local_docker_images: 'docker images --quiet %{image}'
 cmd_docker_image_tag_list_local_docker_images: 'docker images %{docker_user}\/%{docker_repo} --format "{{.Tag}}"'
 cmd_docker_image_update_docker_pull_latest: 'docker pull %{docker_user}/%{docker_repo}:%{tag_latest_remote}'
+cmd_docker_image_update_docker_remove_dangling: 'docker image prune --force'
 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_start: 'sudo socat TCP-LISTEN:%{port},bind=%{host},reuseaddr,fork UNIX-CLIENT:%{path}'

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

@@ -62,7 +62,8 @@ module DockerContainerModule
 
     return false unless docker_check_running
 
-    if ENV['HOSTNAME'].start_with? "#{@docker_repo}_"
+    hostname = ENV['HOSTNAME'] || ''
+    if hostname.start_with? "#{@docker_repo}_"
       log.error "Please run \"tau nuke\" outside of #{@docker_repo} containers"
       log.info "Run \"tau purge\" to remove orphaned #{@docker_repo} containers"
       return false

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

@@ -5,35 +5,24 @@ module DockerImageModule
   def docker_image_update
     return false unless docker_check_running
 
-    tag_latest_remote = docker_image_tag_latest_remote
+    tags_remote = docker_image_tag_list_remote
 
-    if tag_latest_remote.to_s.strip.empty?
-      log.error "Unable to get latest remote tag"
-      return false
+    if tags_remote.include? 'latest'
+      tag = 'latest'
+    else
+      tag = docker_image_tag_latest_remote
     end
 
-    tag_latest_local = docker_image_tag_latest_local
-
-    unless tag_latest_local.to_s.strip.empty?
-      begin
-        if Gem::Version.new(tag_latest_local) >= Gem::Version.new(tag_latest_remote)
-          log.info 'Already up to date.'
-          return true
-        end
-      rescue ArgumentError
-        log.debug "Cannot compare \"#{tag_latest_local}\" and \"#{tag_latest_remote}\""
-      end
-    end
-
-    log.info "Updating to docker image \"#{@docker_user}/#{@docker_repo}:#{tag_latest_remote}\""
-
     cmd_docker_pull_latest =
         config.active['cmd_docker_image_update_docker_pull_latest'] % {
             docker_user: @docker_user,
             docker_repo: @docker_repo,
-            tag_latest_remote: tag_latest_remote
+            tag_latest_remote: tag
         }
 
-    run_and_exit cmd_docker_pull_latest
+    cmd_docker_remove_dangling =
+        config.active['cmd_docker_image_update_docker_remove_dangling']
+
+    run_and_exit "#{cmd_docker_pull_latest} && #{cmd_docker_remove_dangling}"
   end
-end
+end

data/lib/takelage/version

@@ -1 +1 @@
-0.12.0
+0.12.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Geospin