beaker-docker 1.0.1 → 1.1.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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3f4f7b1cd703a47b1d9e0ef3ee4674fefca4859b051f1a9d3d90cd84e9d00314
4
- data.tar.gz: c7a93b50fd1d1c17bf54d58082131e29e6e20837a46ec65e12e013fa1fdb3aca
3
+ metadata.gz: 296226435995d98cfeffeb61804ac77e25bd446c8d795610b40957940f8a3a66
4
+ data.tar.gz: bd0acc21e9bccf2787b743d1e4c927d6a11d81746f595227a020d1881f6c203e
5
5
  SHA512:
6
- metadata.gz: ffc27af960c9686c3371d52e124a759456d57c64172443c061b573a4ffbb5756529c5ac686e379e707dc0480e495c7b64111745ba5930e3094803a07ed3534b4
7
- data.tar.gz: 8633cd8a006ed012159784c42934818162d33a1d5d9062d520ed1152e001773aa1de5701ce3e71de263d25fa5b38d3948b61e12936b26c7a1440c64933e4c315
6
+ metadata.gz: c17ec27c00fe4bc5b4397c65b9d13f3154d172795c1a4306f26af2caef9dbcbd3c336c430fde0479a09c42c754b592cc26870ddce3cfbb58d07248382ab1364e
7
+ data.tar.gz: d75961b6868c5b512b9dd8948d9a51d02d6a0cd24763ed4d275af81dfa16748f099eb72f3ac4d70bf50466dd41a1f4a6d7bfa258205952353adcad5d653fdef9
data/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # Changelog
2
2
 
3
+ ## [1.1.0](https://github.com/voxpupuli/beaker-docker/tree/1.1.0) (2022-01-27)
4
+
5
+ [Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/1.0.1...1.1.0)
6
+
7
+ **Implemented enhancements:**
8
+
9
+ - Use host\_packages helper to reuse logic from beaker [\#59](https://github.com/voxpupuli/beaker-docker/pull/59) ([ekohl](https://github.com/ekohl))
10
+
3
11
  ## [1.0.1](https://github.com/voxpupuli/beaker-docker/tree/1.0.1) (2021-09-13)
4
12
 
5
13
  [Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/1.0.0...1.0.1)
@@ -31,6 +31,5 @@ Gem::Specification.new do |s|
31
31
  # Run time dependencies
32
32
  s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
33
33
  s.add_runtime_dependency 'docker-api', '~> 2.1'
34
-
34
+ s.add_runtime_dependency 'beaker', '>= 4.34'
35
35
  end
36
-
@@ -522,23 +522,24 @@ module Beaker
522
522
 
523
523
  # add platform-specific actions
524
524
  service_name = "sshd"
525
+ additional_packages = host_packages(host)
525
526
  case host['platform']
526
527
  when /ubuntu/, /debian/
527
528
  service_name = "ssh"
528
529
  dockerfile += <<~EOF
529
530
  RUN apt-get update
530
- RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES.join(' ')}
531
+ RUN apt-get install -y openssh-server openssh-client #{additional_packages.join(' ')}
531
532
  RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*
532
533
  EOF
533
534
  when /cumulus/
534
535
  dockerfile += <<~EOF
535
536
  RUN apt-get update
536
- RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES.join(' ')}
537
+ RUN apt-get install -y openssh-server openssh-client #{additional_packages.join(' ')}
537
538
  EOF
538
539
  when /el-[89]/, /fedora-(2[2-9]|3)/
539
540
  dockerfile += <<~EOF
540
541
  RUN dnf clean all
541
- RUN dnf install -y sudo openssh-server openssh-clients #{Beaker::HostPrebuiltSteps::RHEL8_PACKAGES.join(' ')}
542
+ RUN dnf install -y sudo openssh-server openssh-clients #{additional_packages.join(' ')}
542
543
  RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
543
544
  RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
544
545
  RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*
@@ -546,14 +547,14 @@ module Beaker
546
547
  when /^el-/, /centos/, /fedora/, /redhat/, /eos/
547
548
  dockerfile += <<~EOF
548
549
  RUN yum clean all
549
- RUN yum install -y sudo openssh-server openssh-clients #{Beaker::HostPrebuiltSteps::UNIX_PACKAGES.join(' ')}
550
+ RUN yum install -y sudo openssh-server openssh-clients #{additional_packages.join(' ')}
550
551
  RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
551
552
  RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
552
553
  RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*
553
554
  EOF
554
555
  when /opensuse/, /sles/
555
556
  dockerfile += <<~EOF
556
- RUN zypper -n in openssh #{Beaker::HostPrebuiltSteps::SLES_PACKAGES.join(' ')}
557
+ RUN zypper -n in openssh #{additional_packages.join(' ')}
557
558
  RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
558
559
  RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
559
560
  RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
@@ -563,7 +564,7 @@ module Beaker
563
564
  dockerfile += <<~EOF
564
565
  RUN pacman --noconfirm -Sy archlinux-keyring
565
566
  RUN pacman --noconfirm -Syu
566
- RUN pacman -S --noconfirm openssh #{Beaker::HostPrebuiltSteps::ARCHLINUX_PACKAGES.join(' ')}
567
+ RUN pacman -S --noconfirm openssh #{additional_packages.join(' ')}
567
568
  RUN ssh-keygen -A
568
569
  RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
569
570
  RUN systemctl enable sshd
@@ -1,3 +1,3 @@
1
1
  module BeakerDocker
2
- VERSION = '1.0.1'
2
+ VERSION = '1.1.0'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-docker
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vox Pupuli
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2021-09-13 00:00:00.000000000 Z
14
+ date: 2022-01-27 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rspec
@@ -97,6 +97,20 @@ dependencies:
97
97
  - - "~>"
98
98
  - !ruby/object:Gem::Version
99
99
  version: '2.1'
100
+ - !ruby/object:Gem::Dependency
101
+ name: beaker
102
+ requirement: !ruby/object:Gem::Requirement
103
+ requirements:
104
+ - - ">="
105
+ - !ruby/object:Gem::Version
106
+ version: '4.34'
107
+ type: :runtime
108
+ prerelease: false
109
+ version_requirements: !ruby/object:Gem::Requirement
110
+ requirements:
111
+ - - ">="
112
+ - !ruby/object:Gem::Version
113
+ version: '4.34'
100
114
  description: For use for the Beaker acceptance testing tool
101
115
  email:
102
116
  - voxpupuli@groups.io
@@ -144,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
144
158
  - !ruby/object:Gem::Version
145
159
  version: '0'
146
160
  requirements: []
147
- rubygems_version: 3.2.22
161
+ rubygems_version: 3.2.32
148
162
  signing_key:
149
163
  specification_version: 4
150
164
  summary: Beaker DSL Extension Helpers!