fix: add missing portmap when needed (#1183)

pull/1196/head
nils måsén 3 years ago committed by GitHub
parent a1bdd268c1
commit 04db93c770
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -10,6 +10,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
dockercontainer "github.com/docker/docker/api/types/container" dockercontainer "github.com/docker/docker/api/types/container"
"github.com/docker/go-connections/nat"
) )
// NewContainer returns a new Container instance instantiated with the // NewContainer returns a new Container instance instantiated with the
@ -191,10 +192,10 @@ func (c Container) PreUpdateTimeout() int {
// PostUpdateTimeout checks whether a container has a specific timeout set // PostUpdateTimeout checks whether a container has a specific timeout set
// for how long the post-update command is allowed to run. This value is expressed // for how long the post-update command is allowed to run. This value is expressed
// either as an integer, in minutes, or as 0 which will allow the command/script // either as an integer, in minutes, or as 0 which will allow the command/script
// to run indefinitely. Users should be cautious with the 0 option, as that // to run indefinitely. Users should be cautious with the 0 option, as that
// could result in watchtower waiting forever. // could result in watchtower waiting forever.
func (c Container) PostUpdateTimeout() int { func (c Container) PostUpdateTimeout() int {
var minutes int var minutes int
var err error var err error
@ -206,9 +207,7 @@ func (c Container) PreUpdateTimeout() int {
} }
return minutes return minutes
} }
// StopSignal returns the custom stop signal (if any) that is encoded in the // StopSignal returns the custom stop signal (if any) that is encoded in the
// container's metadata. If the container has not specified a custom stop // container's metadata. If the container has not specified a custom stop
@ -319,8 +318,10 @@ func (c Container) VerifyConfiguration() error {
return errorInvalidConfig return errorInvalidConfig
} }
// Instead of returning an error here, we just create an empty map
// This should allow for updating containers where the exposed ports are missing
if len(hostConfig.PortBindings) > 0 && containerConfig.ExposedPorts == nil { if len(hostConfig.PortBindings) > 0 && containerConfig.ExposedPorts == nil {
return errorNoExposedPorts containerConfig.ExposedPorts = make(map[nat.Port]struct{})
} }
return nil return nil

@ -50,11 +50,13 @@ var _ = Describe("the container", func() {
}) })
}) })
When("verifying a container with port bindings, but no exposed ports", func() { When("verifying a container with port bindings, but no exposed ports", func() {
It("should return an error", func() { It("should make the config compatible with updating", func() {
c := mockContainerWithPortBindings("80/tcp") c := mockContainerWithPortBindings("80/tcp")
c.containerInfo.Config.ExposedPorts = nil c.containerInfo.Config.ExposedPorts = nil
err := c.VerifyConfiguration() Expect(c.VerifyConfiguration()).To(Succeed())
Expect(err).To(Equal(errorNoExposedPorts))
Expect(c.containerInfo.Config.ExposedPorts).ToNot(BeNil())
Expect(c.containerInfo.Config.ExposedPorts).To(BeEmpty())
}) })
}) })
When("verifying a container with port bindings and exposed ports is non-nil", func() { When("verifying a container with port bindings and exposed ports is non-nil", func() {

Loading…
Cancel
Save