Skip to content

Commit

Permalink
Add support for the opensuse/leap images
Browse files Browse the repository at this point in the history
The previous opensuse images are deprecated on dockerhub.

Signed-off-by: Tim Smith <tsmith@chef.io>
  • Loading branch information
tas50 committed Mar 15, 2019
1 parent 9009e85 commit aeb13fb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 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/leap`, `opensuse` or `sles`

The default will be computed, using the platform name (see the Default
Configuration section for more details).
Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/driver/docker.rb
Original file line number Diff line number Diff line change
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/leap', 'opensuse', 'sles'
<<-eos
ENV container docker
RUN zypper install -y sudo openssh which curl
Expand Down

0 comments on commit aeb13fb

Please # to comment.