takelage 0.23.0 → 0.23.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/takelage.rb +4 -2
- data/lib/takelage/default.yml +2 -1
- data/lib/takelage/docker/check/cli.rb +18 -5
- data/lib/takelage/docker/check/{running.rb → daemon.rb} +3 -3
- data/lib/takelage/docker/check/socat.rb +23 -0
- data/lib/takelage/docker/container/check/cli.rb +2 -1
- data/lib/takelage/docker/container/check/existing.rb +1 -1
- data/lib/takelage/docker/container/check/network.rb +1 -1
- data/lib/takelage/docker/container/check/orphaned.rb +1 -1
- data/lib/takelage/docker/container/clean.rb +1 -1
- data/lib/takelage/docker/container/cli.rb +2 -1
- data/lib/takelage/docker/container/command.rb +1 -1
- data/lib/takelage/docker/container/daemon.rb +1 -1
- data/lib/takelage/docker/container/login.rb +1 -1
- data/lib/takelage/docker/container/prune.rb +1 -1
- data/lib/takelage/docker/image/cli.rb +1 -1
- data/lib/takelage/docker/image/tag/check.rb +1 -1
- data/lib/takelage/docker/image/tag/cli.rb +1 -1
- data/lib/takelage/docker/image/tag/latest.rb +1 -1
- data/lib/takelage/docker/image/update.rb +1 -1
- data/lib/takelage/docker/socket/cli.rb +2 -1
- data/lib/takelage/docker/socket/start.rb +3 -1
- data/lib/takelage/docker/socket/stop.rb +4 -3
- data/lib/takelage/version +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2d346e40e1123b0d3ab5c6934f2ff4f269348ed6ef96536c7c32bb6a41d41ae0
|
4
|
+
data.tar.gz: 52c40ad168244e782e68c3f177e6fedb2d570c4e665a74af0cbbe52eb4a28f8e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 95dad34c1553f33d38c7d3d9b2c2bf3c34a6d77739283ea601c1aa317c303dcd4d0d6399068486d783034ef2f9c5f1163b6c214d183acd7921b33c185fd0e853
|
7
|
+
data.tar.gz: e619aee9600ad197991ff80de7adc41fa7ceb0fdcebf1770800ee7b6decb2325e75209d21beec9b8f98b55f7d7e3722d3616660f64794419d2dba791f54099f7
|
data/lib/takelage.rb
CHANGED
@@ -43,7 +43,8 @@ require_relative 'takelage/bit/require/import'
|
|
43
43
|
require_relative 'takelage/bit/require/cli'
|
44
44
|
require_relative 'takelage/bit/cli'
|
45
45
|
require_relative 'takelage/completion/cli'
|
46
|
-
require_relative 'takelage/docker/check/
|
46
|
+
require_relative 'takelage/docker/check/daemon'
|
47
|
+
require_relative 'takelage/docker/check/socat'
|
47
48
|
require_relative 'takelage/docker/check/cli'
|
48
49
|
require_relative 'takelage/docker/socket/lib'
|
49
50
|
require_relative 'takelage/docker/socket/host'
|
@@ -107,8 +108,9 @@ module Takelage
|
|
107
108
|
# Initialize global singleton project
|
108
109
|
initialize_project
|
109
110
|
|
110
|
-
#
|
111
|
+
# Set defaults
|
111
112
|
@docker_daemon_running = false
|
113
|
+
@socat_command_available = false
|
112
114
|
|
113
115
|
# fylla bash completion code
|
114
116
|
@bash_fylla = Fylla.bash_completion self
|
data/lib/takelage/default.yml
CHANGED
@@ -29,7 +29,8 @@ cmd_bit_scope_add_scope: 'bit remote add %{remote}/%{scope}'
|
|
29
29
|
cmd_bit_scope_list_find_scopes: 'find -L %{root} -name scope.json'
|
30
30
|
cmd_bit_scope_new_bit_init: 'mkdir -p %{root}/%{scope} && cd %{root}/%{scope} && bit init --bare'
|
31
31
|
cmd_bit_scope_remove_scope: 'rm --force --recursive %{root}/%{scope}'
|
32
|
-
|
32
|
+
cmd_docker_check_daemon_docker_info: 'docker info'
|
33
|
+
cmd_docker_check_socat_socat_version: 'socat -V'
|
33
34
|
cmd_docker_container_check_existing_docker_ps: 'docker ps --filter name=^%{container}$ --quiet'
|
34
35
|
cmd_docker_container_check_network_docker_network: 'docker network ls --quiet --filter name=^%{network}$'
|
35
36
|
cmd_docker_container_check_orphaned_docker_exec: 'docker exec --interactive %{container} ps a'
|
@@ -6,18 +6,31 @@ module Takelage
|
|
6
6
|
include LoggingModule
|
7
7
|
include SystemModule
|
8
8
|
include ConfigModule
|
9
|
-
include
|
9
|
+
include DockerCheckDaemon
|
10
|
+
include DockerCheckSocat
|
10
11
|
|
11
12
|
#
|
12
|
-
# docker check
|
13
|
+
# docker check daemon
|
13
14
|
#
|
14
|
-
desc '
|
15
|
+
desc 'daemon', 'Check if docker daemon is running'
|
15
16
|
long_desc <<-LONGDESC.gsub("\n", "\x5")
|
16
17
|
Check if docker daemon is running
|
17
18
|
LONGDESC
|
18
19
|
# Check if docker daemon is running.
|
19
|
-
def
|
20
|
-
exit
|
20
|
+
def daemon
|
21
|
+
exit docker_check_daemon
|
22
|
+
end
|
23
|
+
|
24
|
+
#
|
25
|
+
# docker check socat
|
26
|
+
#
|
27
|
+
desc 'socat', 'Check if socat command is available'
|
28
|
+
long_desc <<-LONGDESC.gsub("\n", "\x5")
|
29
|
+
Check if socat command is available
|
30
|
+
LONGDESC
|
31
|
+
# Check if socat command is available.
|
32
|
+
def socat
|
33
|
+
exit docker_check_socat
|
21
34
|
end
|
22
35
|
end
|
23
36
|
end
|
@@ -1,15 +1,15 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
# takelage docker check running
|
4
|
-
module
|
4
|
+
module DockerCheckDaemon
|
5
5
|
# Backend method for docker check running.
|
6
6
|
# @return [Boolean] is the docker daemon running?
|
7
|
-
def
|
7
|
+
def docker_check_daemon
|
8
8
|
return true if @docker_daemon_running
|
9
9
|
|
10
10
|
log.debug 'Check if the docker daemon is running'
|
11
11
|
|
12
|
-
status = try config.active['
|
12
|
+
status = try config.active['cmd_docker_check_daemon_docker_info']
|
13
13
|
|
14
14
|
unless status.exitstatus.zero?
|
15
15
|
log.error 'The docker daemon is not running'
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# takelage docker check running
|
4
|
+
module DockerCheckSocat
|
5
|
+
# Backend method for docker check socat.
|
6
|
+
# @return [Boolean] is the socat command available?
|
7
|
+
def docker_check_socat
|
8
|
+
return true if @socat_command_available
|
9
|
+
|
10
|
+
log.debug 'Check if the socat command is available'
|
11
|
+
|
12
|
+
status = try config.active['cmd_docker_check_socat_socat_version']
|
13
|
+
|
14
|
+
unless status.exitstatus.zero?
|
15
|
+
log.error 'The socat command is not available'
|
16
|
+
return false
|
17
|
+
end
|
18
|
+
|
19
|
+
log.debug 'The socat command is available'
|
20
|
+
@socat_command_available = true
|
21
|
+
true
|
22
|
+
end
|
23
|
+
end
|
@@ -6,7 +6,8 @@ module Takelage
|
|
6
6
|
include LoggingModule
|
7
7
|
include SystemModule
|
8
8
|
include ConfigModule
|
9
|
-
include
|
9
|
+
include DockerCheckDaemon
|
10
|
+
include DockerCheckSocat
|
10
11
|
include DockerContainerCheckExisting
|
11
12
|
include DockerContainerCheckNetwork
|
12
13
|
include DockerContainerCheckOrphaned
|
@@ -7,7 +7,7 @@ module DockerContainerCheckExisting
|
|
7
7
|
def docker_container_check_existing(container)
|
8
8
|
log.debug "Checking if container \"#{container}\" is existing"
|
9
9
|
|
10
|
-
return false unless
|
10
|
+
return false unless docker_check_daemon
|
11
11
|
|
12
12
|
stdout_str = run _docker_container_cmd_check_existing container
|
13
13
|
|
@@ -7,7 +7,7 @@ module DockerContainerCheckNetwork
|
|
7
7
|
def docker_container_check_network(network)
|
8
8
|
log.debug "Checking if network \"#{network}\" is existing"
|
9
9
|
|
10
|
-
return false unless
|
10
|
+
return false unless docker_check_daemon
|
11
11
|
|
12
12
|
stdout_str = run _docker_container_cmd_check_network network
|
13
13
|
|
@@ -7,7 +7,7 @@ module DockerContainerCheckOrphaned
|
|
7
7
|
def docker_container_check_orphaned(container)
|
8
8
|
log.debug "Check if container \"#{container}\" is orphaned"
|
9
9
|
|
10
|
-
return false unless
|
10
|
+
return false unless docker_check_daemon
|
11
11
|
|
12
12
|
stdout_str = run _docker_container_cmd_check_orphaned container
|
13
13
|
|
@@ -6,7 +6,8 @@ module Takelage
|
|
6
6
|
include LoggingModule
|
7
7
|
include SystemModule
|
8
8
|
include ConfigModule
|
9
|
-
include
|
9
|
+
include DockerCheckDaemon
|
10
|
+
include DockerCheckSocat
|
10
11
|
include DockerContainerCheckExisting
|
11
12
|
include DockerContainerCheckNetwork
|
12
13
|
include DockerContainerCheckOrphaned
|
@@ -6,7 +6,7 @@ module DockerContainerCommand
|
|
6
6
|
def docker_container_command(command)
|
7
7
|
log.debug 'Running command in container'
|
8
8
|
|
9
|
-
return false unless
|
9
|
+
return false unless docker_check_daemon
|
10
10
|
|
11
11
|
docker_socket_start
|
12
12
|
return false unless _docker_container_lib_create_net_and_ctr @hostname
|
@@ -6,7 +6,7 @@ module DockerContainerLogin
|
|
6
6
|
def docker_container_login
|
7
7
|
log.debug 'Logging in to docker container'
|
8
8
|
|
9
|
-
return false unless
|
9
|
+
return false unless docker_check_daemon
|
10
10
|
|
11
11
|
docker_socket_start
|
12
12
|
return false unless _docker_container_lib_create_net_and_ctr @hostname
|
@@ -6,7 +6,7 @@ module DockerContainerPrune
|
|
6
6
|
def docker_container_prune
|
7
7
|
log.debug 'Removing orphaned docker containers'
|
8
8
|
|
9
|
-
return false unless
|
9
|
+
return false unless docker_check_daemon
|
10
10
|
|
11
11
|
networks = _docker_container_prune_kill_orphaned_containers
|
12
12
|
_docker_container_lib_remove_networks networks
|
@@ -7,7 +7,7 @@ module DockerImageTagCheck
|
|
7
7
|
def docker_image_tag_check(tag)
|
8
8
|
log.debug "Check if docker image tag \"#{tag}\" exists"
|
9
9
|
|
10
|
-
return false unless
|
10
|
+
return false unless docker_check_daemon
|
11
11
|
|
12
12
|
if tag.to_s.strip.empty?
|
13
13
|
log.warn 'No docker image tag specified'
|
@@ -6,7 +6,9 @@ module DockerSocketStart
|
|
6
6
|
def docker_socket_start
|
7
7
|
log.debug 'Starting sockets for docker container'
|
8
8
|
|
9
|
-
return false unless
|
9
|
+
return false unless docker_check_daemon
|
10
|
+
|
11
|
+
return false unless docker_check_socat
|
10
12
|
|
11
13
|
cmds_start_socket = _docker_socket_lib_get_socket_start_commands 'start'
|
12
14
|
|
@@ -6,12 +6,13 @@ module DockerSocketStop
|
|
6
6
|
def docker_socket_stop
|
7
7
|
log.debug 'Stopping sockets for docker container'
|
8
8
|
|
9
|
-
return false unless
|
9
|
+
return false unless docker_check_daemon
|
10
|
+
|
11
|
+
return false unless docker_check_socat
|
10
12
|
|
11
13
|
# get process list
|
12
14
|
# assuming format: "pid command"
|
13
|
-
cmd_ps =
|
14
|
-
config.active['cmd_docker_socket_stop_docker_socket_ps']
|
15
|
+
cmd_ps = config.active['cmd_docker_socket_stop_docker_socket_ps']
|
15
16
|
|
16
17
|
stdout_str = run cmd_ps
|
17
18
|
|
data/lib/takelage/version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.23.
|
1
|
+
0.23.1
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: takelage
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.23.
|
4
|
+
version: 0.23.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Geospin
|
@@ -226,7 +226,8 @@ files:
|
|
226
226
|
- lib/takelage/completion/cli.rb
|
227
227
|
- lib/takelage/default.yml
|
228
228
|
- lib/takelage/docker/check/cli.rb
|
229
|
-
- lib/takelage/docker/check/
|
229
|
+
- lib/takelage/docker/check/daemon.rb
|
230
|
+
- lib/takelage/docker/check/socat.rb
|
230
231
|
- lib/takelage/docker/cli.rb
|
231
232
|
- lib/takelage/docker/container/check/cli.rb
|
232
233
|
- lib/takelage/docker/container/check/existing.rb
|