lib/kitchen/driver/docker.rb in kitchen-docker-2.8.0 vs lib/kitchen/driver/docker.rb in kitchen-docker-2.9.0
- old
+ new
@@ -89,11 +89,11 @@
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
case RbConfig::CONFIG["host_os"]
when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
@@ -214,18 +214,26 @@
ENV container docker
RUN apt-get update
RUN apt-get install -y sudo openssh-server curl lsb-release
eos
config[:disable_upstart] ? disable_upstart + packages : packages
- when 'rhel', 'centos', 'fedora', 'oraclelinux'
+ when 'rhel', 'centos', 'oraclelinux', 'amazonlinux'
<<-eos
ENV container docker
RUN yum clean all
RUN yum install -y sudo openssh-server openssh-clients which curl
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 'fedora'
+ <<-eos
+ ENV container docker
+ RUN dnf clean all
+ RUN dnf install -y sudo openssh-server openssh-clients which curl
+ 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/tumbleweed', 'opensuse/leap', 'opensuse', 'sles'
<<-eos
ENV container docker
RUN zypper install -y sudo openssh which curl
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 ''