fix(loader): Allows multiple protocols on one port

Merge pull request #5796 from vvoland/update-go-27.x
[27.x] update to go1.22.12
2025-12-30 11:42:32 +01:00 · 2025-02-05 19:24:30 +01:00 · 2025-02-04 20:36:34 +01:00 · 2025-01-22 00:46:20 +01:00 · 2025-01-21 11:31:54 +01:00 · 2025-01-21 11:31:12 +01:00
15 changed files with 37 additions and 15 deletions
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@ -14,6 +14,7 @@ on:
    branches: 
      - 'master' 
      - '[0-9]+.[0-9]+' 
+      - '[0-9]+.x'
    tags: 
      - 'v*' 
  pull_request:
@ -67,7 +68,7 @@ jobs:
        name: Update Go
        uses: actions/setup-go@v5
        with:
-          go-version: "1.22.10"
+          go-version: "1.22.12"
      -
        name: Initialize CodeQL
        uses: github/codeql-action/init@v3
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@ -19,6 +19,7 @@ on:
    branches:
      - 'master'
      - '[0-9]+.[0-9]+'
+      - '[0-9]+.x'
    tags:
      - 'v*'
  pull_request:
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -19,6 +19,7 @@ on:
    branches:
      - 'master'
      - '[0-9]+.[0-9]+'
+      - '[0-9]+.x'
    tags:
      - 'v*'
  pull_request:
@ -74,7 +75,7 @@ jobs:
        name: Set up Go
        uses: actions/setup-go@v5
        with:
-          go-version: "1.22.10"
+          go-version: "1.22.12"
      -
        name: Test
        run: |
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@ -19,6 +19,7 @@ on:
    branches:
      - 'master'
      - '[0-9]+.[0-9]+'
+      - '[0-9]+.x'
    tags:
      - 'v*'
  pull_request:
--- a/6
+++ b/6
@ -4,12 +4,12 @@ ARG BASE_VARIANT=alpine
 ARG ALPINE_VERSION=3.20
 ARG BASE_DEBIAN_DISTRO=bookworm

-ARG GO_VERSION=1.22.10
+ARG GO_VERSION=1.22.12
 ARG XX_VERSION=1.6.1
 ARG GOVERSIONINFO_VERSION=v1.3.0
 ARG GOTESTSUM_VERSION=v1.10.0
-ARG BUILDX_VERSION=0.18.0
-ARG COMPOSE_VERSION=v2.30.3
+ARG BUILDX_VERSION=0.20.0
+ARG COMPOSE_VERSION=v2.32.4

 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx

--- a/cli/compose/loader/merge.go
+++ b/cli/compose/loader/merge.go
@ -117,7 +117,11 @@ func toServicePortConfigsMap(s any) (map[any]any, error) {
 	}
 	m := map[any]any{}
 	for _, p := range ports {
-		m[p.Published] = p
+		protocol := "tcp"
+		if p.Protocol != "" {
+			protocol = p.Protocol
+		}
+		m[fmt.Sprintf("%d%s", p.Published, protocol)] = p
 	}
 	return m, nil
 }
--- a/cli/compose/loader/merge_test.go
+++ b/cli/compose/loader/merge_test.go
@ -848,6 +848,8 @@ func TestLoadMultipleConfigs(t *testing.T) {
 				"ports": []any{
 					"8080:80",
 					"9090:90",
+					"53:53/tcp",
+					"53:53/udp",
 				},
 				"labels": []any{
 					"foo=bar",
@ -925,6 +927,18 @@ func TestLoadMultipleConfigs(t *testing.T) {
 					},
 				},
 				Ports: []types.ServicePortConfig{
+					{
+						Mode:      "ingress",
+						Target:    53,
+						Published: 53,
+						Protocol:  "tcp",
+					},
+					{
+						Mode:      "ingress",
+						Target:    53,
+						Published: 53,
+						Protocol:  "udp",
+					},
 					{
 						Target:    81,
 						Published: 8080,
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@ -1,5 +1,5 @@
 variable "GO_VERSION" {
-    default = "1.22.10"
+    default = "1.22.12"
 }
 variable "VERSION" {
    default = ""
--- a/dockerfiles/Dockerfile.dev
+++ b/dockerfiles/Dockerfile.dev
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.22.10
+ARG GO_VERSION=1.22.12
 ARG ALPINE_VERSION=3.20

 ARG BUILDX_VERSION=0.17.1
--- a/dockerfiles/Dockerfile.lint
+++ b/dockerfiles/Dockerfile.lint
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.22.10
+ARG GO_VERSION=1.22.12
 ARG ALPINE_VERSION=3.20
 ARG GOLANGCI_LINT_VERSION=v1.62.0

--- a/dockerfiles/Dockerfile.vendor
+++ b/dockerfiles/Dockerfile.vendor
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.22.10
+ARG GO_VERSION=1.22.12
 ARG ALPINE_VERSION=3.20
 ARG MODOUTDATED_VERSION=v0.8.0

--- a/e2e/testdata/Dockerfile.gencerts
+++ b/e2e/testdata/Dockerfile.gencerts
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.22.10
+ARG GO_VERSION=1.22.12

 FROM golang:${GO_VERSION}-alpine AS generated
 ENV GOTOOLCHAIN=local
--- a/vendor.mod
+++ b/vendor.mod
@ -13,7 +13,7 @@ require (
 	github.com/distribution/reference v0.6.0
 	github.com/docker/cli-docs-tool v0.8.0
 	github.com/docker/distribution v2.8.3+incompatible
-	github.com/docker/docker v27.5.0-rc.2.0.20250110143909-38b84dce32c4+incompatible
+	github.com/docker/docker v27.5.0+incompatible
 	github.com/docker/docker-credential-helpers v0.8.2
 	github.com/docker/go-connections v0.5.0
 	github.com/docker/go-units v0.5.0
--- a/vendor.sum
+++ b/vendor.sum
@ -57,8 +57,8 @@ github.com/docker/cli-docs-tool v0.8.0/go.mod h1:8TQQ3E7mOXoYUs811LiPdUnAhXrcVsB
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v27.5.0-rc.2.0.20250110143909-38b84dce32c4+incompatible h1:DmENC/RGni9+O5DVOS5LeJFbbzYZZSnyhz7XJTbKoPY=
-github.com/docker/docker v27.5.0-rc.2.0.20250110143909-38b84dce32c4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v27.5.0+incompatible h1:um++2NcQtGRTz5eEgO6aJimo6/JxrTXC941hd05JO6U=
+github.com/docker/docker v27.5.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
 github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@ -55,7 +55,7 @@ github.com/docker/distribution/registry/client/transport
 github.com/docker/distribution/registry/storage/cache
 github.com/docker/distribution/registry/storage/cache/memory
 github.com/docker/distribution/uuid
-# github.com/docker/docker v27.5.0-rc.2.0.20250110143909-38b84dce32c4+incompatible
+# github.com/docker/docker v27.5.0+incompatible
 ## explicit
 github.com/docker/docker/api
 github.com/docker/docker/api/types
Author	SHA1	Message	Date
p4u1	2c1d5afde6	fix(loader): Allows multiple protocols on one port Some checks failed build / plugins (push) Has been cancelled Details codeql / codeql (push) Has been cancelled Details e2e / e2e (alpine, 23, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 23, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 23, non-experimental) (push) Has been cancelled Details e2e / e2e (alpine, 26.1, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 26.1, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 26.1, non-experimental) (push) Has been cancelled Details e2e / e2e (alpine, 27, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 27, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 27, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 23, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 23, experimental) (push) Has been cancelled Details e2e / e2e (debian, 23, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 26.1, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 26.1, experimental) (push) Has been cancelled Details e2e / e2e (debian, 26.1, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 27, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 27, experimental) (push) Has been cancelled Details e2e / e2e (debian, 27, non-experimental) (push) Has been cancelled Details test / ctn (push) Has been cancelled Details test / host (macos-13) (push) Has been cancelled Details test / host (macos-14) (push) Has been cancelled Details validate / validate (lint) (push) Has been cancelled Details validate / validate (shellcheck) (push) Has been cancelled Details validate / validate (update-authors) (push) Has been cancelled Details validate / validate (validate-vendor) (push) Has been cancelled Details validate / validate-md (push) Has been cancelled Details validate / validate-make (manpages) (push) Has been cancelled Details validate / validate-make (yamldocs) (push) Has been cancelled Details	2025-12-30 11:42:32 +01:00
Sebastiaan van Stijn	915f5cf25d	Merge pull request #5796 from vvoland/update-go-27.x [27.x] update to go1.22.12	2025-02-05 19:24:30 +01:00
Paweł Gronowski	6ee2756538	update to go1.22.12 - https://github.com/golang/go/issues?q=milestone%3AGo1.22.12+label%3ACherryPickApproved - full diff: https://github.com/golang/go/compare/go1.22.11...go1.22.12 This minor release include 1 security fix following the security policy: - crypto/elliptic: timing sidechannel for P-256 on ppc64le Due to the usage of a variable time instruction in the assembly implementation of an internal function, a small number of bits of secret scalars are leaked on the ppc64le architecture. Due to the way this function is used, we do not believe this leakage is enough to allow recovery of the private key when P-256 is used in any well known protocols. This is CVE-2025-22866 and Go issue https://go.dev/issue/71383. View the release notes for more information: https://go.dev/doc/devel/release#go1.22.12 Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2025-02-04 20:36:34 +01:00
Sebastiaan van Stijn	9f9e405801	Merge pull request #5759 from thaJeztah/27.x_vendor_docker_27.5.0 Some checks failed build / plugins (push) Has been cancelled Details codeql / codeql (push) Has been cancelled Details e2e / e2e (alpine, 23, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 23, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 23, non-experimental) (push) Has been cancelled Details e2e / e2e (alpine, 26.1, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 26.1, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 26.1, non-experimental) (push) Has been cancelled Details e2e / e2e (alpine, 27, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 27, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 27, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 23, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 23, experimental) (push) Has been cancelled Details e2e / e2e (debian, 23, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 26.1, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 26.1, experimental) (push) Has been cancelled Details e2e / e2e (debian, 26.1, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 27, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 27, experimental) (push) Has been cancelled Details e2e / e2e (debian, 27, non-experimental) (push) Has been cancelled Details test / ctn (push) Has been cancelled Details test / host (macos-13) (push) Has been cancelled Details test / host (macos-14) (push) Has been cancelled Details validate / validate (lint) (push) Has been cancelled Details validate / validate (shellcheck) (push) Has been cancelled Details validate / validate (update-authors) (push) Has been cancelled Details validate / validate (validate-vendor) (push) Has been cancelled Details validate / validate-md (push) Has been cancelled Details validate / validate-make (manpages) (push) Has been cancelled Details validate / validate-make (yamldocs) (push) Has been cancelled Details [27.x] vendor: github.com/docker/docker v27.5.0	2025-01-22 00:46:20 +01:00
Paweł Gronowski	d7cd22f0a2	Merge pull request #5762 from thaJeztah/27.x_bump_golang_1.22.11 [27.x] update to go1.22.11 (fix CVE-2024-45341, CVE-2024-45336)	2025-01-21 11:31:54 +01:00
Paweł Gronowski	0e2d4fe890	Merge pull request #5766 from thaJeztah/27.x_backport_bump_dev_tools [27.x backport] Dockerfile: dev-container: update buildx v0.20.0, compose v2.32.4	2025-01-21 11:31:12 +01:00
Sebastiaan van Stijn	fbc0a73b35	Dockerfile: update compose to v2.32.4 Update the compose cli plugin used in the dev-container full diff: https://github.com/docker/compose/compare/v2.30.3...v2.32.4 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `1546f023fb`) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-01-21 10:05:59 +01:00
Sebastiaan van Stijn	777695f6d5	Dockerfile: update buildx to v0.20.0 Update the buildx cli plugin used in the dev-container full diff: https://github.com/docker/buildx/compare/v0.18.0..v0.20.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `7b07242708`) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-01-21 10:05:57 +01:00
Sebastiaan van Stijn	092d23532c	Merge pull request #5764 from vvoland/5763-27.x [27.x backport] gha: Adjust release branches	2025-01-20 22:12:08 +01:00
Paweł Gronowski	fa1ba052d6	gha: Adjust release branches Adjust all workflows to also run on branches like `27.x` Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit `81b0bb58ba`) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2025-01-20 18:24:03 +01:00
Sebastiaan van Stijn	1ccfae7946	update to go1.22.11 (fix CVE-2024-45341, CVE-2024-45336) go1.22.11 (released 2025-01-16) includes security fixes to the crypto/x509 and net/http packages, as well as bug fixes to the runtime. See the Go 1.22.11 milestone on our issue tracker for details. - https://github.com/golang/go/issues?q=milestone%3AGo1.22.11+label%3ACherryPickApproved - full diff: https://github.com/golang/go/compare/go1.22.10...go1.22.11 Hello gophers, We have just released Go versions 1.23.5 and 1.22.11, minor point releases. These minor releases include 2 security fixes following the security policy: - crypto/x509: usage of IPv6 zone IDs can bypass URI name constraints A certificate with a URI which has a IPv6 address with a zone ID may incorrectly satisfy a URI name constraint that applies to the certificate chain. Certificates containing URIs are not permitted in the web PKI, so this only affects users of private PKIs which make use of URIs. Thanks to Juho Forsén of Mattermost for reporting this issue. This is CVE-2024-45341 and Go issue https://go.dev/issue/71156. - net/http: sensitive headers incorrectly sent after cross-domain redirect The HTTP client drops sensitive headers after following a cross-domain redirect. For example, a request to a.com/ containing an Authorization header which is redirected to b.com/ will not send that header to b.com. In the event that the client received a subsequent same-domain redirect, however, the sensitive headers would be restored. For example, a chain of redirects from a.com/, to b.com/1, and finally to b.com/2 would incorrectly send the Authorization header to b.com/2. Thanks to Kyle Seely for reporting this issue. This is CVE-2024-45336 and Go issue https://go.dev/issue/70530. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-01-20 16:08:27 +01:00
Sebastiaan van Stijn	397c2f87d5	vendor: github.com/docker/docker v27.5.0 no diff: same commit, but tagged; https://github.com/docker/docker/compare/38b84dce32c4...v27.5.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-01-20 11:01:41 +01:00