beaker-docker 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjdhOGRmZjc5ODBhODgyMzY1ZTcwZDY5ZmU1ZGVhZjkxMDVmNTE2NQ==
-  data.tar.gz: !binary |-
-    MGNhYTQzMmMyODMyNGJjNzNiOTdhMzhmZmMyNGQyMjE3MGM0ZjdiMA==
+SHA1:
+  metadata.gz: 11eea4355dd2129a958eced653b4ca23782a8f01
+  data.tar.gz: b15e68f0be5b05a836b3f79b834249dce514eb1a
 SHA512:
-  metadata.gz: !binary |-
-    YzkzNWJiZmVkYjBjMWI3MjVmMGVmYmJjMDU1ZWZmNDA0NzNkY2EwMGMyOTk4
-    ZDE4YmJkYmE2NDZkOGFlMDY3OTEwZjJiMTQxY2EzYmFmMjMxNWU0ZjZhMzIz
-    ZTIzNzhiYzgwOGE5YmVhYTZjY2VlNGZhNjZkYzNmMDk2ODQ0Y2Y=
-  data.tar.gz: !binary |-
-    NGI0YWViODYwYWRmN2I3ZmUzYTU4MDE2NWJjODc1YTJhZTYxMjMwODNkODA2
-    NWViYzUyMThlOTdjMDJjMDkxODVhYmM5NjVhMWY4MGQwYzU5ZjE0N2ZlYTA5
-    YWY2NGMwNDIyNDhjZDIxOWI4ZDk3ZWZlNmY3NjNiZDUwYWQ2YjQ=
+  metadata.gz: 5915547ac7bdc813b70284be6f28297d71dc78eb0d76d3178578b1a30181a79c61b8a808929dab24e127fed92c8a4e530d5fd8d35d4964d485d5faeeca54d58e
+  data.tar.gz: 4eae6ae9722d25c943debfc99586af1b1d2dffe59da9b6949474b1212f25990085c7f2c1a6a4dd7e424944e49c5583270dbaa60da1477ede84dfef28cac12109

data/lib/beaker-docker/version.rb

@@ -1,3 +1,3 @@
 module BeakerDocker
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/beaker/hypervisor/docker.rb

@@ -70,7 +70,6 @@ module Beaker
         container_opts = {
           'Image' => image_name,
           'Hostname' => host.name,
-          'name' => host.name,
           'HostConfig' => {
             'PortBindings' => {
               '22/tcp' => [{ 'HostPort' => rand.to_s[2..5], 'HostIp' => '0.0.0.0'}]
@@ -95,6 +94,10 @@ module Beaker
             end
           end
 
+          if host['docker_cap_add']
+            container_opts['HostConfig']['CapAdd'] = host['docker_cap_add']
+          end
+
           if @options[:provision]
             if host['docker_container_name']
               container_opts['name'] = host['docker_container_name']
@@ -225,8 +228,8 @@ module Beaker
           dockerfile = File.read(host['dockerfile'])
         else
           raise "requested Dockerfile #{host['dockerfile']} does not exist"
-        end 
-      else 
+        end
+      else
         raise("Docker image undefined!") if (host['image']||= nil).to_s.empty?
 
         # specify base image
@@ -274,6 +277,14 @@ module Beaker
             RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
             RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
           EOF
+        when /archlinux/
+          dockerfile += <<-EOF
+            RUN pacman -Sy
+            RUN pacman -S --noconfirm openssh #{Beaker::HostPrebuiltSteps::ARCHLINUX_PACKAGES.join(' ')}
+            RUN ssh-keygen -A
+            RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
+            RUN systemctl enable sshd
+          EOF
         else
           # TODO add more platform steps here
           raise "platform #{host['platform']} not yet supported on docker"

data/spec/beaker/hypervisor/docker_spec.rb

@@ -15,7 +15,8 @@ module Beaker
     "cumulus-2.2-x86_64",
     "fedora-22-x86_64",
     "centos-7-x86_64",
-    "sles-12-x86_64"
+    "sles-12-x86_64",
+    "archlinux-2017.12.27-x86_64"
   ]
 
   describe Docker do
@@ -181,7 +182,6 @@ module Beaker
           expect( ::Docker::Container ).to receive(:create).with({
             'Image' => image.id,
             'Hostname' => host.name,
-            'name' => host.name,
             'HostConfig' => {
               'PortBindings' => {
                 '22/tcp' => [{ 'HostPort' => /\b\d{4}\b/, 'HostIp' => '0.0.0.0'}]
@@ -192,7 +192,7 @@ module Beaker
                 'Name' => 'always'
               }
             }
-          })
+          }).with(hash_excluding('name'))
         end
 
         docker.provision
@@ -211,7 +211,6 @@ module Beaker
           expect( ::Docker::Container ).to receive(:create).with({
             'Image' => image.id,
             'Hostname' => host.name,
-            'name' => host.name,
             'HostConfig' => {
               'PortBindings' => {
                 '22/tcp' => [{ 'HostPort' => /\b\d{4}\b/, 'HostIp' => '0.0.0.0'}]
@@ -222,7 +221,7 @@ module Beaker
                 'Name' => 'always'
               }
             }
-          })
+          }).with(hash_excluding('name'))
         end
 
         docker.provision
@@ -284,7 +283,6 @@ module Beaker
           expect( ::Docker::Container ).to receive(:create).with({
             'Image' => image.id,
             'Hostname' => host.name,
-            'name' => host.name,
             'HostConfig' => {
               'Binds' => [
                 '/source_folder:/mount_point',
@@ -308,6 +306,30 @@ module Beaker
         docker.provision
       end
 
+      it 'should create a container with capabilities added' do
+        hosts.each_with_index do |host, index|
+          host['docker_cap_add'] = ['NET_ADMIN', 'SYS_ADMIN']
+
+          expect( ::Docker::Container ).to receive(:create).with({
+            'Image' => image.id,
+            'Hostname' => host.name,
+            'HostConfig' => {
+              'PortBindings' => {
+                '22/tcp' => [{ 'HostPort' => /\b\d{4}\b/, 'HostIp' => '0.0.0.0'}]
+              },
+              'PublishAllPorts' => true,
+              'Privileged' => true,
+              'RestartPolicy' => {
+                'Name' => 'always'
+              },
+              'CapAdd' => ['NET_ADMIN', 'SYS_ADMIN']
+            }
+          })
+        end
+
+        docker.provision
+      end
+
       it 'should start the container' do
         expect( container ).to receive(:start)
 
@@ -529,6 +551,16 @@ module Beaker
         end
       end
 
+      it 'should use pacman on archlinux' do
+        FakeFS.deactivate!
+        dockerfile = docker.send(:dockerfile_for, {
+          'platform' => 'archlinux-current-x86_64',
+          'image' => 'foobar',
+        })
+
+        expect( dockerfile ).to be =~ /RUN pacman -S --noconfirm openssh/
+      end
+
       it 'should use user dockerfile if specified' do
         FakeFS.deactivate!
         dockerfile = docker.send(:dockerfile_for, {

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: stringify-hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.0
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: For use for the Beaker acceptance testing tool
@@ -172,8 +172,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .simplecov
+- ".gitignore"
+- ".simplecov"
 - Gemfile
 - LICENSE
 - README.md
@@ -196,17 +196,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Beaker DSL Extension Helpers!