kitchen-docker 2.12.0 → 2.13.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bfc2ec595062530ef1a860930cb80cbdfd1f2d9b0f23f1bd7d261e769679b3a1
4
- data.tar.gz: 51b9b8e5f65991cd5dfb26d719301ae55e90d94b2591671617396b993d0c614b
3
+ metadata.gz: 8b1291ba7bef7b5a17771a1187a34829acac0b0a78e4185119ecb0e5e23728da
4
+ data.tar.gz: f1f3b39dc87295717756beab914c0ea5d945c68e318f581717e55b6a65ffbaea
5
5
  SHA512:
6
- metadata.gz: 2149ff5a8af75c70e88b93d03f5431e1586d7e0d69d117d742ec591e76fb9aca96b9d8c76e4e9d937c8c398daa4a641d0089c608a6bea9762a0c48b5b9708590
7
- data.tar.gz: 6e235534cf2f6ec24dc9cc3e59c10048fe874684c0488dcd15c5ffe0c9409491b27c40683a5945ad5cd857b6c03c72d8d0b90b0446069a0583068aebb5ae5cce
6
+ metadata.gz: f6bcc821a798f066815e2b9da4ef82389b29e53da4dd66bfbb0a228cb2a9b185289621f496d60bea06c5fb54aab388201f4f0c287e4743d2bd809bce4ed264ff
7
+ data.tar.gz: 6bdc6f960565040e5f8161dd6f64d81059fb9d83c42bf71287cf95c6e31ab50056f8e1ce5d065b1be53008bd79195bd93d36a1e661a0de297ac816676eae85f2
data/.kitchen.yml CHANGED
@@ -22,7 +22,6 @@ platforms:
22
22
  - yum install libxcrypt-compat -y
23
23
  - curl -L https://www.chef.io/chef/install.sh | bash
24
24
  - name: centos-7
25
- - name: centos-8
26
25
  - name: oraclelinux-7
27
26
  - name: rockylinux-8
28
27
  - name: debian-9
@@ -39,13 +38,13 @@ platforms:
39
38
 
40
39
  suites:
41
40
  - name: default
42
- excludes: [arch]
41
+ excludes: [arch, debian-9]
43
42
  - name: context
44
- excludes: [arch]
43
+ excludes: [arch, debian-9]
45
44
  driver:
46
45
  build_context: false
47
46
  - name: capabilities
48
- includes: [debian-9,debian-10,ubuntu-18.04,ubuntu-20.04]
47
+ includes: [debian-10,ubuntu-18.04,ubuntu-20.04]
49
48
  driver:
50
49
  provision_command:
51
50
  - curl -L https://www.chef.io/chef/install.sh | bash
data/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # Kitchen-Docker Changelog
2
2
 
3
+ ## 2.13.0 - June 10, 2022
4
+
5
+ - Added CentOSStream and PhotonOS - [@garethgreenaway](https://github.com/garethgreenaway)
6
+ - Fixed image parser when output includes a duration timestamp - [@RulerOf](https://github.com/RulerOf)
7
+ - Updated the test suites - [@RulerOf](https://github.com/RulerOf)
8
+
3
9
  ## 2.12.0 - December 22, 2021
4
10
 
5
11
  - Support Docker BuildKit - [@RulerOf](https://github.com/RulerOf)
@@ -16,6 +16,6 @@
16
16
  module Kitchen
17
17
  module Docker
18
18
  # Version string for Docker Kitchen driver
19
- DOCKER_VERSION = "2.12.0"
19
+ DOCKER_VERSION = "2.13.0"
20
20
  end
21
21
  end
@@ -36,6 +36,10 @@ module Kitchen
36
36
  opensuse_platform
37
37
  when 'rhel', 'centos', 'oraclelinux', 'amazonlinux', 'almalinux', 'rockylinux'
38
38
  rhel_platform
39
+ when 'centosstream'
40
+ centosstream_platform
41
+ when 'photon'
42
+ photonos_platform
39
43
  else
40
44
  raise ActionFailed, "Unknown platform '#{config[:platform]}'"
41
45
  end
@@ -114,6 +118,26 @@ module Kitchen
114
118
  CODE
115
119
  end
116
120
 
121
+ def centosstream_platform
122
+ <<-CODE
123
+ ENV container docker
124
+ RUN yum clean all
125
+ RUN yum install -y sudo openssh-server openssh-clients which
126
+ RUN [ -f "/etc/ssh/ssh_host_rsa_key" ] || ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
127
+ RUN [ -f "/etc/ssh/ssh_host_dsa_key" ] || ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
128
+ CODE
129
+ end
130
+
131
+ def photonos_platform
132
+ <<-CODE
133
+ ENV container docker
134
+ RUN tdnf clean all
135
+ RUN tdnf install -y sudo openssh-server openssh-clients which curl
136
+ RUN [ -f "/etc/ssh/ssh_host_ecdsa_key" ] || ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N ''
137
+ RUN [ -f "/etc/ssh/ssh_host_ed25519_key" ] || ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N ''
138
+ CODE
139
+ end
140
+
117
141
  def dockerfile_base_linux(username, homedir)
118
142
  <<-CODE
119
143
  RUN if ! getent passwd #{username}; then \
@@ -26,8 +26,8 @@ module Kitchen
26
26
 
27
27
  def parse_image_id(output)
28
28
  output.each_line do |line|
29
- if line =~ /writing image sha256:[[:xdigit:]]{64} done/i
30
- img_id = line[/writing image (sha256:[[:xdigit:]]{64}) done/i,1]
29
+ if line =~ /writing image (sha256:[[:xdigit:]]{64})(?: \d*\.\ds)? done/i
30
+ img_id = line[/writing image (sha256:[[:xdigit:]]{64})(?: \d*\.\ds)? done/i,1]
31
31
  return img_id
32
32
  end
33
33
  if line =~ /image id|build successful|successfully built/i
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-docker
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.12.0
4
+ version: 2.13.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Porter
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-12-22 00:00:00.000000000 Z
11
+ date: 2022-06-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: test-kitchen
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
266
266
  - !ruby/object:Gem::Version
267
267
  version: '0'
268
268
  requirements: []
269
- rubygems_version: 3.2.32
269
+ rubygems_version: 3.2.3
270
270
  signing_key:
271
271
  specification_version: 4
272
272
  summary: A Docker Driver for Test Kitchen