kitchen-dokken 2.21.4 → 2.22.0
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 +4 -4
- data/lib/kitchen/driver/dokken.rb +24 -2
- data/lib/kitchen/driver/dokken_version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 41db7510df21ba1b148bdba53be04d6f0600d32ce0e5ce91a7f39e710a6ee1d2
|
|
4
|
+
data.tar.gz: cce5cb1f5055671c16419e9c689b3b29f3d5d8793c6ef03757e49b2d83c23754
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 343fe63d03731366a6ea63cd57e366c40ab105933b9cdc2f98a96dc1a486af4ee970b161cdeb39ded36bc71228ad45561a4985dc5b75d2145cd6c03b75bd8212
|
|
7
|
+
data.tar.gz: 72faeb21d9ab19119fe0c4939243c0584f1285bf51fc77d0ac41241794082311b9109aaeeaf6a0fdd67a90656f09911e76dda7844c35b3cd87efb66fef018dfd
|
|
@@ -42,6 +42,7 @@ module Kitchen
|
|
|
42
42
|
default_config :chef_image, "chef/chef"
|
|
43
43
|
default_config :chef_version, "latest"
|
|
44
44
|
default_config :data_image, "dokken/kitchen-cache:latest"
|
|
45
|
+
default_config :data_ssh_port, nil
|
|
45
46
|
default_config :dns, nil
|
|
46
47
|
default_config :dns_search, nil
|
|
47
48
|
default_config :docker_host_url, default_docker_host
|
|
@@ -374,8 +375,8 @@ module Kitchen
|
|
|
374
375
|
# locally built image, must use short-name
|
|
375
376
|
"Image" => short_image_path(data_image),
|
|
376
377
|
"HostConfig" => {
|
|
377
|
-
"PortBindings" =>
|
|
378
|
-
"PublishAllPorts" =>
|
|
378
|
+
"PortBindings" => data_port_bindings,
|
|
379
|
+
"PublishAllPorts" => self[:data_ssh_port].nil?,
|
|
379
380
|
"NetworkMode" => "bridge",
|
|
380
381
|
},
|
|
381
382
|
}
|
|
@@ -678,6 +679,27 @@ module Kitchen
|
|
|
678
679
|
config[:data_image]
|
|
679
680
|
end
|
|
680
681
|
|
|
682
|
+
def data_port_bindings
|
|
683
|
+
return port_bindings unless config[:data_ssh_port]
|
|
684
|
+
|
|
685
|
+
# If data_ssh_port is specified, use it for SSH port mapping
|
|
686
|
+
ssh_port_binding = {
|
|
687
|
+
"22/tcp" => [
|
|
688
|
+
{
|
|
689
|
+
"HostIp" => "0.0.0.0",
|
|
690
|
+
"HostPort" => config[:data_ssh_port].to_s,
|
|
691
|
+
},
|
|
692
|
+
],
|
|
693
|
+
}
|
|
694
|
+
|
|
695
|
+
# Merge with any existing port bindings
|
|
696
|
+
if port_bindings
|
|
697
|
+
port_bindings.merge(ssh_port_binding)
|
|
698
|
+
else
|
|
699
|
+
ssh_port_binding
|
|
700
|
+
end
|
|
701
|
+
end
|
|
702
|
+
|
|
681
703
|
def platform_image
|
|
682
704
|
config[:image] || platform_image_from_name
|
|
683
705
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kitchen-dokken
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.22.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sean OMeara
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-12-
|
|
11
|
+
date: 2025-12-16 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: docker-api
|