Merge branch 'hotfixes'

Author: temple

.devcontainer/devcontainer.json

@@ -11,6 +11,7 @@
 		}
 	},
 	"runArgs": ["--hostname","${localEnv:OAUTH_ASTRO_CONTAINER_HOSTNAME:astro.dev}"],
+	"containerEnv": { "PORT": "8080" },
 	"customizations": {
 		"vscode": {
 			"extensions": [
@@ -21,13 +22,20 @@
 				"donjayamanne.githistory"
 			]
 		}
-	}
+	},
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
+	"forwardPorts": [8080],
+	"portsAttributes": {
+		"8080": {
+			"label": "FrontendToBackend",
+			"requireLocalPort": true,
+			"elevateIfNeeded": true
+		}
+	}
 
 	// Use 'postCreateCommand' to run commands after the container is created.
 	// "postCreateCommand": "yarn install",

astro.config.mjs

@@ -6,6 +6,7 @@ import tailwind from '@astrojs/tailwind';
 
 
 const HOSTNAME = process.env.HOSTNAME
+const PORT = parseInt(process.env.PORT) 
 
 const options = {
 	key: fs.readFileSync("./private/server.key"),
@@ -15,7 +16,8 @@ const options = {
 // https://astro.build/config
 export default defineConfig({
     output: 'server',
-    vite: { server: {https: options} },
+    vite: { server: {https: options, port: PORT }},
+    server: { port: PORT },
     adapter: node({mode:'standalone'}),
     site: `https://${HOSTNAME}}`,
     integrations: [tailwind()],

package.json

@@ -3,12 +3,12 @@
   "type": "module",
   "version": "0.0.1",
   "scripts": {
-    "dev": "astro dev",
-    "start": "astro dev",
+    "dev": "astro dev --host",
+    "start": "astro dev --host",
     "build": "astro check && astro build",
     "preview": "astro preview",
     "astro": "astro",
-    "ssr": "SERVER_KEY_PATH=./private/server.key SERVER_CERT_PATH=./private/server.crt  HOST=127.0.0.1 PORT=4321 node ./dist/server/entry.mjs"
+    "ssr": "SERVER_KEY_PATH=./private/server.key SERVER_CERT_PATH=./private/server.crt  HOST=127.0.0.1 PORT=$PORT node ./dist/server/entry.mjs"
   },
   "dependencies": {
     "@astrojs/check": "^0.9.3",