From 28fd6fbd52c09be06ae8c073d08a593235572690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Gioachini?= Date: Thu, 28 Aug 2025 18:13:32 -0300 Subject: [PATCH 1/4] fix devcontainer launch issue: devcontainer doesn't launch properly as is problematic code: filepath for docker-compose.yml and not using the existing env.template file fix: change filepath to refer to root and use env.template in the devcontainer for faster usage --- .devcontainer/devcontainer.json | 2 +- docker-compose.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b85adaeda..af7bc83df 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "ROMM Development", - "dockerComposeFile": "docker-compose.yml", + "dockerComposeFile": "../docker-compose.yml", "service": "romm-dev", "workspaceFolder": "/app", "shutdownAction": "stopCompose", diff --git a/docker-compose.yml b/docker-compose.yml index 5044624b4..69e20d11f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . dockerfile: Dockerfile container_name: romm-dev - env_file: .env + env_file: env.template environment: - REDIS_HOST=romm-valkey-dev - DB_HOST=${DB_HOST:-romm-db-dev} @@ -35,7 +35,7 @@ services: image: mariadb:11.3.2 container_name: romm-db-dev restart: unless-stopped - env_file: .env + env_file: env.template environment: - MARIADB_ROOT_PASSWORD=${DB_ROOT_PASSWD:-rootpassword} - MARIADB_DATABASE=${DB_NAME:-romm} @@ -50,7 +50,7 @@ services: image: valkey/valkey:8 container_name: romm-valkey-dev restart: unless-stopped - env_file: .env + env_file: env.template ports: - "${REDIS_PORT:-6379}:6379" @@ -58,7 +58,7 @@ services: image: postgres:16-alpine container_name: romm-postgresql-dev restart: unless-stopped - env_file: .env + env_file: env.template environment: POSTGRES_PASSWORD: ${DB_PASSWD:-postgres} POSTGRES_USER: ${DB_USER:-postgres} @@ -73,7 +73,7 @@ services: container_name: romm-authentik-server restart: unless-stopped command: server - env_file: .env + env_file: env.template environment: AUTHENTIK_REDIS__HOST: romm-valkey-dev AUTHENTIK_POSTGRESQL__HOST: romm-postgres-dev @@ -97,7 +97,7 @@ services: container_name: romm-authentik-worker restart: unless-stopped command: worker - env_file: .env + env_file: env.template environment: AUTHENTIK_REDIS__HOST: romm-valkey-dev AUTHENTIK_POSTGRESQL__HOST: romm-postgres-dev From 6717efa397c530868df641c3e3073307acbbeffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Gioachini?= Date: Fri, 29 Aug 2025 12:50:44 -0300 Subject: [PATCH 2/4] Change env_file from env.template to .env fixed the error in changing the docker_compose.yml file for the commit --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 69e20d11f..5044624b4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . dockerfile: Dockerfile container_name: romm-dev - env_file: env.template + env_file: .env environment: - REDIS_HOST=romm-valkey-dev - DB_HOST=${DB_HOST:-romm-db-dev} @@ -35,7 +35,7 @@ services: image: mariadb:11.3.2 container_name: romm-db-dev restart: unless-stopped - env_file: env.template + env_file: .env environment: - MARIADB_ROOT_PASSWORD=${DB_ROOT_PASSWD:-rootpassword} - MARIADB_DATABASE=${DB_NAME:-romm} @@ -50,7 +50,7 @@ services: image: valkey/valkey:8 container_name: romm-valkey-dev restart: unless-stopped - env_file: env.template + env_file: .env ports: - "${REDIS_PORT:-6379}:6379" @@ -58,7 +58,7 @@ services: image: postgres:16-alpine container_name: romm-postgresql-dev restart: unless-stopped - env_file: env.template + env_file: .env environment: POSTGRES_PASSWORD: ${DB_PASSWD:-postgres} POSTGRES_USER: ${DB_USER:-postgres} @@ -73,7 +73,7 @@ services: container_name: romm-authentik-server restart: unless-stopped command: server - env_file: env.template + env_file: .env environment: AUTHENTIK_REDIS__HOST: romm-valkey-dev AUTHENTIK_POSTGRESQL__HOST: romm-postgres-dev @@ -97,7 +97,7 @@ services: container_name: romm-authentik-worker restart: unless-stopped command: worker - env_file: env.template + env_file: .env environment: AUTHENTIK_REDIS__HOST: romm-valkey-dev AUTHENTIK_POSTGRESQL__HOST: romm-postgres-dev From 55797827c5572d07f2b4454c510d25cab78f1308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Gioachini?= Date: Fri, 29 Aug 2025 13:38:56 -0300 Subject: [PATCH 3/4] created default dev.env for development --- .devcontainer/dev.env | 18 ++++++++++++++++++ .devcontainer/devcontainer.json | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 .devcontainer/dev.env diff --git a/.devcontainer/dev.env b/.devcontainer/dev.env new file mode 100644 index 000000000..583c7ca0c --- /dev/null +++ b/.devcontainer/dev.env @@ -0,0 +1,18 @@ +# Development environment overrides for Dev Containers +DEV_MODE=true +DEV_HTTPS=false +# Pick a host port that doesn't conflict with local services +DEV_PORT=5001 +# Database defaults for development +DB_HOST=romm-db-dev +DB_NAME=romm +DB_USER=romm +DB_PASSWD=romm +DB_ROOT_PASSWD=rootpassword +# Redis +REDIS_PORT=6379 +# Authentik defaults +AUTHENTIK_SECRET_KEY=secret-key-default +AUTHENTIK_BOOTSTRAP_PASSWORD=password +# Logging +LOGLEVEL=DEBUG diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index af7bc83df..1912a91b2 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,7 @@ { "name": "ROMM Development", - "dockerComposeFile": "../docker-compose.yml", + // Use the repository root docker-compose.yml so the romm-dev service uses the project's root Dockerfile + "dockerComposeFile": ["../docker-compose.yml"], "service": "romm-dev", "workspaceFolder": "/app", "shutdownAction": "stopCompose", From 8ab2d125a9dda0a2c6bd0fecf277705cf1adaa3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Gioachini?= Date: Fri, 29 Aug 2025 18:00:10 -0300 Subject: [PATCH 4/4] removed comment --- .devcontainer/devcontainer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1912a91b2..f05c4a2df 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,5 @@ { "name": "ROMM Development", - // Use the repository root docker-compose.yml so the romm-dev service uses the project's root Dockerfile "dockerComposeFile": ["../docker-compose.yml"], "service": "romm-dev", "workspaceFolder": "/app",