PR #60: Prepare to add Ubuntu 12.04 a third time.

This commit is contained in:
Jeff Geerling 2015-12-13 14:27:47 -06:00
parent 7628bd8637
commit 219cd5feac
2 changed files with 3 additions and 13 deletions

View file

@ -4,7 +4,7 @@ env:
# CentOS 7. # CentOS 7.
- container_id: $(mktemp) - container_id: $(mktemp)
distribution: centos distribution: centos
version: 7 version: "7"
init: /usr/lib/systemd/systemd init: /usr/lib/systemd/systemd
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
# Ubuntu 12.04. # Ubuntu 12.04.
@ -28,11 +28,11 @@ before_install:
# Pull container. # Pull container.
- "sudo docker pull ${distribution}:${version}" - "sudo docker pull ${distribution}:${version}"
# Customize container. # Customize container.
- "sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests" - "sudo docker build --rm=true --file=tests/Dockerfile.${distribution}${version} --tag=${distribution}${version}:ansible tests"
script: script:
# Run container in detached state. # Run container in detached state.
- 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"' - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}${version}:ansible "${init}" > "${container_id}"'
# Ansible syntax check. # Ansible syntax check.
- 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check' - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'

View file

@ -1,10 +0,0 @@
FROM ubuntu:14.04
# Install Ansible
RUN apt-get install -y software-properties-common git
RUN apt-add-repository -y ppa:ansible/ansible
RUN apt-get update
RUN apt-get install -y ansible
# Install Ansible inventory file
RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts