Make Go debugger configuration consistent

MatthewL246 · Aug 7, 2024 · 6f2634d · 6f2634d
1 parent 70cf197
commit 6f2634d
Show file tree

Hide file tree

Showing 12 changed files with 135 additions and 105 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -88,6 +88,33 @@
             "debugAdapter": "legacy",
             "port": 2348,
             "host": "127.0.0.1"
+        },
+        {
+            "type": "go",
+            "request": "attach",
+            "name": "Debug splatoon",
+            "mode": "remote",
+            "debugAdapter": "legacy",
+            "port": 2349,
+            "host": "127.0.0.1"
+        },
+        {
+            "type": "go",
+            "request": "attach",
+            "name": "Debug minecraft-wiiu",
+            "mode": "remote",
+            "debugAdapter": "legacy",
+            "port": 2350,
+            "host": "127.0.0.1"
+        },
+        {
+            "type": "go",
+            "request": "attach",
+            "name": "Debug pikmin-3",
+            "mode": "remote",
+            "debugAdapter": "legacy",
+            "port": 2351,
+            "host": "127.0.0.1"
         }
     ]
 }
diff --git a/.vscode/pretendo-docker.code-workspace b/.vscode/pretendo-docker.code-workspace
@@ -24,9 +24,18 @@
         {
             "path": "../repos/miiverse-api"
         },
+        {
+            "path": "../repos/minecraft-wiiu"
+        },
         {
             "path": "../repos/mitmproxy-pretendo"
         },
+        {
+            "path": "../repos/pikmin-3"
+        },
+        {
+            "path": "../repos/splatoon"
+        },
         {
             "path": "../repos/SSSL"
         },

diff --git a/compose.yml b/compose.yml
@@ -375,7 +375,7 @@ services:
     restart: always
     ports:
       # Go delve debugger
-      - 127.0.0.1:2346:2346
+      - 127.0.0.1:2346:2345
       # Authentication server
       - 6002:6002/udp
     networks:
@@ -394,7 +394,7 @@ services:
     restart: always
     ports:
       # Go delve debugger
-      - 127.0.0.1:2347:2347
+      - 127.0.0.1:2347:2345
       # Secure server
       - 6003:6003/udp
     networks:
@@ -413,7 +413,7 @@ services:
     restart: always
     ports:
       # Go delve debugger
-      - 127.0.0.1:2348:2348
+      - 127.0.0.1:2348:2345
       # Authentication server
       - 6004:6004/udp
       # Secure server
@@ -433,7 +433,7 @@ services:
     restart: unless-stopped
     ports:
       # Go delve debugger
-      - 127.0.0.1:2351:2350
+      - 127.0.0.1:2349:2345
       # Authentication server
       - 6006:6006/udp
       # Secure server
@@ -452,7 +452,7 @@ services:
     restart: unless-stopped
     ports:
       # Go delve debugger
-      - 127.0.0.1:2352:2350
+      - 127.0.0.1:2350:2345
       # Authentication server
       - 6008:6008/udp
       # Secure server
@@ -472,7 +472,7 @@ services:
     restart: unless-stopped
     ports:
       # Go delve debugger
-      - 127.0.0.1:2353:2353
+      - 127.0.0.1:2351:2349
       # Authentication server
       - 6010:6010/udp
       # Secure server

diff --git a/patches/friends/dockerfile-enable-debugging.patch b/patches/friends/dockerfile-enable-debugging.patch
@@ -1,8 +1,8 @@
 diff --git i/Dockerfile w/Dockerfile
-index 8d3c4c1..055911b 100644
+index 20b2b7a..60e3ee3 100644
 --- i/Dockerfile
 +++ w/Dockerfile
-@@ -9,6 +9,8 @@ ARG app_dir build_string=pretendo.friends.docker
+@@ -10,6 +10,8 @@ ARG build_string=pretendo.friends.docker
 
  WORKDIR ${app_dir}
 
@@ -11,7 +11,7 @@ index 8d3c4c1..055911b 100644
  RUN --mount=type=cache,target=/go/pkg/mod/ \
  	--mount=type=bind,source=go.sum,target=go.sum \
  	--mount=type=bind,source=go.mod,target=go.mod \
-@@ -16,7 +18,7 @@ RUN --mount=type=cache,target=/go/pkg/mod/ \
+@@ -17,7 +19,7 @@ RUN --mount=type=cache,target=/go/pkg/mod/ \
 
  COPY . .
  RUN --mount=type=cache,target=/go/pkg/mod/ \
@@ -20,7 +20,7 @@ index 8d3c4c1..055911b 100644
 
 
  # * Running the final application
-@@ -31,6 +33,7 @@ RUN chown go:go ${app_dir}/log
+@@ -31,6 +33,7 @@ RUN mkdir -p ${app_dir}/log && chown go:go ${app_dir}/log
 
  USER go
 

diff --git a/patches/minecraft-wiiu/adjust-docker.patch → ...ft-wiiu/dockerfile-enable-debugging.patch b/patches/minecraft-wiiu/adjust-docker.patch → ...ft-wiiu/dockerfile-enable-debugging.patch
@@ -1,7 +1,7 @@
-diff --git a/Dockerfile b/Dockerfile
-index 94effb5..902eb1e 100644
---- a/Dockerfile
-+++ b/Dockerfile
+diff --git i/Dockerfile w/Dockerfile
+index 94effb5..509b71c 100644
+--- i/Dockerfile
++++ w/Dockerfile
 @@ -9,6 +9,8 @@ ARG app_dir
 
  WORKDIR ${app_dir}
@@ -16,7 +16,7 @@ index 94effb5..902eb1e 100644
  ARG BUILD_STRING=pretendo.minecraftwiiu.docker
  RUN --mount=type=cache,target=/go/pkg/mod/ \
 -	CGO_ENABLED=0 go build -ldflags "-X 'main.serverBuildString=${BUILD_STRING}'" -v -o ${app_dir}/build/server
-+	CGO_ENABLED=0 go build -ldflags "-X 'main.serverBuildString=${BUILD_STRING}'" -v -o ${app_dir}/build/server -gcflags "all=-N -l"
++	CGO_ENABLED=0 go build -gcflags "all=-N -l" -ldflags "-X 'main.serverBuildString=${BUILD_STRING}'" -v -o ${app_dir}/build/server
 
 
  # * Running the final application
@@ -28,5 +28,4 @@ index 94effb5..902eb1e 100644
  COPY --from=build ${app_dir}/build/server ${app_dir}/server
 
 -CMD [ "./server" ]
-+CMD ["./dlv", "exec", "./server", "--listen=:2348", "--headless", "--api-version=2", "--log", "--accept-multiclient", "--continue"]
-\ No newline at end of file
++CMD ["./dlv", "exec", "./server", "--listen=:2345", "--headless", "--api-version=2", "--log", "--accept-multiclient", "--continue"]
diff --git a/patches/pikmin-3/adjust-docker.patch b/patches/pikmin-3/adjust-docker.patch
diff --git a/patches/pikmin-3/dockerfile-enable-debugging.patch b/patches/pikmin-3/dockerfile-enable-debugging.patch
@@ -0,0 +1,28 @@
+diff --git i/Dockerfile w/Dockerfile
+index 3e08c61..ca3fcf9 100644
+--- i/Dockerfile
++++ w/Dockerfile
+@@ -9,6 +9,8 @@ ARG app_dir
+
+ WORKDIR ${app_dir}
+
++RUN go install github.com/go-delve/delve/cmd/dlv@latest
++
+ RUN --mount=type=cache,target=/go/pkg/mod/ \
+ 	--mount=type=bind,source=go.sum,target=go.sum \
+ 	--mount=type=bind,source=go.mod,target=go.mod \
+@@ -17,7 +19,7 @@ RUN --mount=type=cache,target=/go/pkg/mod/ \
+ COPY . .
+ ARG BUILD_STRING=pretendo.pikmin3.docker
+ RUN --mount=type=cache,target=/go/pkg/mod/ \
+-	CGO_ENABLED=0 go build -ldflags "-X 'main.serverBuildString=${BUILD_STRING}'" -v -o ${app_dir}/build/server
++	CGO_ENABLED=0 go build -gcflags "all=-N -l" -ldflags "-X 'main.serverBuildString=${BUILD_STRING}'" -v -o ${app_dir}/build/server
+
+
+ # * Running the final application
+@@ -33,4 +35,4 @@ USER go
+
+ COPY --from=build ${app_dir}/build/server ${app_dir}/server
+
+-CMD [ "./server" ]
++CMD ["./dlv", "exec", "./server", "--listen=:2345", "--headless", "--api-version=2", "--log", "--accept-multiclient", "--continue"]
diff --git a/patches/splatoon/dockerfile-enable-debugging.patch b/patches/splatoon/dockerfile-enable-debugging.patch
@@ -0,0 +1,28 @@
+diff --git i/Dockerfile w/Dockerfile
+index fb8db39..93b708b 100644
+--- i/Dockerfile
++++ w/Dockerfile
+@@ -9,6 +9,8 @@ ARG app_dir
+
+ WORKDIR ${app_dir}
+
++RUN go install github.com/go-delve/delve/cmd/dlv@latest
++
+ RUN --mount=type=cache,target=/go/pkg/mod/ \
+ 	--mount=type=bind,source=go.sum,target=go.sum \
+ 	--mount=type=bind,source=go.mod,target=go.mod \
+@@ -16,7 +18,7 @@ RUN --mount=type=cache,target=/go/pkg/mod/ \
+
+ COPY . .
+ RUN --mount=type=cache,target=/go/pkg/mod/ \
+-	CGO_ENABLED=0 go build -v -o ${app_dir}/build/server
++	CGO_ENABLED=0 go build -gcflags "all=-N -l" -v -o ${app_dir}/build/server
+
+
+ # * Running the final application
+@@ -32,4 +34,4 @@ USER go
+
+ COPY --from=build ${app_dir}/build/server ${app_dir}/server
+
+-CMD [ "./server" ]
++CMD ["./dlv", "exec", "./server", "--listen=:2345", "--headless", "--api-version=2", "--log", "--accept-multiclient", "--continue"]
diff --git a/patches/splatoon/dockerize.patch b/patches/splatoon/dockerize.patch
diff --git a/patches/super-mario-maker/dockerfile-enable-debugging.patch b/patches/super-mario-maker/dockerfile-enable-debugging.patch
@@ -1,7 +1,7 @@
-diff --git a/Dockerfile b/Dockerfile
-index 2a929a4..b3366ea 100644
---- a/Dockerfile
-+++ b/Dockerfile
+diff --git i/Dockerfile w/Dockerfile
+index 2a929a4..4aa6bbe 100644
+--- i/Dockerfile
++++ w/Dockerfile
 @@ -9,6 +9,8 @@ ARG app_dir
 
  WORKDIR ${app_dir}
@@ -16,16 +16,13 @@ index 2a929a4..b3366ea 100644
  ARG BUILD_STRING=pretendo.supermariomaker.docker
  RUN --mount=type=cache,target=/go/pkg/mod/ \
 -	CGO_ENABLED=0 go build -ldflags "-X 'main.serverBuildString=${BUILD_STRING}'" -v -o ${app_dir}/build/server
-+	CGO_ENABLED=0 go build -ldflags "-X 'main.serverBuildString=${BUILD_STRING}'" -v -o ${app_dir}/build/server -gcflags "all=-N -l"
++	CGO_ENABLED=0 go build -gcflags "all=-N -l" -ldflags "-X 'main.serverBuildString=${BUILD_STRING}'" -v -o ${app_dir}/build/server
 
 
  # * Running the final application
-@@ -31,6 +33,7 @@ RUN mkdir -p ${app_dir}/log && chown go:go ${app_dir}/log
+@@ -33,4 +35,4 @@ USER go
 
- USER go
-
-+COPY --from=build /go/bin/dlv ${app_dir}/dlv
  COPY --from=build ${app_dir}/build/server ${app_dir}/server
 
 -CMD [ "./server" ]
-+CMD ["./dlv", "exec", "./server", "--listen=:2348", "--headless", "--api-version=2", "--log", "--accept-multiclient", "--continue"]
++CMD ["./dlv", "exec", "./server", "--listen=:2345", "--headless", "--api-version=2", "--log", "--accept-multiclient", "--continue"]
diff --git a/patches/wiiu-chat-authentication/dockerfile-enable-debugging.patch b/patches/wiiu-chat-authentication/dockerfile-enable-debugging.patch
@@ -1,8 +1,8 @@
-diff --git a/Dockerfile b/Dockerfile
-index fb8db39..7817e6a 100644
---- a/Dockerfile
-+++ b/Dockerfile
-@@ -9,6 +9,8 @@ ARG app_dir
+diff --git i/Dockerfile w/Dockerfile
+index 20b2b7a..60e3ee3 100644
+--- i/Dockerfile
++++ w/Dockerfile
+@@ -10,6 +10,8 @@ ARG build_string=pretendo.friends.docker
 
  WORKDIR ${app_dir}
 
@@ -11,21 +11,21 @@ index fb8db39..7817e6a 100644
  RUN --mount=type=cache,target=/go/pkg/mod/ \
  	--mount=type=bind,source=go.sum,target=go.sum \
  	--mount=type=bind,source=go.mod,target=go.mod \
-@@ -16,7 +18,7 @@ RUN --mount=type=cache,target=/go/pkg/mod/ \
+@@ -17,7 +19,7 @@ RUN --mount=type=cache,target=/go/pkg/mod/ \
 
  COPY . .
  RUN --mount=type=cache,target=/go/pkg/mod/ \
--	CGO_ENABLED=0 go build -v -o ${app_dir}/build/server
-+	CGO_ENABLED=0 go build -v -o ${app_dir}/build/server -gcflags "all=-N -l"
+-	CGO_ENABLED=0 go build -v -o ${app_dir}/build/server -ldflags "-X 'main.serverBuildString=${build_string}'"
++	CGO_ENABLED=0 go build -v -o ${app_dir}/build/server -gcflags "all=-N -l" -ldflags "-X 'main.serverBuildString=${build_string}'"
 
 
  # * Running the final application
-@@ -30,6 +32,7 @@ RUN mkdir -p ${app_dir}/log && chown go:go ${app_dir}/log
+@@ -31,6 +33,7 @@ RUN mkdir -p ${app_dir}/log && chown go:go ${app_dir}/log
 
  USER go
 
 +COPY --from=build /go/bin/dlv ${app_dir}/dlv
  COPY --from=build ${app_dir}/build/server ${app_dir}/server
 
 -CMD [ "./server" ]
-+CMD ["./dlv", "exec", "./server", "--listen=:2346", "--headless", "--api-version=2", "--log", "--accept-multiclient", "--continue"]
++CMD ["./dlv", "exec", "./server", "--listen=:2345", "--headless", "--api-version=2", "--log", "--accept-multiclient", "--continue"]
diff --git a/patches/wiiu-chat-secure/dockerfile-enable-debugging.patch b/patches/wiiu-chat-secure/dockerfile-enable-debugging.patch
@@ -1,8 +1,8 @@
-diff --git a/Dockerfile b/Dockerfile
-index fb8db39..08da995 100644
---- a/Dockerfile
-+++ b/Dockerfile
-@@ -9,6 +9,8 @@ ARG app_dir
+diff --git i/Dockerfile w/Dockerfile
+index 20b2b7a..60e3ee3 100644
+--- i/Dockerfile
++++ w/Dockerfile
+@@ -10,6 +10,8 @@ ARG build_string=pretendo.friends.docker
 
  WORKDIR ${app_dir}
 
@@ -11,21 +11,21 @@ index fb8db39..08da995 100644
  RUN --mount=type=cache,target=/go/pkg/mod/ \
  	--mount=type=bind,source=go.sum,target=go.sum \
  	--mount=type=bind,source=go.mod,target=go.mod \
-@@ -16,7 +18,7 @@ RUN --mount=type=cache,target=/go/pkg/mod/ \
+@@ -17,7 +19,7 @@ RUN --mount=type=cache,target=/go/pkg/mod/ \
 
  COPY . .
  RUN --mount=type=cache,target=/go/pkg/mod/ \
--	CGO_ENABLED=0 go build -v -o ${app_dir}/build/server
-+	CGO_ENABLED=0 go build -v -o ${app_dir}/build/server -gcflags "all=-N -l"
+-	CGO_ENABLED=0 go build -v -o ${app_dir}/build/server -ldflags "-X 'main.serverBuildString=${build_string}'"
++	CGO_ENABLED=0 go build -v -o ${app_dir}/build/server -gcflags "all=-N -l" -ldflags "-X 'main.serverBuildString=${build_string}'"
 
 
  # * Running the final application
-@@ -30,6 +32,7 @@ RUN mkdir -p ${app_dir}/log && chown go:go ${app_dir}/log
+@@ -31,6 +33,7 @@ RUN mkdir -p ${app_dir}/log && chown go:go ${app_dir}/log
 
  USER go
 
 +COPY --from=build /go/bin/dlv ${app_dir}/dlv
  COPY --from=build ${app_dir}/build/server ${app_dir}/server
 
 -CMD [ "./server" ]
-+CMD ["./dlv", "exec", "./server", "--listen=:2347", "--headless", "--api-version=2", "--log", "--accept-multiclient", "--continue"]
++CMD ["./dlv", "exec", "./server", "--listen=:2345", "--headless", "--api-version=2", "--log", "--accept-multiclient", "--continue"]