takelage 0.17.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7143b5ce147127b3a0cf4ebf69dcb673e0e031fd163c3992fa602a5d03293b3
-  data.tar.gz: 545368ec9301049e782727636a3fd281c332d190990337b989ea652a1b8e58ec
+  metadata.gz: 58c7e30c19e8a11de8ad95a88ed10b273a0266205de6eef10601331b5f6f2e99
+  data.tar.gz: 3b45502b409d12f35aabbbb0cae6cdbd33ff108f245fa9a01c1c6c5acd3e04cd
 SHA512:
-  metadata.gz: eaad0481173e35a0146e02c69929938331d23527e1c1fb809d8df214b51f8d319e272d7ae2efda2017bd113e4bc6b15ea73b89aac48523b04fc8456e2ef25634
-  data.tar.gz: d35e4e3fa76dd58740f719e5ac7aad48ae27d1094becfbffefffdc6188fa1ab141c0d5a0392e3a58dcafa190d5e65063e1d160756a9f696e2cd8b70bb2065bd8
+  metadata.gz: 7c23d454347c4983a240601f744198709cb7368edaa5baccddcc0f483ef1cd9aef1f9e04f338420764f5337fba84b181cfb95cccc222e6190fa50ae87789e7a4
+  data.tar.gz: 4a44ee37503a14484500b84bedf50597e966d084f9925886ba3af8eb0577c4d1313f939f54fb07feb89468e604c696fb65a0ea534f2d35e9f05aff82f867ffcd

data/lib/takelage/default.yml

@@ -28,7 +28,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 TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --shm-size %{shmsize} --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{addhost} %{dockerrun_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --gpg_agent_port %{gpg_agent_port} --gpg_ssh_agent_port %{gpg_ssh_agent_port} --extra=%{extra} %{entrypoint_options}'
+cmd_docker_container_create: 'docker run --detach --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --shm-size %{shmsize} --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{addhost} %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --gpg_agent_port %{gpg_agent_port} --gpg_ssh_agent_port %{gpg_ssh_agent_port} --extra=%{extra} %{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}}"'

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

@@ -46,6 +46,18 @@ module Takelage
     desc 'check [COMMAND]', 'Check docker container'
     subcommand 'check', DockerContainerCheck
 
+    #
+    # docker container clean
+    #
+    desc 'clean', 'Remove all docker containers'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Remove all docker containers
+    LONGDESC
+    # Remove all docker containers.
+    def clean
+      docker_container_clean
+    end
+
     #
     # docker container command
     #
@@ -87,18 +99,6 @@ module Takelage
       docker_container_login
     end
 
-    #
-    # docker container clean
-    #
-    desc 'clean', 'Remove all docker containers'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Remove all docker containers
-    LONGDESC
-    # Remove all docker containers.
-    def clean
-      docker_container_clean
-    end
-
     #
     # docker container prune
     #

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

@@ -2,6 +2,7 @@
 
 # takelage docker container lib
 # rubocop:disable Metrics/ModuleLength
+# rubocop:disable Style/IfUnlessModifier
 module DockerContainerLib
   private
 
@@ -55,6 +56,8 @@ module DockerContainerLib
   def _docker_container_lib_create_container(container)
     log.debug "Creating container \"#{container}\""
 
+    return false if _docker_container_lib_check_matrjoschka
+
     image = "#{@docker_user}/#{@docker_repo}:#{@docker_tag}"
 
     return false unless _docker_container_lib_image_available? image
@@ -77,7 +80,7 @@ module DockerContainerLib
       config.active['cmd_docker_container_create'],
       addhost: addhost,
       container: container,
-      dockerrun_options: config.active['docker_run_options'],
+      docker_run_options: config.active['docker_run_options'],
       dockersock: '/var/run/docker.sock',
       entrypoint: entrypoint,
       entrypoint_options: config.active['docker_entrypoint_options'],
@@ -100,6 +103,14 @@ module DockerContainerLib
   # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
+  # Check if we are already inside a takelage container
+  def _docker_container_lib_check_matrjoschka
+    return false unless ENV['HOSTNAME'].start_with? @docker_repo
+
+    log.error 'You cannot log in to takelage from within takelage'
+    false
+  end
+
   # Check if docker image is available
   def _docker_container_lib_image_available?(image)
     return true if docker_image_tag_list_local.include? @docker_tag
@@ -151,4 +162,5 @@ module DockerContainerLib
     run cmd_docker_stop
   end
 end
+# rubocop:enable Style/IfUnlessModifier
 # rubocop:enable Metrics/ModuleLength

data/lib/takelage/version

@@ -1 +1 @@
-0.17.0
+0.19.1

metadata

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