chore: update devcontainer

bosancz · Feb 11, 2025 · 80044e2 · 80044e2
1 parent 6a9d431
commit 80044e2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 23 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,13 +5,17 @@
   "service": "devcontainer",
   "workspaceFolder": "/workspace",
   "shutdownAction": "stopCompose",
+  "postCreateCommand": "./.devcontainer/post-create.sh",
   "forwardPorts": [
     4200,
     9229,
     3000,
     5432,
     "adminer:8080"
   ],
+  "features": {
+    "ghcr.io/devcontainers/features/java:1": {}
+  },
   "customizations": {
     "vscode": {
       "extensions": [

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -2,40 +2,36 @@ name: bosan_interni_sekce_development
 
 services:
   devcontainer:
-    container_name: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-devcontainer
-    build: "."
+    image: mcr.microsoft.com/devcontainers/typescript-node:1-22
+    command: sleep infinity
     volumes:
       - ..:/workspace:cached
     environment:
       ENV_TITLE: "DEV"
-      DB_HOST: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-postgres
+      DB_HOST: postgres
       DB_USER: postgres
       DB_PASSWORD: password
       DB_DATABASE: postgres
       DB_SCHEMA: public
-      MONGODB_URI: mongodb://${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-mongo/bosan
+      MONGODB_URI: mongodb://mongo/bosan
       CORS_ENABLE: "true"
       CORS_ORIGINS: "http://localhost:4200,http://localhost:4300"
 
   postgres:
-    container_name: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-postgres
     image: postgres:15
     environment:
       POSTGRES_PASSWORD: password
 
   adminer:
-    container_name: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-adminer
     image: adminer
 
   mongo:
-    container_name: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-mongo
     image: mongo:4.2
     environment:
       MONGO_INITDB_DATABASE: bosan
 
   mongoexpress:
-    container_name: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-mongoexpress
     image: mongo-express
     environment:
-      ME_CONFIG_MONGODB_SERVER: ${COMPOSE_PROJECT_NAME:-bosan-interni-dev}-mongo
+      ME_CONFIG_MONGODB_SERVER: mongo
       ME_CONFIG_MONGODB_ENABLE_ADMIN: "true"
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+npm i -g @angular/cli @nestjs/cli @smallhillcz/sdk
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash -e

		npm i -g @angular/cli @nestjs/cli @smallhillcz/sdk