Skip to content

Commit

Permalink
Merge pull request #322 from test-kitchen/tas50/suse
Browse files Browse the repository at this point in the history
Add support for the opensuse/leap images
  • Loading branch information
tas50 authored Mar 15, 2019
2 parents 9009e85 + 989ca46 commit 8743b45
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ platforms:
- name: opensuse-42.3
driver:
image: opensuse:42.3
- name: opensuse/leap-42
# - name: arch
# driver:
# image: base/archlinux
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ suite container for Test Kitchen. Kitchen Docker currently supports:
* `debian` or `ubuntu`
* `amazonlinux`, `rhel`, `centos`, `fedora` or `oraclelinux`
* `gentoo` or `gentoo-paludis`
* `opensuse` or `sles`
* `opensuse/tumbleweed`, `opensuse/leap`, `opensuse` or `sles`

The default will be computed, using the platform name (see the Default
Configuration section for more details).
Expand Down
4 changes: 2 additions & 2 deletions lib/kitchen/driver/docker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def verify_dependencies
run_command("#{config[:binary]} >> #{dev_null} 2>&1", quiet: true, use_sudo: config[:use_sudo])
rescue
raise UserError,
'You must first install the Docker CLI tool http://www.docker.io/gettingstarted/'
'You must first install the Docker CLI tool https://www.docker.com/get-started'
end

def dev_null
Expand Down Expand Up @@ -232,7 +232,7 @@ def build_dockerfile
RUN [ -f "/etc/ssh/ssh_host_rsa_key" ] || ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
RUN [ -f "/etc/ssh/ssh_host_dsa_key" ] || ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
eos
when 'opensuse', 'sles'
when 'opensuse/tumbleweed', 'opensuse/leap', 'opensuse', 'sles'
<<-eos
ENV container docker
RUN zypper install -y sudo openssh which curl
Expand Down

0 comments on commit 8743b45

Please # to comment.