Merge pull request #1330 from vania-pooh/master

Working with recent Firefox images
aerokube · Apr 11, 2023 · e0cfe2f · e0cfe2f
2 parents 2544fa5 + 67eb972
commit e0cfe2f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v3
         with:
-          go-version: ~1.20
+          go-version: ~1.20.3
 
       - uses: actions/cache@v3
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v3
         with:
-          go-version: ~1.20
+          go-version: ~1.20.3
 
       - uses: actions/cache@v3
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v3
         with:
-          go-version: ~1.20
+          go-version: ~1.20.3
 
       - uses: actions/cache@v3
         with:

diff --git a/service/docker.go b/service/docker.go
@@ -143,14 +143,18 @@ func (d *Docker) StartWithCancel() (*StartedService, error) {
 	}
 	cl := d.Client
 	env := getEnv(d.ServiceBase, d.Caps)
+	cfg := &ctr.Config{
+		Image:        image.(string),
+		Env:          env,
+		ExposedPorts: portConfig.ExposedPorts,
+		Labels:       getLabels(d.Service, d.Caps),
+	}
+	hn := getContainerHostname(d.Caps)
+	if hn != "" {
+		cfg.Hostname = hn
+	}
 	container, err := cl.ContainerCreate(ctx,
-		&ctr.Config{
-			Hostname:     getContainerHostname(d.Caps),
-			Image:        image.(string),
-			Env:          env,
-			ExposedPorts: portConfig.ExposedPorts,
-			Labels:       getLabels(d.Service, d.Caps),
-		},
+		cfg,
 		&hostConfig,
 		&network.NetworkingConfig{}, nil, "")
 	if err != nil {
@@ -405,7 +409,7 @@ func getContainerHostname(caps session.Caps) string {
 	if caps.ContainerHostname != "" {
 		return caps.ContainerHostname
 	}
-	return "localhost"
+	return ""
 }
 
 func getExtraHosts(service *config.Browser, caps session.Caps) []string {