takeltau 0.43.1 → 0.43.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1f155e82696808efbb960be240378c95cf81293a3fc6f8a77b5ebb5b94ec553c
|
4
|
+
data.tar.gz: bb436721278cf181fcc184f5fcc44b78b571eced96e20fde3db640f9d0598d9a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6d2f45c3ef3c0cf310eec89a6b1b59350e270489fd62a8964fa5b1f8f23e1d2a925f93325ca1ecb41cbde589353ceaf1c91033c06aa667727d55af430cdf2764
|
7
|
+
data.tar.gz: f09ba20dd55601707f26b5b6df6788150887baa296314e83407caa4f22f8b02ef131b713627ac826e65c5611bc8e3f5c2f80451a476d92f03cbff8c13af17948
|
@@ -37,12 +37,7 @@ module Takeltau
|
|
37
37
|
LONGDESC
|
38
38
|
# Run podman command.
|
39
39
|
def podman(*args)
|
40
|
-
|
41
|
-
unless result
|
42
|
-
say 'No connection to takelship'
|
43
|
-
exit 1
|
44
|
-
end
|
45
|
-
say result
|
40
|
+
say ship_container_podman args
|
46
41
|
end
|
47
42
|
end
|
48
43
|
end
|
@@ -40,30 +40,8 @@ module ShipContainerLib
|
|
40
40
|
# rubocop:enable Metrics/MethodLength
|
41
41
|
# rubocop:enable Metrics/AbcSize
|
42
42
|
|
43
|
-
# Run a podman command in a takelship container
|
44
|
-
# rubocop:disable Metrics/MethodLength
|
45
|
-
# rubocop:disable Metrics/AbcSize
|
46
|
-
def _ship_container_lib_podman(command)
|
47
|
-
return false unless docker_check_daemon
|
48
|
-
|
49
|
-
docker_host = _ship_info_lib_get_takelshipinfo['docker_host']
|
50
|
-
config_docker_host = config.active['ship_docker_host']
|
51
|
-
docker_host = config_docker_host if
|
52
|
-
config_docker_host != config.active['ship_default_docker_host']
|
53
|
-
localhost = config.active['ship_podman_localhost']
|
54
|
-
cmd_docker_run_command = format(
|
55
|
-
config.active['cmd_ship_container_podman'],
|
56
|
-
docker_host: docker_host,
|
57
|
-
localhost: localhost,
|
58
|
-
command: command
|
59
|
-
)
|
60
|
-
run cmd_docker_run_command
|
61
|
-
end
|
62
|
-
# rubocop:enable Metrics/AbcSize
|
63
|
-
# rubocop:enable Metrics/MethodLength
|
64
|
-
|
65
43
|
# Run a docker command in a takelship container
|
66
|
-
def _ship_container_lib_docker(command, tty = '')
|
44
|
+
def _ship_container_lib_docker(command, tty = '--tty')
|
67
45
|
return false unless docker_check_daemon
|
68
46
|
|
69
47
|
cmd_docker_run_command = format(
|
@@ -6,6 +6,8 @@ module ShipProjectStart
|
|
6
6
|
def ship_project_start(project)
|
7
7
|
return false if ship_container_check_existing
|
8
8
|
|
9
|
+
return false if _docker_container_lib_check_matrjoschka
|
10
|
+
|
9
11
|
takelship = _ship_info_lib_get_takelshipinfo
|
10
12
|
project = config.active['ship_default_project'] if project == 'default'
|
11
13
|
project = takelship['default_project'] if project == 'default'
|
data/lib/takeltau/version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.43.
|
1
|
+
0.43.2
|