Skip to content
This repository has been archived by the owner on Nov 17, 2020. It is now read-only.

use new docker files #26

Merged
merged 8 commits into from
May 7, 2017
Merged

use new docker files #26

merged 8 commits into from
May 7, 2017

Conversation

rndmh3ro
Copy link
Member

This uses my own docker images (https://github.com/rndmh3ro/docker-ansible). These are just the base images with pre-installed Docker to save time and hassle when testing the roles.
This also enables full travis testing of all supported operating systems!

This too removes ansible 1.9 support, to better test the role. Also there's no more support for Ansible < 2.0, see https://groups.google.com/forum/#!topic/ansible-devel/6-6FdxZ94kc.

This also updates .kitchen.vagrant.yml same way as in PR dev-sec/ansible-collection-hardening#113.

@rndmh3ro rndmh3ro force-pushed the new_dockerimages branch 3 times, most recently from 19046a4 to 179637d Compare April 25, 2017 06:42
max_ssh_sessions: 5

platforms:
- name: ubuntu-12.04

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EOL'd

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed.

box: opscode-ubuntu-12.04
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box
- name: ubuntu-14.04
driver_config:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

driver_config is not needed since it defaults to bento boxes

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed.

box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box
- name: centos6-ansible-latest
driver:
image: rndmh3ro/docker-centos6-ansible:latest

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

docker stuff should be in .kitchen.docker.yml

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docker is the default testing method in this role. What else should be there then?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm ok, looks like the other repos are non-standard as well so ignore this commend then :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I'll change this to the bento boxes. I just discovered that bento has all of them.

@@ -1,62 +1,77 @@
---
driver:
name: vagrant
name: docker

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason to not use dokken?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ẁhat's the difference and advantages?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I took a look at https://github.com/someara/kitchen-dokken.
It sounds good, but right now we use kitchen-docker in all our ansible-roles. So I'l write it on my todo-list to check out dokken.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Take a look at https://github.com/dev-sec/chef-mysql-hardening/blob/master/.kitchen.yml
tl;dr dokken abstracts away from of the docker stuff that you don't care about in a CI environment (i.e. the run_opts and initoptions you have in the travis config)

Your config looks like it works fine the way it is, so just a thought if you have time or for the future :)

@rndmh3ro
Copy link
Member Author

Travis green, does someone have any objections against merging?

@artem-sidorenko
Copy link
Member

LGTM

@rndmh3ro rndmh3ro merged commit 98e30c4 into master May 7, 2017
@rndmh3ro rndmh3ro deleted the new_dockerimages branch May 7, 2017 14:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants