From c58a7677650babf9ddf6cf79f517442f131beec6 Mon Sep 17 00:00:00 2001
From: Ivan Krutov <vania-pooh@vania-pooh.com>
Date: Mon, 19 Jun 2017 20:12:10 +0300
Subject: [PATCH 1/3] Added latest-release tag support

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

diff --git a/.travis.yml b/.travis.yml
index d267f55..3c4ebc7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,11 @@ deploy:
     skip_cleanup: true
     on:
       tags: true
+  - provider: script
+    script: travis/docker-push.sh latest-release
+    skip_cleanup: true
+    on:
+      tags: true
   - provider: script
     script: travis/docs.sh latest
     skip_cleanup: true

From 4070352a761295c28a9b346e741a1280b51d5039 Mon Sep 17 00:00:00 2001
From: Ivan Krutov <vania-pooh@vania-pooh.com>
Date: Mon, 19 Jun 2017 19:52:06 +0300
Subject: [PATCH 2/3] Setting Selenoid restart policy to "always" (fixes #33)

---
 selenoid/docker.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/selenoid/docker.go b/selenoid/docker.go
index 31fe02c..7786a82 100644
--- a/selenoid/docker.go
+++ b/selenoid/docker.go
@@ -430,6 +430,9 @@ func (c *DockerConfigurator) Start() error {
 		&container.HostConfig{
 			Binds:        volumes,
 			PortBindings: portBindings,
+			RestartPolicy: container.RestartPolicy{
+				Name: "always",
+			},
 		},
 		&network.NetworkingConfig{}, selenoidContainerName)
 	if err != nil {

From 9a0417144ae064e39a1efae3b76fb84374353120 Mon Sep 17 00:00:00 2001
From: Ivan Krutov <vania-pooh@vania-pooh.com>
Date: Mon, 19 Jun 2017 20:09:02 +0300
Subject: [PATCH 3/3] Passing cm environment variables to started Selenoid
 container (fixes #35)

---
 selenoid/docker.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/selenoid/docker.go b/selenoid/docker.go
index 7786a82..ca8ba7c 100644
--- a/selenoid/docker.go
+++ b/selenoid/docker.go
@@ -22,6 +22,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"os"
+
 	. "vbom.ml/util/sortorder"
 )
 
@@ -395,9 +397,8 @@ func (c *DockerConfigurator) Start() error {
 	if image == nil {
 		return errors.New("Selenoid image is not downloaded: this is probably a bug")
 	}
-	env := []string{
-		fmt.Sprintf("TZ=%s", time.Local),
-	}
+	env := os.Environ()
+	env = append(env, fmt.Sprintf("TZ=%s", time.Local))
 	portString := strconv.Itoa(selenoidContainerPort)
 	port, err := nat.NewPort("tcp", portString)
 	if err != nil {