beaker-docker 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e150251ff135abf3518e13d04408904855a9dab3ef99c273303fad41949f9a52
-  data.tar.gz: b2a7e7e3d5453a482480c126992e24d2e29ed5d114d6f7b0434f4e739a2371e0
+  metadata.gz: 0ce1f4aae26967ce3b8f4d3d24db2a23c2a09b19a749d40bdd7c731d64201f3b
+  data.tar.gz: 711d8f36b0f39494206dbf6c06ffc602f213ad8681ba423529d413240c3d9c9c
 SHA512:
-  metadata.gz: 17e521d8e979ccfd11f6d160382f2832a4ede66b21737a36f2bad734c237a79e886aecb63e253defcf7b589922536e9dbc901afb650297e10dff75c5eff77f66
-  data.tar.gz: 15de0c0498a3d2faccd6add7866ec1912e725947a0654e66ed470714abf3a007a877af38cb97909d7a086658d4d36188bfba7c103bb223a296563aa0d973b364
+  metadata.gz: b7c52174a22413d6aa3a99cd0c9e98e8c3cef1c4f973edf9c3a0bd5c4c5e1c854c87c5147310e93ea387bb08ea1a11e6cd71d4dd44dd291db73619f2663f29bc
+  data.tar.gz: 13bf5b863f187e020040ac56504bae971bc0f27ae07ccd4e598325762782a269d56297cacd00b732a0fdd25e89d746aa7d7193aa8234f225c94c20d304a28ace

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
-## [1.1.1](https://github.com/voxpupuli/beaker-docker/tree/1.1.1) (2022-02-11)
+## [1.2.0](https://github.com/voxpupuli/beaker-docker/tree/1.2.0) (2022-08-11)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/1.1.1...1.2.0)
+
+**Implemented enhancements:**
+
+- Use ssh-keygen -A on modern Enterprise Linux [\#66](https://github.com/voxpupuli/beaker-docker/pull/66) ([ekohl](https://github.com/ekohl))
+- Add Docker hostfile parameter docker\_image\_first\_commands [\#65](https://github.com/voxpupuli/beaker-docker/pull/65) ([Rathios](https://github.com/Rathios))
+
+## [1.1.1](https://github.com/voxpupuli/beaker-docker/tree/1.1.1) (2022-02-17)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/1.1.0...1.1.1)
 
@@ -21,10 +30,6 @@
 
 - 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/docker.md

@@ -23,13 +23,22 @@ The base image to use for the container is named by the image key.
       type: foss
 
 ### Docker hosts file, with image modification ###
-You can specify extra commands to be executed in order to modify the image with the `docker_image_commands` key.
+You can specify extra commands to be executed in order to modify the image with the keys `docker_image_commands` and
+`docker_image_first_commands`.
+
+`docker_image_commands` is executed after initial setup. `docker_image_first_commands` is executed before any other
+commands and can be used eg. to configure a proxy.
 
     HOSTS:
       ubuntu-12-10:
         platform: ubuntu-12.10-x64
         image: ubuntu:12.10
         hypervisor: docker
+        docker_image_first_commands:
+          - echo 'Acquire::http::Proxy "http://proxy.example.com:3128";'> /etc/apt/apt.conf.d/01proxy
+          - echo "export http_proxy=http://proxy.example.com:3128"> /etc/profile.d/proxy.sh
+          - echo "export https_proxy=http://proxy.example.com:3128">> /etc/profile.d/proxy.sh
+          - echo "export no_proxy=127.0.0.1,::1">> /etc/profile.d/proxy.sh
         docker_image_commands:
           - 'apt-get install -y myapp'
           - 'myapp --setup'
@@ -53,7 +62,7 @@ Instead of using ssh as the CMD for a container, beaker will use the entrypoint
 
     HOSTS:
       puppetserver:
-        platform: ubuntu-1604-x86_64 
+        platform: ubuntu-1604-x86_64
         hypervisor: docker
         image: puppet/puppetserver-standalone:6.0.1
         use_image_entry_point: true

data/lib/beaker/hypervisor/docker.rb

@@ -401,8 +401,7 @@ module Beaker
       when /el-[89]/, /fedora-(2[2-9]|3[0-9])/
         container.exec(%w(dnf clean all))
         container.exec(%w(dnf install -y sudo openssh-server openssh-clients))
-        container.exec(%w(ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key))
-        container.exec(%w(ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key))
+        container.exec(%w(ssh-keygen -A))
         container.exec(%w(sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*))
       when /^el-/, /centos/, /fedora/, /redhat/, /eos/
         container.exec(%w(yum clean all))
@@ -516,6 +515,11 @@ module Beaker
         ENV container docker
       EOF
 
+      # Commands before any other commands. Can be used for eg. proxy configuration
+      dockerfile += (host['docker_image_first_commands'] || []).map { |command|
+        "RUN #{command}\n"
+      }.join('')
+
       # additional options to specify to the sshd
       # may vary by platform
       sshd_options = ''

data/lib/beaker-docker/version.rb

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

data/spec/beaker/hypervisor/docker_spec.rb

@@ -692,6 +692,23 @@ module Beaker
           end
         end
 
+        it 'should add docker_image_first_commands as RUN statements' do
+          FakeFS.deactivate!
+          platforms.each do |platform|
+            dockerfile = docker.send(:dockerfile_for, {
+              'platform' => platform,
+              'image' => 'foobar',
+              'docker_image_first_commands' => [
+                'special one',
+                'special two',
+                'special three',
+              ]
+            })
+
+            expect( dockerfile ).to be =~ /RUN special one\nRUN special two\nRUN special three/
+          end
+        end
+
         it 'should add docker_image_commands as RUN statements' do
           FakeFS.deactivate!
           platforms.each do |platform|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Beaker DSL Extension Helpers!