Merge pull request #729 from jc21/develop

v2.7.1
NginxProxyManager · Nov 18, 2020 · 72ac549 · 72ac549
2 parents 1c43cc2 + 9f38617
commit 72ac549
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.7.0
+2.7.1
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <p align="center">
 	<img src="https://nginxproxymanager.com/github.png">
 	<br><br>
-	<img src="https://img.shields.io/badge/version-2.7.0-green.svg?style=for-the-badge">
+	<img src="https://img.shields.io/badge/version-2.7.1-green.svg?style=for-the-badge">
 	<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
 		<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
 	</a>

diff --git a/backend/index.js b/backend/index.js
@@ -13,7 +13,6 @@ async function appStart () {
 	const internalCertificate = require('./internal/certificate');
 	const internalIpRanges    = require('./internal/ip_ranges');
 
-
 	return migrate.latest()
 		.then(setup)
 		.then(() => {
@@ -43,13 +42,14 @@ async function appStart () {
 		});
 }
 
-async function createDbConfigFromEnvironment(){
+async function createDbConfigFromEnvironment() {
 	return new Promise((resolve, reject) => {
-		const envMysqlHost  = process.env.DB_MYSQL_HOST;
-		const envMysqlPort  = process.env.DB_MYSQL_PORT;
-		const envMysqlUser  = process.env.DB_MYSQL_USER;
-		const envMysqlName  = process.env.DB_MYSQL_NAME;
-		const envSqliteFile = process.env.DB_SQLITE_FILE;
+		const envMysqlHost  = process.env.DB_MYSQL_HOST || null;
+		const envMysqlPort  = process.env.DB_MYSQL_PORT || null;
+		const envMysqlUser  = process.env.DB_MYSQL_USER || null;
+		const envMysqlName  = process.env.DB_MYSQL_NAME || null;
+		const envSqliteFile = process.env.DB_SQLITE_FILE || null;
+
 		if ((envMysqlHost && envMysqlPort && envMysqlUser && envMysqlName) || envSqliteFile) {
 			const fs       = require('fs');
 			const filename = (process.env.NODE_CONFIG_DIR || './config') + '/' + (process.env.NODE_ENV || 'default') + '.json';
@@ -119,7 +119,7 @@ async function createDbConfigFromEnvironment(){
 				}
 			});
 		} else {
-			// resolve();
+			resolve();
 		}
 	});
 }
@@ -130,3 +130,4 @@ try {
 	logger.error(err.message, err);
 	process.exit(1);
 }
+