Skip to content

Commit 15134a3

Browse files
author
Antonio Murdaca
committed
Remove PortSpecs from Config
Signed-off-by: Antonio Murdaca <[email protected]>
1 parent c42810f commit 15134a3

File tree

20 files changed

+44
-171
lines changed

20 files changed

+44
-171
lines changed

‎builder/dispatchers.go‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -453,19 +453,11 @@ func expose(b *Builder, args []string, attributes map[string]bool, original stri
453453
b.Config.ExposedPorts = make(nat.PortSet)
454454
}
455455

456-
ports, bindingMap, err := nat.ParsePortSpecs(append(portsTab, b.Config.PortSpecs...))
456+
ports, _, err := nat.ParsePortSpecs(portsTab)
457457
if err != nil {
458458
return err
459459
}
460460

461-
for _, bindings := range bindingMap {
462-
if bindings[0].HostIp != "" || bindings[0].HostPort != "" {
463-
fmt.Fprintf(b.ErrStream, " ---> Using Dockerfile's EXPOSE instruction"+
464-
" to map host ports to container ports (ip:hostPort:containerPort) is deprecated.\n"+
465-
" Please use -p to publish the ports.\n")
466-
}
467-
}
468-
469461
// instead of using ports directly, we build a list of ports and sort it so
470462
// the order is consistent. This prevents cache burst where map ordering
471463
// changes between builds
@@ -479,7 +471,6 @@ func expose(b *Builder, args []string, attributes map[string]bool, original stri
479471
i++
480472
}
481473
sort.Strings(portList)
482-
b.Config.PortSpecs = nil
483474
return b.commit("", b.Config.Cmd, fmt.Sprintf("EXPOSE %s", strings.Join(portList, " ")))
484475
}
485476

‎daemon/container_linux.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -642,16 +642,6 @@ func (container *Container) buildCreateEndpointOptions() ([]libnetwork.EndpointO
642642
createOptions []libnetwork.EndpointOption
643643
)
644644

645-
if container.Config.PortSpecs != nil {
646-
if err := migratePortMappings(container.Config, container.hostConfig); err != nil {
647-
return nil, err
648-
}
649-
container.Config.PortSpecs = nil
650-
if err := container.WriteHostConfig(); err != nil {
651-
return nil, err
652-
}
653-
}
654-
655645
if container.Config.ExposedPorts != nil {
656646
portSpecs = container.Config.ExposedPorts
657647
}

‎daemon/create.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (daemon *Daemon) Create(config *runconfig.Config, hostConfig *runconfig.Hos
6666
imgID = img.ID
6767
}
6868

69-
if warnings, err = daemon.mergeAndVerifyConfig(config, img); err != nil {
69+
if err := daemon.mergeAndVerifyConfig(config, img); err != nil {
7070
return nil, nil, err
7171
}
7272
if !config.NetworkDisabled && daemon.SystemConfig().IPv4ForwardingDisabled {

‎daemon/daemon.go‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -355,33 +355,16 @@ func (daemon *Daemon) restore() error {
355355
return nil
356356
}
357357

358-
func (daemon *Daemon) checkDeprecatedExpose(config *runconfig.Config) bool {
359-
if config != nil {
360-
if config.PortSpecs != nil {
361-
for _, p := range config.PortSpecs {
362-
if strings.Contains(p, ":") {
363-
return true
364-
}
365-
}
366-
}
367-
}
368-
return false
369-
}
370-
371-
func (daemon *Daemon) mergeAndVerifyConfig(config *runconfig.Config, img *image.Image) ([]string, error) {
372-
warnings := []string{}
373-
if (img != nil && daemon.checkDeprecatedExpose(img.Config)) || daemon.checkDeprecatedExpose(config) {
374-
warnings = append(warnings, "The mapping to public ports on your host via Dockerfile EXPOSE (host:port:port) has been deprecated. Use -p to publish the ports.")
375-
}
358+
func (daemon *Daemon) mergeAndVerifyConfig(config *runconfig.Config, img *image.Image) error {
376359
if img != nil && img.Config != nil {
377360
if err := runconfig.Merge(config, img.Config); err != nil {
378-
return nil, err
361+
return err
379362
}
380363
}
381364
if config.Entrypoint.Len() == 0 && config.Cmd.Len() == 0 {
382-
return nil, fmt.Errorf("No command specified")
365+
return fmt.Errorf("No command specified")
383366
}
384-
return warnings, nil
367+
return nil
385368
}
386369

387370
func (daemon *Daemon) generateIdAndName(name string) (string, string, error) {

‎daemon/utils.go‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,9 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/docker/docker/nat"
98
"github.com/docker/docker/runconfig"
109
)
1110

12-
func migratePortMappings(config *runconfig.Config, hostConfig *runconfig.HostConfig) error {
13-
if config.PortSpecs != nil {
14-
ports, bindings, err := nat.ParsePortSpecs(config.PortSpecs)
15-
if err != nil {
16-
return err
17-
}
18-
config.PortSpecs = nil
19-
if len(bindings) > 0 {
20-
if hostConfig == nil {
21-
hostConfig = &runconfig.HostConfig{}
22-
}
23-
hostConfig.PortBindings = bindings
24-
}
25-
26-
if config.ExposedPorts == nil {
27-
config.ExposedPorts = make(nat.PortSet, len(ports))
28-
}
29-
for k, v := range ports {
30-
config.ExposedPorts[k] = v
31-
}
32-
}
33-
return nil
34-
}
35-
3611
func mergeLxcConfIntoOptions(hostConfig *runconfig.HostConfig) ([]string, error) {
3712
if hostConfig == nil {
3813
return nil, nil

‎docs/man/docker-inspect.1.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ To get information on a container use its ID or instance name:
6161
"NetworkDisabled": false,
6262
"OnBuild": null,
6363
"OpenStdin": false,
64-
"PortSpecs": null,
6564
"StdinOnce": false,
6665
"Tty": true,
6766
"User": "",
@@ -215,7 +214,6 @@ on it.
215214
"NetworkDisabled": false,
216215
"OnBuild": [],
217216
"OpenStdin": false,
218-
"PortSpecs": null,
219217
"StdinOnce": false,
220218
"Tty": false,
221219
"User": "",
@@ -247,7 +245,6 @@ on it.
247245
"NetworkDisabled": false,
248246
"OnBuild": [],
249247
"OpenStdin": false,
250-
"PortSpecs": null,
251248
"StdinOnce": false,
252249
"Tty": false,
253250
"User": "",

‎docs/sources/reference/api/docker_remote_api_v1.19.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ Return low-level information on the container `id`
333333
"NetworkDisabled": false,
334334
"OnBuild": null,
335335
"OpenStdin": false,
336-
"PortSpecs": null,
337336
"StdinOnce": false,
338337
"Tty": false,
339338
"User": "",
@@ -1346,7 +1345,6 @@ Return low-level information on the image `name`
13461345
"AttachStdin": false,
13471346
"AttachStdout": false,
13481347
"AttachStderr": false,
1349-
"PortSpecs": null,
13501348
"Tty": true,
13511349
"OpenStdin": true,
13521350
"StdinOnce": false,
@@ -1741,7 +1739,6 @@ Create a new image from a container's changes
17411739
"AttachStdin": false,
17421740
"AttachStdout": true,
17431741
"AttachStderr": true,
1744-
"PortSpecs": null,
17451742
"Tty": false,
17461743
"OpenStdin": false,
17471744
"StdinOnce": false,
@@ -2095,7 +2092,6 @@ Return low-level information about the `exec` command `id`.
20952092
"AttachStdin" : false,
20962093
"AttachStdout" : false,
20972094
"AttachStderr" : false,
2098-
"PortSpecs" : null,
20992095
"ExposedPorts" : null,
21002096
"Tty" : false,
21012097
"OpenStdin" : false,

‎docs/sources/reference/api/registry_api.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ Put image for a given `image_id`
176176
AttachStdin: false,
177177
AttachStdout: false,
178178
AttachStderr: false,
179-
PortSpecs: null,
180179
Tty: false,
181180
OpenStdin: false,
182181
StdinOnce: false,
@@ -252,7 +251,6 @@ Parameters:
252251
AttachStdin: false,
253252
AttachStdout: false,
254253
AttachStderr: false,
255-
PortSpecs: null,
256254
Tty: false,
257255
OpenStdin: false,
258256
StdinOnce: false,

‎integration-cli/docker_api_containers_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,6 @@ func (s *DockerSuite) TestContainerApiPostCreateNull(c *check.C) {
842842
"AttachStdin":true,
843843
"AttachStdout":true,
844844
"AttachStderr":true,
845-
"PortSpecs":null,
846845
"ExposedPorts":{},
847846
"Tty":true,
848847
"OpenStdin":true,

‎integration-cli/docker_cli_build_test.go‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2406,31 +2406,6 @@ func (s *DockerSuite) TestBuildExposeUpperCaseProto(c *check.C) {
24062406
}
24072407
}
24082408

2409-
func (s *DockerSuite) TestBuildExposeHostPort(c *check.C) {
2410-
// start building docker file with ip:hostPort:containerPort
2411-
name := "testbuildexpose"
2412-
expected := "map[5678/tcp:{}]"
2413-
_, out, err := buildImageWithOut(name,
2414-
`FROM scratch
2415-
EXPOSE 192.168.1.2:2375:5678`,
2416-
true)
2417-
if err != nil {
2418-
c.Fatal(err)
2419-
}
2420-
2421-
if !strings.Contains(out, "to map host ports to container ports (ip:hostPort:containerPort) is deprecated.") {
2422-
c.Fatal("Missing warning message")
2423-
}
2424-
2425-
res, err := inspectField(name, "Config.ExposedPorts")
2426-
if err != nil {
2427-
c.Fatal(err)
2428-
}
2429-
if res != expected {
2430-
c.Fatalf("Exposed ports %s, expected %s", res, expected)
2431-
}
2432-
}
2433-
24342409
func (s *DockerSuite) TestBuildEmptyEntrypointInheritance(c *check.C) {
24352410
name := "testbuildentrypointinheritance"
24362411
name2 := "testbuildentrypointinheritance2"

0 commit comments

Comments
 (0)