Use CRAFT_DB_

craftcms · Apr 11, 2022 · 4cfabfe · 4cfabfe
1 parent 4b9fd66
commit 4cfabfe
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/.env.bref b/.env.bref
@@ -1,10 +1,10 @@
 CRAFT_ENVIRONMENT=dev
 CRAFT_SECURITY_KEY=temp
 
-DB_SERVER=postgres
-DB_DATABASE=europa
-DB_USER=nitro
-DB_PASSWORD=nitro
+CRAFT_DB_SERVER=postgres
+CRAFT_DB_DATABASE=europa
+CRAFT_DB_USER=nitro
+CRAFT_DB_PASSWORD=nitro
 DEFAULT_SITE_URL=http://localhost:8000
 CRAFT_STORAGE_PATH=/tmp
 CRAFT_EPHEMERAL=1

diff --git a/.env.docker b/.env.docker
@@ -3,9 +3,9 @@ CRAFT_SECURITY_KEY=temp
 HOST_WEB_PORT=8080
 HOST_DB_PORT=
 
-DB_DATABASE=craft
-DB_USER=craft
-DB_PASSWORD=secret
-DB_SERVER=postgres
+CRAFT_DB_DATABASE=craft
+CRAFT_DB_USER=craft
+CRAFT_DB_PASSWORD=secret
+CRAFT_DB_SERVER=postgres
 DEFAULT_SITE_URL=http://localhost:${HOST_WEB_PORT}
 CRAFT_STREAM_LOG=1
diff --git a/.env.example b/.env.example
@@ -2,14 +2,14 @@ CRAFT_ENVIRONMENT=dev
 
 CRAFT_SECURITY_KEY=
 
-DB_DRIVER=pgsql
-DB_SERVER=localhost
-DB_PORT=5432
-DB_USER=postgres
-DB_PASSWORD=
-DB_DATABASE=
-DB_SCHEMA=public
-DB_TABLE_PREFIX=
+CRAFT_DB_DRIVER=pgsql
+CRAFT_DB_SERVER=localhost
+CRAFT_DB_PORT=5432
+CRAFT_DB_USER=postgres
+CRAFT_DB_PASSWORD=
+CRAFT_DB_DATABASE=
+CRAFT_DB_SCHEMA=public
+CRAFT_DB_TABLE_PREFIX=
 
 DEFAULT_SITE_URL=https://europa.nitro
 

diff --git a/config/db.php b/config/db.php
@@ -11,11 +11,11 @@
 
 return [
     'driver' => Connection::DRIVER_PGSQL,
-    'server' => App::env('DB_SERVER'),
-    'user' => App::env('DB_USER'),
-    'password' => App::env('DB_PASSWORD'),
-    'database' => App::env('DB_DATABASE'),
-    'schema' => App::env('DB_SCHEMA') ?: 'public',
-    'tablePrefix' => App::env('DB_TABLE_PREFIX'),
-    'port' => App::env('DB_PORT') ?: 5432,
+    'server' => App::env('CRAFT_DB_SERVER'),
+    'user' => App::env('CRAFT_DB_USER'),
+    'password' => App::env('CRAFT_DB_PASSWORD'),
+    'database' => App::env('CRAFT_DB_DATABASE'),
+    'schema' => App::env('CRAFT_DB_SCHEMA') ?: 'public',
+    'tablePrefix' => App::env('CRAFT_DB_TABLE_PREFIX'),
+    'port' => App::env('CRAFT_DB_PORT') ?: 5432,
 ];
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,9 +12,9 @@ services:
   postgres:
     image: postgres:10.7-alpine
     environment:
-      POSTGRES_DB: ${DB_DATABASE}
-      POSTGRES_USER: ${DB_USER}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_DB: ${CRAFT_DB_DATABASE}
+      POSTGRES_USER: ${CRAFT_DB_USER}
+      POSTGRES_PASSWORD: ${CRAFT_DB_PASSWORD}
     volumes:
       - db_data:/var/lib/postgresql/data
     healthcheck: