beaker-docker 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 296226435995d98cfeffeb61804ac77e25bd446c8d795610b40957940f8a3a66
-  data.tar.gz: bd0acc21e9bccf2787b743d1e4c927d6a11d81746f595227a020d1881f6c203e
+  metadata.gz: e150251ff135abf3518e13d04408904855a9dab3ef99c273303fad41949f9a52
+  data.tar.gz: b2a7e7e3d5453a482480c126992e24d2e29ed5d114d6f7b0434f4e739a2371e0
 SHA512:
-  metadata.gz: c17ec27c00fe4bc5b4397c65b9d13f3154d172795c1a4306f26af2caef9dbcbd3c336c430fde0479a09c42c754b592cc26870ddce3cfbb58d07248382ab1364e
-  data.tar.gz: d75961b6868c5b512b9dd8948d9a51d02d6a0cd24763ed4d275af81dfa16748f099eb72f3ac4d70bf50466dd41a1f4a6d7bfa258205952353adcad5d653fdef9
+  metadata.gz: 17e521d8e979ccfd11f6d160382f2832a4ede66b21737a36f2bad734c237a79e886aecb63e253defcf7b589922536e9dbc901afb650297e10dff75c5eff77f66
+  data.tar.gz: 15de0c0498a3d2faccd6add7866ec1912e725947a0654e66ed470714abf3a007a877af38cb97909d7a086658d4d36188bfba7c103bb223a296563aa0d973b364

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [1.1.1](https://github.com/voxpupuli/beaker-docker/tree/1.1.1) (2022-02-11)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/1.1.0...1.1.1)
+
+**Fixed bugs:**
+
+- Arch Linux: do not install openssh twice [\#58](https://github.com/voxpupuli/beaker-docker/pull/58) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- Remove beaker from Gemfile [\#62](https://github.com/voxpupuli/beaker-docker/pull/62) ([bastelfreak](https://github.com/bastelfreak))
+- CI: Switch centos:8 to centos:stream8 image [\#61](https://github.com/voxpupuli/beaker-docker/pull/61) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [1.1.0](https://github.com/voxpupuli/beaker-docker/tree/1.1.0) (2022-01-27)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/1.0.1...1.1.0)
@@ -8,6 +21,10 @@
 
 - Use host\_packages helper to reuse logic from beaker [\#59](https://github.com/voxpupuli/beaker-docker/pull/59) ([ekohl](https://github.com/ekohl))
 
+**Merged pull requests:**
+
+- Release 1.1.0 [\#60](https://github.com/voxpupuli/beaker-docker/pull/60) ([ekohl](https://github.com/ekohl))
+
 ## [1.0.1](https://github.com/voxpupuli/beaker-docker/tree/1.0.1) (2021-09-13)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/1.0.0...1.0.1)

data/Gemfile

@@ -2,24 +2,6 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gemspec
 
-def location_for(place, fake_version = nil)
-  if place =~ /^git:([^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
-  else
-    [place, { :require => false }]
-  end
-end
-
-
-# We don't put beaker in as a test dependency because we
-# don't want to create a transitive dependency
-group :acceptance_testing do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 4.30')
-end
-
-
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end

data/acceptance/config/nodes/hosts.yaml

@@ -3,7 +3,7 @@ HOSTS:
   centos8:
     platform: el-8-x86_64
     hypervisor: docker
-    image: centos:8
+    image: quay.io/centos/centos:stream8
     roles:
       - master
       - agent

data/lib/beaker/hypervisor/docker.rb

@@ -562,9 +562,9 @@ module Beaker
           EOF
       when /archlinux/
         dockerfile += <<~EOF
-          RUN pacman --noconfirm -Sy archlinux-keyring
-          RUN pacman --noconfirm -Syu
-          RUN pacman -S --noconfirm openssh #{additional_packages.join(' ')}
+          RUN pacman --sync --refresh --noconfirm archlinux-keyring
+          RUN pacman --sync --refresh --noconfirm --sysupgrade
+          RUN pacman --sync --noconfirm #{additional_packages.join(' ')}
           RUN ssh-keygen -A
           RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
           RUN systemctl enable sshd

data/lib/beaker-docker/version.rb

@@ -1,3 +1,3 @@
 module BeakerDocker
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/spec/beaker/hypervisor/docker_spec.rb

@@ -751,7 +751,9 @@ module Beaker
             'image' => 'foobar',
           })
 
-          expect( dockerfile ).to be =~ /RUN pacman -S --noconfirm openssh/
+          expect( dockerfile ).to match(/RUN pacman --sync --refresh --noconfirm archlinux-keyring/)
+          expect( dockerfile ).to match(/RUN pacman --sync --refresh --noconfirm --sysupgrade/)
+          expect( dockerfile ).to match(/RUN pacman --sync --noconfirm curl ntp net-tools openssh/)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Vox Pupuli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec