mirror of
https://github.com/geerlingguy/ansible-role-apache
synced 2024-12-22 19:10:19 +01:00
Issue #61: Add Ubuntu 12.04 and rearrange env vars for readability.
This commit is contained in:
parent
1b64ceefbb
commit
fda9e90f9d
2 changed files with 24 additions and 6 deletions
20
.travis.yml
20
.travis.yml
|
@ -2,18 +2,26 @@ sudo: required
|
||||||
|
|
||||||
env:
|
env:
|
||||||
# CentOS 7.
|
# CentOS 7.
|
||||||
- container_id: $(mktemp)
|
- distribution: centos
|
||||||
dockerfile: Dockerfile.centos-7
|
|
||||||
distribution: centos
|
|
||||||
version: 7
|
version: 7
|
||||||
|
container_id: $(mktemp)
|
||||||
|
dockerfile: Dockerfile.centos-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.
|
||||||
|
- distribution: ubuntu
|
||||||
|
version: 12.04
|
||||||
|
container_id: $(mktemp)
|
||||||
|
dockerfile: Dockerfile.ubuntu-12
|
||||||
|
init: /sbin/init
|
||||||
|
run_opts: ""
|
||||||
|
|
||||||
# Ubuntu 14.04.
|
# Ubuntu 14.04.
|
||||||
- container_id: $(mktemp)
|
- distribution: ubuntu
|
||||||
dockerfile: Dockerfile.ubuntu-14
|
|
||||||
distribution: ubuntu
|
|
||||||
version: 14.04
|
version: 14.04
|
||||||
|
container_id: $(mktemp)
|
||||||
|
dockerfile: Dockerfile.ubuntu-14
|
||||||
init: /sbin/init
|
init: /sbin/init
|
||||||
run_opts: ""
|
run_opts: ""
|
||||||
|
|
||||||
|
|
10
tests/Dockerfile.ubuntu-12
Normal file
10
tests/Dockerfile.ubuntu-12
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
FROM ubuntu:12.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
|
Loading…
Reference in a new issue