takeltau 0.39.11 → 0.39.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/takeltau/default.yml +3 -4
- data/lib/takeltau/docker/container/lib.rb +0 -2
- data/lib/takeltau/docker/image/cli.rb +1 -0
- data/lib/takeltau/docker/image/update.rb +6 -5
- data/lib/takeltau/mutagen/check/daemon.rb +6 -15
- data/lib/takeltau/mutagen/socket/create.rb +0 -2
- data/lib/takeltau/mutagen/socket/docker.rb +0 -2
- data/lib/takeltau/version +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d954acca5a410dcd961154463864bc7368752fcae20f2ef837a3a8de71cdce78
|
4
|
+
data.tar.gz: 51fdda97c3c74121a4b0c6e6302b75941304b2676c0f3fbaa11384c7fa292334
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f7c3d8d019d6d433d04f3ebe58edc227503b4212f19af3ebdf3cf155b26ac831f29a1d158314312f8490a2a41b58cd76de8d0df57e0de9e0ff62bcd393233c3b
|
7
|
+
data.tar.gz: ddbd01a435c6409566286153fc9feb11721eb743e7d1634011f3766c7f8342eba67c66ef3e546cdb2b52eaa0097410c26d8cf0c36fe94e940fef965ce9a52b1f
|
data/lib/takeltau/default.yml
CHANGED
@@ -14,7 +14,7 @@ cmd_docker_container_docker_exec: 'docker exec %{container} su %{username} -c "L
|
|
14
14
|
cmd_docker_container_stop_container: 'docker stop %{container}'
|
15
15
|
cmd_docker_image_tag_check_docker_images: 'docker images --quiet %{image}'
|
16
16
|
cmd_docker_image_tag_list_docker_images: 'docker images %{docker_user}\/%{docker_repo} --format "{{.Tag}}"'
|
17
|
-
|
17
|
+
cmd_docker_image_update_docker_pull: 'docker pull %{docker_user}/%{docker_repo}:%{docker_tag}'
|
18
18
|
cmd_docker_image_update_docker_remove_dangling: 'docker image prune --force'
|
19
19
|
cmd_git: 'git'
|
20
20
|
cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
|
@@ -46,7 +46,6 @@ cmd_init_lib_git_commit_initial: 'git commit -m "Initial commit"'
|
|
46
46
|
cmd_init_lib_hg_clone: 'bash hgclone'
|
47
47
|
cmd_mutagen: 'mutagen'
|
48
48
|
cmd_mutagen_check_daemon_host_connection: 'mutagen forward list --label-selector="%{hostlabel}"'
|
49
|
-
cmd_mutagen_check_daemon_start_daemon: 'mutagen daemon start'
|
50
49
|
cmd_mutagen_forward_socket_create: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} docker://%{username}@%{container}:unix:%{containersock} unix:%{hostsock}'
|
51
50
|
cmd_mutagen_forward_socket_docker: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} --socket-group-source=docker --socket-permission-mode=0660 docker://root@%{container}:unix:/var/run/docker.sock unix:%{hostsock}'
|
52
51
|
cmd_mutagen_forward_socket_check: 'mutagen forward list %{socketname}'
|
@@ -66,11 +65,11 @@ git_hg_branch: 'main'
|
|
66
65
|
info_project_main: 'project.yml'
|
67
66
|
info_project_private: 'private/project.yml'
|
68
67
|
login_wait_for_sockets: '0'
|
69
|
-
mutagen_socket_path_mutagen_container: '~/.mutagen/daemon/daemon.sock'
|
70
|
-
mutagen_socket_path_mutagen_host: '~/.mutagen/daemon/daemon.sock'
|
71
68
|
mutagen_socket_path_docker_host: '/var/run/docker.sock'
|
72
69
|
mutagen_socket_path_gpg_container: '~/.gnupg/S.gpg-agent'
|
73
70
|
mutagen_socket_path_gpg_host: '~/.gnupg/S.gpg-agent'
|
71
|
+
mutagen_socket_path_mutagen_container: '~/.mutagen/daemon/daemon.sock'
|
72
|
+
mutagen_socket_path_mutagen_host: '~/.mutagen/daemon/daemon.sock'
|
74
73
|
mutagen_socket_path_ssh_container: '~/.gnupg/S.gpg-agent.ssh'
|
75
74
|
mutagen_socket_path_ssh_host: '~/.gnupg/S.gpg-agent.ssh'
|
76
75
|
mutagen_socket_takelage_label: 'type=takelage'
|
@@ -8,8 +8,6 @@ module DockerContainerLib
|
|
8
8
|
|
9
9
|
# Create mutagen sockets
|
10
10
|
def _docker_container_lib_start_sockets
|
11
|
-
return false unless mutagen_check_daemon
|
12
|
-
|
13
11
|
mutagen_socket_docker @dockersock_host
|
14
12
|
mutagen_socket_create 'mutagen', @mutagensock_container, @mutagensock_host
|
15
13
|
mutagen_socket_create 'gpg', @gpgsock_container, @gpgsock_host
|
@@ -6,22 +6,23 @@ module DockerImageUpdate
|
|
6
6
|
def docker_image_update
|
7
7
|
return false unless docker_check_daemon
|
8
8
|
|
9
|
-
|
9
|
+
cmd_docker_pull = _docker_image_update_cmd_docker_pull
|
10
10
|
|
11
11
|
cmd_docker_remove_dangling =
|
12
12
|
config.active['cmd_docker_image_update_docker_remove_dangling']
|
13
13
|
|
14
|
-
run_and_exit "#{
|
14
|
+
run_and_exit "#{cmd_docker_pull} && #{cmd_docker_remove_dangling}"
|
15
15
|
end
|
16
16
|
|
17
17
|
private
|
18
18
|
|
19
19
|
# Prepare dpcker pull latest command.
|
20
|
-
def
|
20
|
+
def _docker_image_update_cmd_docker_pull
|
21
21
|
format(
|
22
|
-
config.active['
|
22
|
+
config.active['cmd_docker_image_update_docker_pull'],
|
23
23
|
docker_user: @docker_user,
|
24
|
-
docker_repo: @docker_repo
|
24
|
+
docker_repo: @docker_repo,
|
25
|
+
docker_tag: @docker_tag
|
25
26
|
)
|
26
27
|
end
|
27
28
|
end
|
@@ -11,10 +11,7 @@ module MutagenCheckDaemon
|
|
11
11
|
|
12
12
|
log.debug 'Check mutagen status'
|
13
13
|
|
14
|
-
unless
|
15
|
-
log.error 'The mutagen daemon cannot be started'
|
16
|
-
return false
|
17
|
-
end
|
14
|
+
return false unless command_available_else_error? config.active['cmd_mutagen']
|
18
15
|
|
19
16
|
# are we inside a takelage container?
|
20
17
|
unless _docker_container_lib_check_matrjoschka
|
@@ -28,13 +25,13 @@ module MutagenCheckDaemon
|
|
28
25
|
return true
|
29
26
|
end
|
30
27
|
|
31
|
-
unless
|
32
|
-
log.error '
|
28
|
+
unless _file_exists? config.active['mutagen_socket_path_mutagen_container']
|
29
|
+
log.error 'The mutagen socket path in the container is not available'
|
33
30
|
return false
|
34
31
|
end
|
35
32
|
|
36
|
-
unless
|
37
|
-
log.error '
|
33
|
+
unless _mutagen_check_daemon_host_connection
|
34
|
+
log.error 'A mutagen host connection is not available'
|
38
35
|
return false
|
39
36
|
end
|
40
37
|
|
@@ -42,6 +39,7 @@ module MutagenCheckDaemon
|
|
42
39
|
@mutagen_daemon_available = true
|
43
40
|
true
|
44
41
|
end
|
42
|
+
# rubocop:enable Metrics/AbcSize
|
45
43
|
# rubocop:enable Metrics/MethodLength
|
46
44
|
|
47
45
|
private
|
@@ -68,12 +66,5 @@ module MutagenCheckDaemon
|
|
68
66
|
|
69
67
|
true
|
70
68
|
end
|
71
|
-
# rubocop:enable Metrics/AbcSize
|
72
69
|
# rubocop:enable Metrics/MethodLength
|
73
|
-
|
74
|
-
# Start mutagen daemon
|
75
|
-
def _mutagen_check_daemon_start
|
76
|
-
start = try config.active['cmd_mutagen_check_daemon_start_daemon']
|
77
|
-
start.exitstatus.zero?
|
78
|
-
end
|
79
70
|
end
|
@@ -10,8 +10,6 @@ module MutagenSocketCreate
|
|
10
10
|
log.debug "Create the mutagen socket \"#{socketname}\" in the container " \
|
11
11
|
"at \"#{containersock}\" pointing to the host at \"#{hostsock}\""
|
12
12
|
|
13
|
-
return false unless mutagen_check_daemon
|
14
|
-
|
15
13
|
return false if mutagen_socket_check socketname
|
16
14
|
|
17
15
|
socket_created = _mutagen_socket_create_socket(socketname, containersock, hostsock)
|
@@ -10,8 +10,6 @@ module MutagenSocketDocker
|
|
10
10
|
log.debug "Create the mutagen docker socket \"#{socketname}\" in the container " \
|
11
11
|
"pointing to the host at \"#{hostsock}\""
|
12
12
|
|
13
|
-
return false unless mutagen_check_daemon
|
14
|
-
|
15
13
|
return false if mutagen_socket_check socketname
|
16
14
|
|
17
15
|
socket_created = _mutagen_socket_docker_socket(socketname, hostsock)
|
data/lib/takeltau/version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.39.
|
1
|
+
0.39.16
|