Skip to content
This repository has been archived by the owner on Dec 17, 2024. It is now read-only.

Commit

Permalink
Merge pull request #36 from vania-pooh/master
Browse files Browse the repository at this point in the history
Environment, correct restart policy, latest-release
  • Loading branch information
aandryashin authored Jun 20, 2017
2 parents d4deb0c + 9a04171 commit e1e645d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions selenoid/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import (
"strconv"
"strings"
"time"
"os"

. "vbom.ml/util/sortorder"
)

Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -430,6 +431,9 @@ func (c *DockerConfigurator) Start() error {
&container.HostConfig{
Binds: volumes,
PortBindings: portBindings,
RestartPolicy: container.RestartPolicy{
Name: "always",
},
},
&network.NetworkingConfig{}, selenoidContainerName)
if err != nil {
Expand Down

0 comments on commit e1e645d

Please sign in to comment.