diff --git a/app/AppKernel.php b/app/AppKernel.php index 9212be758..a4f2c1d26 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -94,15 +94,7 @@ class AppKernel extends Kernel private function loadEnvVarsFromParameters(ContainerBuilder $container) { - $this->setEnvVarFromParameter($container, 'DATABASE_HOST', 'database_host'); - $this->setEnvVarFromParameter($container, 'DATABASE_PORT', 'database_port'); - $this->setEnvVarFromParameter($container, 'DATABASE_NAME', 'database_name'); - $this->setEnvVarFromParameter($container, 'DATABASE_USER', 'database_user'); - $this->setEnvVarFromParameter($container, 'DATABASE_PASSWORD', 'database_password'); - $this->setEnvVarFromParameter($container, 'DATABASE_PATH', 'database_path'); $this->setEnvVarFromParameter($container, 'DATABASE_TABLE_PREFIX', 'database_table_prefix'); - $this->setEnvVarFromParameter($container, 'DATABASE_SOCKET', 'database_socket'); - $this->setEnvVarFromParameter($container, 'DATABASE_CHARSET', 'database_charset'); $this->setEnvVarFromParameter($container, 'DOMAIN_NAME', 'domain_name'); $this->setEnvVarFromParameter($container, 'SERVER_NAME', 'server_name'); diff --git a/docker/mariadb/env b/docker/mariadb/env index 8c8a01fd3..3438f93f9 100644 --- a/docker/mariadb/env +++ b/docker/mariadb/env @@ -1,9 +1,2 @@ MYSQL_ROOT_PASSWORD=wallaroot MYSQL_DATABASE=wallabag -DATABASE_DRIVER=pdo_mysql -DATABASE_HOST=mariadb -DATABASE_PORT=3306 -DATABASE_NAME=wallabag -DATABASE_USER=root -DATABASE_PASSWORD=wallaroot -DATABASE_CHARSET=utf8mb4 diff --git a/docker/php/env.example b/docker/php/env.example index 1eff4bcee..70319de03 100644 --- a/docker/php/env.example +++ b/docker/php/env.example @@ -1,10 +1,3 @@ -DATABASE_DRIVER=pdo_sqlite -DATABASE_HOST=127.0.0.1 -DATABASE_PORT=~ -DATABASE_NAME=symfony -DATABASE_USER=root -DATABASE_PASSWORD=~ -DATABASE_PATH='"%kernel.project_dir%/data/db/wallabag.sqlite"' DOMAIN_NAME=http://localhost:8000 SECRET=ch4n63m31fy0uc4n PHP_SESSION_SAVE_PATH=tcp://redis:6379?database=2 diff --git a/docker/postgres/env b/docker/postgres/env index 5d9761861..90d2260f7 100644 --- a/docker/postgres/env +++ b/docker/postgres/env @@ -1,10 +1,3 @@ POSTGRES_USER=wallabag POSTGRES_PASSWORD=wallapass POSTGRES_DB=wallabag -DATABASE_HOST=postgres -DATABASE_PORT=5432 -DATABASE_NAME=wallabag -DATABASE_USER=wallabag -DATABASE_PASSWORD=wallapass -DATABASE_DRIVER=pdo_pgsql -DATABASE_PATH=null