.kitchen.yml in kitchen-docker-2.4.0 vs .kitchen.yml in kitchen-docker-2.5.0
- old
+ new
@@ -1,55 +1,53 @@
+<% # Make sure the local copy of the driver is loaded %>
+<% lib = File.expand_path('../lib', __FILE__) %>
+<% $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) %>
---
driver:
name: docker
- provision_command: curl -L http://www.chef.io/chef/install.sh | bash
+ provision_command: curl -L https://www.chef.io/chef/install.sh | bash
provisioner:
name: dummy
platforms:
- - name: ubuntu-12.04
- - name: ubuntu-14.04
- - name: centos-6.4
- - name: centos-7
- - name: debian
- - name: arch
- driver:
- image: base/arch
- - name: unknown
- driver:
- image: ubuntu:12.04
- platform: ubuntu
- - name: dockerfile
- driver:
- username: dockerfile
- password: dockerfile
- dockerfile: test/Dockerfile
- run_command: /sbin/init
- - name: database
- driver:
- image: ubuntu:14.04
- platform: ubuntu
- instance_name: db
- publish_all: true
- - name: linked
- driver:
- image: ubuntu:14.04
- platform: ubuntu
- links: "db:db"
+- name: ubuntu-12.04
+- name: ubuntu-14.04
+- name: ubuntu-16.04
+- name: centos-6
+- name: centos-7
+- name: debian
+- name: arch
+ driver:
+ image: base/archlinux
+ provision_command: true
+- name: unknown
+ driver:
+ image: ubuntu:12.04
+ platform: ubuntu
+- name: dockerfile
+ driver:
+ username: dockerfile
+ password: dockerfile
+ dockerfile: test/Dockerfile
+ run_command: /sbin/init
+
suites:
- - name: default
- - name: concurrency
- - name: context
- driver:
- build_context: false
- - name: capabilities
- excludes: [arch,unknown,centos-7,centos-6.4,dockerfile]
- driver:
- provision_command:
- - curl -L http://www.chef.io/chef/install.sh | bash
- - apt-get install -y net-tools
- username: kitchen
- password: kitchen
- cap_drop:
- - NET_ADMIN
-
+- name: default
+ excludes: [arch]
+- name: context
+ excludes: [arch]
+ driver:
+ build_context: false
+- name: capabilities
+ excludes: [arch,unknown,centos-7,centos-6,dockerfile]
+ driver:
+ provision_command:
+ - curl -L https://www.chef.io/chef/install.sh | bash
+ - apt-get install -y net-tools
+ cap_drop:
+ - NET_ADMIN
+- name: inspec
+ driver:
+ provision_command: true
+ verifier:
+ name: inspec