Merge 038d3ea003 into 917d2dc837

Add --ip-filter-forward-drop to dockerd cmdline ref
Signed-off-by: Rob Murray <rob.murray@docker.com>
2024-11-07 08:13:21 -08:00 · 2024-11-07 16:13:05 +00:00 · 2024-11-07 14:42:18 +01:00 · 2024-11-07 13:56:47 +01:00 · 2024-11-07 13:24:16 +01:00 · 2024-11-07 09:38:19 +00:00
11 changed files with 12 additions and 11 deletions
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@ -62,7 +62,7 @@ jobs:
        name: Update Go
        uses: actions/setup-go@v5
        with:
-          go-version: 1.23.2
+          go-version: 1.23.3
      -
        name: Initialize CodeQL
        uses: github/codeql-action/init@v3
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -68,7 +68,7 @@ jobs:
        name: Set up Go
        uses: actions/setup-go@v5
        with:
-          go-version: 1.23.2
+          go-version: 1.23.3
      -
        name: Test
        run: |
--- a/.golangci.yml
+++ b/.golangci.yml
@ -43,7 +43,7 @@ linters:
 run:
  # prevent golangci-lint from deducting the go version to lint for through go.mod,
  # which causes it to fallback to go1.17 semantics.
-  go: "1.23.2"
+  go: "1.23.3"
  timeout: 5m

 linters-settings:
--- a/2
+++ b/2
@ -4,7 +4,7 @@ ARG BASE_VARIANT=alpine
 ARG ALPINE_VERSION=3.20
 ARG BASE_DEBIAN_DISTRO=bookworm

-ARG GO_VERSION=1.23.2
+ARG GO_VERSION=1.23.3
 ARG XX_VERSION=1.5.0
 ARG GOVERSIONINFO_VERSION=v1.3.0
 ARG GOTESTSUM_VERSION=v1.10.0
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@ -1,5 +1,5 @@
 variable "GO_VERSION" {
-    default = "1.23.2"
+    default = "1.23.3"
 }
 variable "VERSION" {
    default = ""
--- a/dockerfiles/Dockerfile.dev
+++ b/dockerfiles/Dockerfile.dev
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.23.2
+ARG GO_VERSION=1.23.3
 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.23.2
+ARG GO_VERSION=1.23.3
 ARG ALPINE_VERSION=3.20
 ARG GOLANGCI_LINT_VERSION=v1.61.0

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

-ARG GO_VERSION=1.23.2
+ARG GO_VERSION=1.23.3
 ARG ALPINE_VERSION=3.20
 ARG MODOUTDATED_VERSION=v0.8.0

--- a/docs/reference/commandline/container_run.md
+++ b/docs/reference/commandline/container_run.md
@ -1283,7 +1283,7 @@ connect to services running on the host machine.

 It's conventional to use `host.docker.internal` as the hostname referring to
 `host-gateway`. Docker Desktop automatically resolves this hostname, see
-[Explore networking features](https://docs.docker.com/desktop/networking/#i-want-to-connect-from-a-container-to-a-service-on-the-host).
+[Explore networking features](https://docs.docker.com/desktop/features/networking/#i-want-to-connect-from-a-container-to-a-service-on-the-host).

 The following example shows how the special `host-gateway` value works. The
 example runs an HTTP server that serves a file from host to container over the
--- a/docs/reference/dockerd.md
+++ b/docs/reference/dockerd.md
@ -71,7 +71,8 @@ Options:
      --init-path string                      Path to the docker-init binary
      --insecure-registry list                Enable insecure registry communication
      --ip ip                                 Default IP when binding container ports (default 0.0.0.0)
-      --ip-forward                            Enable net.ipv4.ip_forward (default true)
+      --ip-forward                            Enable IP forwarding in system configuration (default true)
+      --ip-forward-no-drop                    Do not set the filter-FORWARD policy to DROP when enabling IP forwarding
      --ip-masq                               Enable IP masquerading (default true)
      --ip6tables                             Enable addition of ip6tables rules (experimental)
      --iptables                              Enable addition of iptables rules (default true)
--- a/e2e/testdata/Dockerfile.gencerts
+++ b/e2e/testdata/Dockerfile.gencerts
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.23.2
+ARG GO_VERSION=1.23.3

 FROM golang:${GO_VERSION}-alpine AS generated
 ENV GOTOOLCHAIN=local
Author	SHA1	Message	Date
Rob Murray	bfa434ebd9	Merge `038d3ea003` into `917d2dc837`	2024-11-07 08:13:21 -08:00
Rob Murray	038d3ea003	Add --ip-filter-forward-drop to dockerd cmdline ref Signed-off-by: Rob Murray <rob.murray@docker.com>	2024-11-07 16:13:05 +00:00
Sebastiaan van Stijn	917d2dc837	Merge pull request #5601 from vvoland/update-go update to go1.23.3	2024-11-07 14:42:18 +01:00
Sebastiaan van Stijn	f9497b8a46	Merge pull request #5600 from aevesdocker/desktop-link-fix docs: change link to desktop docs	2024-11-07 13:56:47 +01:00
Paweł Gronowski	382d4c34a9	update to go1.23.3 - https://github.com/golang/go/issues?q=milestone%3AGo1.23.3+label%3ACherryPickApproved - full diff: https://github.com/golang/go/compare/go1.23.2...go1.23.3 go1.23.3 (released 2024-11-06) includes fixes to the linker, the runtime, and the net/http, os, and syscall packages. See the [Go 1.23.3 milestone](https://github.com/golang/go/issues?q=milestone%3AGo1.23.3+label%3ACherryPickApproved) for details. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2024-11-07 13:24:16 +01:00
aevesdocker	1440f9f8cf	docs: change link to desktop docs Signed-off-by: aevesdocker <allie.sadler@docker.com>	2024-11-07 09:38:19 +00:00