From 1f809f9a95d119d232fe56fa32a70353fc26b5a2 Mon Sep 17 00:00:00 2001
From: Joshua Gort <accounts@joshuagort.com>
Date: Tue, 14 May 2024 15:06:58 +0200
Subject: [PATCH] Specify registry and fix devcontainer ports

---
 .devcontainer/Dockerfile         |  2 +-
 .devcontainer/devcontainer.json  | 20 +++++++++++++++-----
 .devcontainer/docker-compose.yml |  6 +++---
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 1d9daf17..6392f2fe 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/java:0-17
+FROM mcr.microsoft.com/devcontainers/java:17
 
 RUN su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle "
 
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 21d4f154..8442c4ac 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -14,14 +14,24 @@
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// This can be used to network with other containers or with the host.
 	"forwardPorts": [
-		1080,
-		80,
-		8082
+		1080, // Mailcatcher
+		5432, // PostgreSQL
+		8080, // Events
+		8082  // Adminer
 	],
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "gradle bootRun",
+	// "postCreateCommand": "gradle bootRun",
 	// Configure tool-specific properties.
 	// "customizations": {},
 	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	"remoteUser": "root"
+	"remoteUser": "root",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"vmware.vscode-boot-dev-pack",
+				"vscjava.vscode-gradle",
+				"vscjava.vscode-java-pack"
+			]
+		}
+	}
 }
\ No newline at end of file
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 1e479343..ca18713e 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       - mailcatcher
 
   postgres:
-    image: postgres:latest
+    image: docker.io/library/postgres:latest
     restart: unless-stopped
     volumes:
       - postgres-data:/var/lib/postgresql/data
@@ -36,7 +36,7 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust
 
   adminer:
-    image: adminer
+    image: docker.io/library/adminer:latest
     restart: always
     depends_on: 
       - postgres
@@ -44,6 +44,6 @@ services:
       - "8082:8080"
 
   mailcatcher:
-    image: schickling/mailcatcher
+    image: docker.io/schickling/mailcatcher:latest
     restart: on-failure
     network_mode: service:postgres