Simple Game Server Example: Upgrade Docker to 24.0.6 (#3531)

* Upgrade Docker to 24.0.6

* included --use

* reveiw changes

* && included

* Increment simpleGS version number

* include DOCKER_CLI_EXPERIMENTAL=enabled

---------

Co-authored-by: Mengye (Max) Gong <[email protected]>

examples/simple-game-server/Makefile

@@ -39,9 +39,9 @@ WITH_ARM64 ?= 1
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
 ifeq ($(REPOSITORY),)
-	server_tag := simple-game-server:0.22
+	server_tag := simple-game-server:0.23
 else
-	server_tag := $(REPOSITORY)/simple-game-server:0.22
+	server_tag := $(REPOSITORY)/simple-game-server:0.23
 endif
 
 ifeq ($(WITH_WINDOWS), 1)
@@ -87,13 +87,9 @@ endif
 ifeq ($(WITH_ARM64), 1)
 push: push-linux-image-arm64
 endif
-	-docker manifest rm $(server_tag)
-	docker manifest create $(server_tag) $(push_server_manifest)
-	docker manifest push $(server_tag) --purge
-	# TODO: Update to replace `docker manifest` commands if/when the above commands fail (~Docker 24.x)
-    # Fails with Docker <=20.10.21
-	#docker buildx imagetools create --tag $(server_tag) \
-    	#$(push_server_manifest)
+    # Docker >=24.0.6
+	docker buildx imagetools create --tag $(server_tag) \
+    	$(push_server_manifest)
 
 # Pushes all variants of the Windows images to the container image registry.
 push-linux-image-amd64: build
@@ -114,12 +110,9 @@ build-windows-image-%: ensure-windows-buildx
 	 	--tag=$(server_tag)-windows_amd64-$* --build-arg WINDOWS_VERSION=$* . $(WINDOWS_DOCKER_PUSH_ARGS)
 
 ensure-windows-buildx:
-	# TODO: Remove `--use` and specify `--builder` for each buildx command once Docker 19.03.13 is available.
-	# `--use` sets the global default buildx context to $(BUILDX_WINDOWS_BUILDER).
-	#
-	# Windows image builds must be directed to a specific buildx context.
-	# The default context does not support building cross platform images.
-	-DOCKER_CLI_EXPERIMENTAL=enabled docker buildx create --name=$(BUILDX_WINDOWS_BUILDER) --use
+# Windows image builds must be directed to a specific buildx context.
+# The default context does not support building cross platform images.
+	-docker buildx create --name=$(BUILDX_WINDOWS_BUILDER) --use
 
 # Build a docker image for the server, and tag it
 build-linux-image-amd64:

examples/simple-game-server/cloudbuild.yaml

@@ -18,8 +18,8 @@ steps:
   #
   - name: ubuntu
     script: |
-      echo 'FROM gcr.io/cloud-builders/docker\nRUN apt-get install make\nENTRYPOINT [\"/usr/bin/make\"]' > Dockerfile.build
-  - name: gcr.io/cloud-builders/docker
+      echo 'FROM gcr.io/cloud-builders/docker:24.0.6\nRUN apt-get install make\nENTRYPOINT [\"/usr/bin/make\"]' > Dockerfile.build
+  - name: gcr.io/cloud-builders/docker:24.0.6
     id: build-make-docker
     entrypoint: docker
     args: [build, -f, Dockerfile.build, -t, make-docker, .]

examples/simple-game-server/dev-gameserver.yaml

@@ -31,4 +31,4 @@ spec:
     spec:
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.22
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.23

examples/simple-game-server/fleet-distributed.yaml

@@ -32,7 +32,7 @@ spec:
         spec:
           containers:
             - name: simple-game-server
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.22
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.23
               resources:
                 requests:
                   memory: 64Mi

examples/simple-game-server/fleet-tcp.yaml

@@ -28,7 +28,7 @@ spec:
         spec:
           containers:
             - name: simple-game-server
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.22
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.23
               env:
                 # Disables the UDP listener (Enabled by default)
                 - name: UDP

examples/simple-game-server/fleet.yaml

@@ -27,7 +27,7 @@ spec:
         spec:
           containers:
             - name: simple-game-server
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.22
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.23
               resources:
                 requests:
                   memory: 64Mi

examples/simple-game-server/gameserver-passthrough.yaml

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.22
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.23
           env:
             - name: PASSTHROUGH
               value: 'TRUE'

examples/simple-game-server/gameserver-windows.yaml

@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.22
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.23
           resources:
             requests:
               memory: 64Mi

examples/simple-game-server/gameserver.yaml

@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.22
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.23
           resources:
             requests:
               memory: 64Mi