3 files changed, 25 insertions, 23 deletions

diff --git a/recipes-containers/docker/docker-moby_git.bb b/recipes-containers/docker/docker-moby_git.bb
index 0aed206a..19f4763b 100644
--- a/recipes-containers/docker/docker-moby_git.bb
+++ b/recipes-containers/docker/docker-moby_git.bb
@@ -34,14 +34,14 @@ DESCRIPTION = "Linux container runtime \
 #   - The common components of this recipe and docker-ce do need to be moved
 #     to a docker.inc recipe
 
-SRCREV_moby = "3fd34324a8abc7573fa3b06190a1338263ef1ee7"
-SRCREV_libnetwork = "dcdf8f176d1e13ad719e913e796fb698d846de98"
-SRCREV_cli = "83ca73f9aa7a1c442171ef2602af4d303d9de9c2"
+SRCREV_moby = "bc3805a0a0d3b5bd3f0e6c69f46ac08dd53377c7"
+SRCREV_libnetwork = "05b93e0d3a95952f70c113b0bc5bdb538d7afdd7"
+SRCREV_cli = "a5ee5b1dfc9b8f08ed9e020bb54fc18550173ef6"
 SRCREV_FORMAT = "moby_libnetwork"
 SRC_URI = "\
         git://github.com/moby/moby.git;branch=23.0;name=moby;protocol=https \
         git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork;protocol=https \
-        git://github.com/docker/cli;branch=master;name=cli;destsuffix=git/cli;protocol=https \
+        git://github.com/docker/cli;branch=23.0;name=cli;destsuffix=git/cli;protocol=https \
         file://docker.init \
         file://0001-libnetwork-use-GO-instead-of-go.patch \
         file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \
@@ -56,7 +56,7 @@ require docker.inc
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=4859e97a9c7780e77972d989f0823f28"
 
-DOCKER_VERSION = "23.0-beta"
+DOCKER_VERSION = "23.0.1"
 PV = "${DOCKER_VERSION}+git${SRCREV_moby}"
 
 CVE_PRODUCT = "docker mobyproject:moby"
diff --git a/recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch b/recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch
index c19d9f50..c10e69d3 100644
--- a/recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch
+++ b/recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch
@@ -14,12 +14,12 @@ Index: git/src/import/hack/make/.binary
 ===================================================================
 --- git.orig/src/import/hack/make/.binary
 +++ git/src/import/hack/make/.binary
-@@ -81,7 +81,7 @@
+@@ -66,7 +66,7 @@
+        if [ -n "$DOCKER_DEBUG" ]; then
+                set -x
+        fi
+-       go build -o "$DEST/$BINARY_FULLNAME" "${BUILDFLAGS[@]}" -ldflags "$LDFLAGS $LDFLAGS_STATIC $DOCKER_LDFLAGS" ${GO_PACKAGE}
++       ${GO} build -trimpath -o "$DEST/$BINARY_FULLNAME" "${BUILDFLAGS[@]}" -ldflags "$LDFLAGS $LDFLAGS_STATIC $DOCKER_LDFLAGS" ${GO_PACKAGE}
+ )
  
-        echo "Building: $DEST/$BINARY_FULLNAME"
-        echo "GOOS=\"${GOOS}\" GOARCH=\"${GOARCH}\" GOARM=\"${GOARM}\""
--       go build \
-+       ${GO} build -trimpath \
-                -o "$DEST/$BINARY_FULLNAME" \
-                "${BUILDFLAGS[@]}" \
-                -ldflags "
+ echo "Created binary: $DEST/$BINARY_FULLNAME"
diff --git a/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch b/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch
index 10b180b6..f94f73e4 100644
--- a/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch
+++ b/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch
@@ -17,27 +17,29 @@ Index: git/libnetwork/Makefile
 ===================================================================
 --- git.orig/libnetwork/Makefile
 +++ git/libnetwork/Makefile
-@@ -45,9 +45,9 @@
+@@ -45,10 +45,10 @@
  build-local:
         @echo "🐳 $@"
         @mkdir -p "bin"
--       go build -tags experimental -o "bin/dnet" ./cmd/dnet
--       go build -o "bin/docker-proxy" ./cmd/proxy
+-       GO111MODULE=off go build -tags experimental -o "bin/dnet" ./cmd/dnet
+-       GO111MODULE=off go build -o "bin/docker-proxy" ./cmd/proxy
 -       CGO_ENABLED=0 go build -o "bin/diagnosticClient" ./cmd/diagnostic
-+       $(GO) build -trimpath -tags experimental -o "bin/dnet" ./cmd/dnet
-+       $(GO) build -trimpath -o "bin/proxy" ./cmd/proxy
+-       CGO_ENABLED=0 go build -o "bin/testMain" ./cmd/networkdb-test/testMain.go
++       GO111MODULE=off $(GO) build -trimpath -tags experimental -o "bin/dnet" ./cmd/dnet
++       GO111MODULE=off $(GO) build -trimpath -o "bin/docker-proxy" ./cmd/proxy
 +       CGO_ENABLED=0 $(GO) build -trimpath -o "bin/diagnosticClient" ./cmd/diagnostic
-        CGO_ENABLED=0 go build -o "bin/testMain" ./cmd/networkdb-test/testMain.go
++       CGO_ENABLED=0 $(GO) build -trimpath -o "bin/testMain" ./cmd/networkdb-test/testMain.go
  
  build-images:
+        @echo "🐳 $@"
 @@ -82,8 +82,8 @@
  
  cross-local:
         @echo "🐳 $@"
--       go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet
--       go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy
-+       @$(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy
-+       @$(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet
+-       GO111MODULE=off go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet
+-       GO111MODULE=off go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy
++       GO111MODULE=off $(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet
++       GO111MODULE=off $(GO) build -trimpath  $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy
  
  # Rebuild protocol buffers.
  # These may need to be rebuilt after vendoring updates, so .proto files are declared .PHONY so they are always rebuilt.