35 commits

Author	SHA1	Message	Date
Jeff Geerling	b0e6b7ed5a	Always run apt-get update inside Docker containers.	2015-12-29 16:46:39 -06:00
Jeff Geerling	2387c79d75	Fix a couple missed merge conflicts.	2015-12-14 09:17:30 -06:00
Jeff Geerling	7a15ff5fd6	PR #61: Consistency in Dockerfile formatting.	2015-12-14 08:38:39 -06:00
Jeff Geerling	e5f3ba3bf1	Merge branch 'master' of https://github.com/bertvv/ansible-role-apache into bertvv-master	2015-12-14 08:36:55 -06:00
Bert Van Vreckem	a4746557a4	Delete	2015-12-14 08:59:26 +01:00
Bert Van Vreckem	4b0353c2d0	Merge upstream and fixes for #61	2015-12-14 08:58:10 +01:00
Bert Van Vreckem	7c41dd113e	Added Centos 6 as target platform	2015-12-14 07:18:01 +01:00
Jeff Geerling	91a0a99f0a	Issue #61: Looks like CentOS 6 will be a no-go.	2015-12-13 20:39:36 -06:00
Jeff Geerling	f696c0c89d	Issue #61: Make CentOS 6 work x2.	2015-12-13 20:34:08 -06:00
Jeff Geerling	533703d32d	Issue #61: Make CentOS 6 work.	2015-12-13 20:22:55 -06:00
Jeff Geerling	60726db64b	Issue #61: Add CentOS 6.	2015-12-13 20:20:24 -06:00
Jeff Geerling	e5d0d58ffe	Issue #61: Fix Ubuntu 12.04 Dockerfile.	2015-12-13 20:11:16 -06:00
Bert Van Vreckem	5ca9ccc7c3	Install apt-add-repository	2015-12-14 00:15:55 +01:00
Bert Van Vreckem	a24482638b	Add Ubuntu 12.04 as a platform to test	2015-12-14 00:00:39 +01:00
Jeff Geerling	1526d4f74c	Issue #61: Dockerfile, not shell script.	2015-12-13 15:37:43 -06:00
Jeff Geerling	c1f932a641	Issue #61: Ensure apt-add-repository is present on Ubuntu 12.04.	2015-12-13 15:33:07 -06:00
Jeff Geerling	fda9e90f9d	Issue #61: Add Ubuntu 12.04 and rearrange env vars for readability.	2015-12-13 15:29:44 -06:00
Jeff Geerling	1b64ceefbb	Issue #61: Attempt to set dockerfile name via varaible.	2015-12-13 15:07:40 -06:00
Jeff Geerling	a3f86ab912	PR #60: Back to a working state, will debug locally.	2015-12-13 14:30:46 -06:00
Jeff Geerling	219cd5feac	PR #60: Prepare to add Ubuntu 12.04 a third time.	2015-12-13 14:27:47 -06:00
Jeff Geerling	7628bd8637	PR #60: Prepare to add Ubuntu 12.04 again.	2015-12-13 14:23:51 -06:00
Jeff Geerling	49437eaeb4	PR #60: Prepare to add Ubuntu 12.04.	2015-12-13 14:19:26 -06:00
Jeff Geerling	379953325c	PR #60: Small syntax tweaks for better highlighting.	2015-12-13 14:06:12 -06:00
Bert Van Vreckem	d8d1770482	Don’t install test code on Ubuntu Docker container, remove requirements.yml	2015-12-13 19:27:21 +01:00
Bert Van Vreckem	840423b1b9	Test the current code, not the last release on Galaxy; colored output	2015-12-13 10:14:50 +01:00
Bert Van Vreckem	609812fb48	Set some role variables in the test playbook	2015-12-12 11:36:56 +01:00
Bert Van Vreckem	5260215d28	Change order in build process	2015-12-12 11:36:33 +01:00
Bert Van Vreckem	43c25c0302	Run multi-platform test on Travis-CI	2015-12-12 11:17:40 +01:00
Jeff Geerling	d2401eb840	Update Travis to test the role itself (less setup work).	2014-04-23 12:59:07 -05:00
Jeff Geerling	14f32f8382	Check for idempotency within .travis.yml.	2014-04-22 09:43:36 -05:00
Jeff Geerling	718edc6fa2	More testing with Travis.	2014-04-22 09:31:45 -05:00
Jeff Geerling	e4f1b37bdd	Get idempotence test working - more testing.	2014-04-22 08:57:50 -05:00
Jeff Geerling	626578ea9d	Get idempotence test working.	2014-04-22 08:54:04 -05:00
Jeff Geerling	0e3a6bb463	Added idempotence test and integration test via Travis.	2014-04-22 08:47:05 -05:00
Jeff Geerling	489dc306bb	Add Travis CI integration.	2014-04-22 07:39:07 -05:00