From 3a993606b22d1162ecea3a8f595b3d17410a8450 Mon Sep 17 00:00:00 2001
From: Bert Van Vreckem <bert.vanvreckem@gmail.com>
Date: Mon, 14 Dec 2015 09:07:17 +0100
Subject: [PATCH] Remove container_id from env:

---
 .travis.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6e484ce..07e4c6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,22 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-    container_id: $(mktemp)
+  - distribution: centos  # Linux distribution
+    version: 6            # Distribution version
+    init: /sbin/init      # Path to init executable (differs for SysVInit/Systemd)
+    run_opts: ""          # Additional options for running the Docker container
   - distribution: centos
     version: 7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    container_id: $(mktemp)
   - distribution: ubuntu
     version: 14.04
     init: /sbin/init
     run_opts: ""
-    container_id: $(mktemp)
   - distribution: ubuntu
     version: 12.04
     init: /sbin/init
     run_opts: ""
-    container_id: $(mktemp)
 
 services:
   - docker
@@ -37,6 +33,7 @@ script:
   # Run test playbook
   #
 
+  - container_id=$(mktemp)
     # 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}"