From aeb13fb43e90aa93a09eaecd2fe7423b8fa04041 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 18 Jan 2019 11:09:45 -0800 Subject: [PATCH 1/2] Add support for the opensuse/leap images The previous opensuse images are deprecated on dockerhub. Signed-off-by: Tim Smith --- .kitchen.yml | 1 + README.md | 2 +- lib/kitchen/driver/docker.rb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 7d7cda8d..77488aad 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -23,6 +23,7 @@ platforms: - name: opensuse-42.3 driver: image: opensuse:42.3 +- name: opensuse/leap-42 # - name: arch # driver: # image: base/archlinux diff --git a/README.md b/README.md index 57638850..0d93ffae 100644 --- a/README.md +++ b/README.md @@ -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). diff --git a/lib/kitchen/driver/docker.rb b/lib/kitchen/driver/docker.rb index 05694669..35c8bdb7 100644 --- a/lib/kitchen/driver/docker.rb +++ b/lib/kitchen/driver/docker.rb @@ -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 From 989ca464387ed78467c4386ecb9a5edc55ccc5df Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 15 Mar 2019 13:57:10 -0700 Subject: [PATCH 2/2] Add support for opensuse/tumbleweed as well Also update the error message URL for docker Signed-off-by: Tim Smith --- README.md | 2 +- lib/kitchen/driver/docker.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0d93ffae..b0b29fca 100644 --- a/README.md +++ b/README.md @@ -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/leap`, `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). diff --git a/lib/kitchen/driver/docker.rb b/lib/kitchen/driver/docker.rb index 35c8bdb7..636f377c 100644 --- a/lib/kitchen/driver/docker.rb +++ b/lib/kitchen/driver/docker.rb @@ -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 @@ -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/leap', 'opensuse', 'sles' + when 'opensuse/tumbleweed', 'opensuse/leap', 'opensuse', 'sles' <<-eos ENV container docker RUN zypper install -y sudo openssh which curl