fix: replace network_mode with bridge network in java-postgres docker-compose and update test.sh

Co-authored-by: Kaniska244 <[email protected]>

Author: Copilot

src/java-postgres/.devcontainer/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 volumes:
   postgres-data:
 
@@ -14,16 +12,21 @@ services:
         POSTGRES_PASSWORD: postgres
         POSTGRES_USER: postgres
         POSTGRES_DB: postgres
-        POSTGRES_HOSTNAME: postgresdb
+        POSTGRES_HOSTNAME: db
 
     volumes:
       - ../..:/workspaces:cached
 
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
 
-    # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
-    network_mode: service:db
+    # Use proper Docker networking instead of network_mode: service:db
+    # to ensure reliable DNS resolution in all environments
+    depends_on:
+      db:
+        condition: service_healthy
+    networks:
+      - app-network
 
     # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. 
     # (Adding the "ports" property to this file will not forward from a Codespace.)
@@ -32,6 +35,14 @@ services:
     container_name: postgresdb
     image: postgres:latest
     restart: unless-stopped
+    networks:
+      - app-network
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
     volumes:
       - postgres-data:/var/lib/postgresql/data
     environment:
@@ -41,4 +52,8 @@ services:
       POSTGRES_DB: postgres
 
     # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
-    # (Adding the "ports" property to this file will not forward from a Codespace.)
+    # (Adding the "ports" property to this file will not forward from a Codespace.)
+
+networks:
+  app-network:
+    driver: bridge

src/java-postgres/NOTES.md

@@ -5,7 +5,7 @@ This template references an image that was [pre-built](https://containers.dev/im
 
 ## Using this template
 
-This template creates two containers, one for Java and one for PostgreSQL. You will be connected to the Java container, and from within that container the PostgreSQL container will be available on **`localhost`** port 5432. The default database is named `postgres` with a user of `postgres` whose password is `postgres`, and if desired this may be changed in `.devcontainer/docker-compose.yml`. Data is stored in a volume named `postgres-data`.
+This template creates two containers, one for Java and one for PostgreSQL. You will be connected to the Java container, and from within that container the PostgreSQL container will be available on the hostname **`db`** port 5432. The default database is named `postgres` with a user of `postgres` whose password is `postgres`, and if desired this may be changed in `.devcontainer/docker-compose.yml`. Data is stored in a volume named `postgres-data`.
 
 While the template itself works unmodified, it uses the `mcr.microsoft.com/devcontainers/java` image which includes `git`, a non-root `vscode` user with `sudo` access, and a set of common dependencies and Java tools for development.
 
@@ -28,12 +28,7 @@ If needed, you can use `postCreateCommand` to run commands after the container i
 
 ### Adding another service
 
-You can add other services to your `.devcontainer/docker-compose.yml` file [as described in Docker's documentation](https://docs.docker.com/compose/compose-file/#service-configuration-reference). However, if you want anything running in this service to be available in the container on localhost, or want to forward the service locally, be sure to add this line to the service config:
-
-```yaml
-# Runs the service on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
-network_mode: service:db
-```
+You can add other services to your `.devcontainer/docker-compose.yml` file [as described in Docker's documentation](https://docs.docker.com/compose/compose-file/#service-configuration-reference). For inter-service communication, attach new services to the `app-network` bridge network configured in the compose file.
 
 ### Using the forwardPorts property
 

test/java-postgres/test.sh

@@ -6,22 +6,27 @@ source test-utils.sh vscode
 # Run common tests
 checkCommon
 
-# Prep
-echo -e "\nGetting Maven wrapper..."
-curl -sSL https://github.com/takari/maven-wrapper/archive/maven-wrapper-0.5.5.tar.gz| tar -xzf - 
-mv maven-wrapper-maven-wrapper-0.5.5/mvnw mvnw
-mv maven-wrapper-maven-wrapper-0.5.5/.mvn .mvn
-rm -rf mv maven-wrapper-maven-wrapper-0.5.5
+# Prep - Download Maven for building (network_mode fix enables outbound access)
+echo -e "\nResolving Maven..."
+MAVEN_VERSION="3.9.9"
+MAVEN_DIR="apache-maven-${MAVEN_VERSION}"
+
+if command -v mvn >/dev/null 2>&1; then
+    MVN_CMD="mvn"
+else
+    echo "mvn not found, downloading Apache Maven ${MAVEN_VERSION}..."
+    curl -fsSL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_DIR}-bin.tar.gz" | tar -xzf -
+    MVN_CMD="$(pwd)/${MAVEN_DIR}/bin/mvn"
+fi
 
 # template specific tests
 checkExtension "vscjava.vscode-java-pack"
 check "java" java -version
-check "build-and-test-jar" ./mvnw -q package
+check "build-and-test-jar" "$MVN_CMD" -q package
 check "test-project" java -jar target/my-app-1.0-SNAPSHOT.jar
 
 # Clean up
-rm -f mvnw
-rm -rf .mvn
+rm -rf "${MAVEN_DIR}"
 
 # Report result
 reportResults