Commit b02050d6 authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' of /home/nimrod/Documents/Shore/Ansible/example 

# Conflicts:
#	molecule.yml
#	tests/playbook.yml
parents f7b05cb8 d4fa8001

molecule.yml

+12 −5
Original line number Diff line number Diff line
@@ -30,13 +30,20 @@ vagrant: 


docker:

  containers:

  - name: php5-trusty

    image: ubuntu

    image_version: trusty

    environment:

        DEBIAN_FRONTEND: noninteractive

  - name: php5-jessie

    image: debian

    image_version: jessie

    command: /sbin/init

    cap_add:

      - SYS_ADMIN

    volume_mounts:

      - /sys/fs/cgroup:/sys/fs/cgroup

      - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket

    environment:

        DEBIAN_FRONTEND: noninteractive

        container: docker

  - name: php5-trusty

    image: ubuntu

    image_version: trusty

    environment:

        DEBIAN_FRONTEND: noninteractive