From 95ca33ad4903648d21c326659a37ccd8c3f714b2 Mon Sep 17 00:00:00 2001
From: Joe Ferguson <joe@infosiftr.com>
Date: Fri, 12 Mar 2021 14:12:18 -0800
Subject: [PATCH 1/2] Use WordPress setup default values for env variables; use
 empty env values

---
 beta/php7.3/apache/wp-config-docker.php       | 14 ++++++++++----
 beta/php7.3/fpm-alpine/wp-config-docker.php   | 14 ++++++++++----
 beta/php7.3/fpm/wp-config-docker.php          | 14 ++++++++++----
 beta/php7.4/apache/wp-config-docker.php       | 14 ++++++++++----
 beta/php7.4/fpm-alpine/wp-config-docker.php   | 14 ++++++++++----
 beta/php7.4/fpm/wp-config-docker.php          | 14 ++++++++++----
 beta/php8.0/apache/wp-config-docker.php       | 14 ++++++++++----
 beta/php8.0/fpm-alpine/wp-config-docker.php   | 14 ++++++++++----
 beta/php8.0/fpm/wp-config-docker.php          | 14 ++++++++++----
 latest/php7.3/apache/wp-config-docker.php     | 14 ++++++++++----
 latest/php7.3/fpm-alpine/wp-config-docker.php | 14 ++++++++++----
 latest/php7.3/fpm/wp-config-docker.php        | 14 ++++++++++----
 latest/php7.4/apache/wp-config-docker.php     | 14 ++++++++++----
 latest/php7.4/fpm-alpine/wp-config-docker.php | 14 ++++++++++----
 latest/php7.4/fpm/wp-config-docker.php        | 14 ++++++++++----
 latest/php8.0/apache/wp-config-docker.php     | 14 ++++++++++----
 latest/php8.0/fpm-alpine/wp-config-docker.php | 14 ++++++++++----
 latest/php8.0/fpm/wp-config-docker.php        | 14 ++++++++++----
 wp-config-docker.php                          | 14 ++++++++++----
 19 files changed, 190 insertions(+), 76 deletions(-)

diff --git a/beta/php7.3/apache/wp-config-docker.php b/beta/php7.3/apache/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/beta/php7.3/apache/wp-config-docker.php
+++ b/beta/php7.3/apache/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/beta/php7.3/fpm-alpine/wp-config-docker.php b/beta/php7.3/fpm-alpine/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/beta/php7.3/fpm-alpine/wp-config-docker.php
+++ b/beta/php7.3/fpm-alpine/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/beta/php7.3/fpm/wp-config-docker.php b/beta/php7.3/fpm/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/beta/php7.3/fpm/wp-config-docker.php
+++ b/beta/php7.3/fpm/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/beta/php7.4/apache/wp-config-docker.php b/beta/php7.4/apache/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/beta/php7.4/apache/wp-config-docker.php
+++ b/beta/php7.4/apache/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/beta/php7.4/fpm-alpine/wp-config-docker.php b/beta/php7.4/fpm-alpine/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/beta/php7.4/fpm-alpine/wp-config-docker.php
+++ b/beta/php7.4/fpm-alpine/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/beta/php7.4/fpm/wp-config-docker.php b/beta/php7.4/fpm/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/beta/php7.4/fpm/wp-config-docker.php
+++ b/beta/php7.4/fpm/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/beta/php8.0/apache/wp-config-docker.php b/beta/php8.0/apache/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/beta/php8.0/apache/wp-config-docker.php
+++ b/beta/php8.0/apache/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/beta/php8.0/fpm-alpine/wp-config-docker.php b/beta/php8.0/fpm-alpine/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/beta/php8.0/fpm-alpine/wp-config-docker.php
+++ b/beta/php8.0/fpm-alpine/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/beta/php8.0/fpm/wp-config-docker.php b/beta/php8.0/fpm/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/beta/php8.0/fpm/wp-config-docker.php
+++ b/beta/php8.0/fpm/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/latest/php7.3/apache/wp-config-docker.php b/latest/php7.3/apache/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/latest/php7.3/apache/wp-config-docker.php
+++ b/latest/php7.3/apache/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/latest/php7.3/fpm-alpine/wp-config-docker.php b/latest/php7.3/fpm-alpine/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/latest/php7.3/fpm-alpine/wp-config-docker.php
+++ b/latest/php7.3/fpm-alpine/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/latest/php7.3/fpm/wp-config-docker.php b/latest/php7.3/fpm/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/latest/php7.3/fpm/wp-config-docker.php
+++ b/latest/php7.3/fpm/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/latest/php7.4/apache/wp-config-docker.php b/latest/php7.4/apache/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/latest/php7.4/apache/wp-config-docker.php
+++ b/latest/php7.4/apache/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/latest/php7.4/fpm-alpine/wp-config-docker.php b/latest/php7.4/fpm-alpine/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/latest/php7.4/fpm-alpine/wp-config-docker.php
+++ b/latest/php7.4/fpm-alpine/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/latest/php7.4/fpm/wp-config-docker.php b/latest/php7.4/fpm/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/latest/php7.4/fpm/wp-config-docker.php
+++ b/latest/php7.4/fpm/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/latest/php8.0/apache/wp-config-docker.php b/latest/php8.0/apache/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/latest/php8.0/apache/wp-config-docker.php
+++ b/latest/php8.0/apache/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/latest/php8.0/fpm-alpine/wp-config-docker.php b/latest/php8.0/fpm-alpine/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/latest/php8.0/fpm-alpine/wp-config-docker.php
+++ b/latest/php8.0/fpm-alpine/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/latest/php8.0/fpm/wp-config-docker.php b/latest/php8.0/fpm/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/latest/php8.0/fpm/wp-config-docker.php
+++ b/latest/php8.0/fpm/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
diff --git a/wp-config-docker.php b/wp-config-docker.php
index 5a43e8e641..31397ed3a2 100644
--- a/wp-config-docker.php
+++ b/wp-config-docker.php
@@ -28,7 +28,7 @@ function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
 		return file_get_contents($fileEnv);
 	}
-	else if ($val = getenv($env)) {
+	else if (($val = getenv($env)) !== false) {
 		return $val;
 	}
 	else {
@@ -38,13 +38,19 @@ function getenv_docker($env, $default) {
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'database_name_here') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
 /** MySQL database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'username_here') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'password_here') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
+
+/**
+ * Docker image fallback values above are sourced from the official WordPress installation wizard:
+ * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230
+ * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
+ */
 
 /** MySQL hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );

From c313a26c26e936a4ef8c4601185dc60fc848779d Mon Sep 17 00:00:00 2001
From: Joe Ferguson <joe@infosiftr.com>
Date: Mon, 15 Mar 2021 17:15:50 -0700
Subject: [PATCH 2/2] Remove newlines from `_FILE` contents

---
 beta/php7.3/apache/wp-config-docker.php       | 2 +-
 beta/php7.3/fpm-alpine/wp-config-docker.php   | 2 +-
 beta/php7.3/fpm/wp-config-docker.php          | 2 +-
 beta/php7.4/apache/wp-config-docker.php       | 2 +-
 beta/php7.4/fpm-alpine/wp-config-docker.php   | 2 +-
 beta/php7.4/fpm/wp-config-docker.php          | 2 +-
 beta/php8.0/apache/wp-config-docker.php       | 2 +-
 beta/php8.0/fpm-alpine/wp-config-docker.php   | 2 +-
 beta/php8.0/fpm/wp-config-docker.php          | 2 +-
 latest/php7.3/apache/wp-config-docker.php     | 2 +-
 latest/php7.3/fpm-alpine/wp-config-docker.php | 2 +-
 latest/php7.3/fpm/wp-config-docker.php        | 2 +-
 latest/php7.4/apache/wp-config-docker.php     | 2 +-
 latest/php7.4/fpm-alpine/wp-config-docker.php | 2 +-
 latest/php7.4/fpm/wp-config-docker.php        | 2 +-
 latest/php8.0/apache/wp-config-docker.php     | 2 +-
 latest/php8.0/fpm-alpine/wp-config-docker.php | 2 +-
 latest/php8.0/fpm/wp-config-docker.php        | 2 +-
 wp-config-docker.php                          | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/beta/php7.3/apache/wp-config-docker.php b/beta/php7.3/apache/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/beta/php7.3/apache/wp-config-docker.php
+++ b/beta/php7.3/apache/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/beta/php7.3/fpm-alpine/wp-config-docker.php b/beta/php7.3/fpm-alpine/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/beta/php7.3/fpm-alpine/wp-config-docker.php
+++ b/beta/php7.3/fpm-alpine/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/beta/php7.3/fpm/wp-config-docker.php b/beta/php7.3/fpm/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/beta/php7.3/fpm/wp-config-docker.php
+++ b/beta/php7.3/fpm/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/beta/php7.4/apache/wp-config-docker.php b/beta/php7.4/apache/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/beta/php7.4/apache/wp-config-docker.php
+++ b/beta/php7.4/apache/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/beta/php7.4/fpm-alpine/wp-config-docker.php b/beta/php7.4/fpm-alpine/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/beta/php7.4/fpm-alpine/wp-config-docker.php
+++ b/beta/php7.4/fpm-alpine/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/beta/php7.4/fpm/wp-config-docker.php b/beta/php7.4/fpm/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/beta/php7.4/fpm/wp-config-docker.php
+++ b/beta/php7.4/fpm/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/beta/php8.0/apache/wp-config-docker.php b/beta/php8.0/apache/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/beta/php8.0/apache/wp-config-docker.php
+++ b/beta/php8.0/apache/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/beta/php8.0/fpm-alpine/wp-config-docker.php b/beta/php8.0/fpm-alpine/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/beta/php8.0/fpm-alpine/wp-config-docker.php
+++ b/beta/php8.0/fpm-alpine/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/beta/php8.0/fpm/wp-config-docker.php b/beta/php8.0/fpm/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/beta/php8.0/fpm/wp-config-docker.php
+++ b/beta/php8.0/fpm/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/latest/php7.3/apache/wp-config-docker.php b/latest/php7.3/apache/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/latest/php7.3/apache/wp-config-docker.php
+++ b/latest/php7.3/apache/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/latest/php7.3/fpm-alpine/wp-config-docker.php b/latest/php7.3/fpm-alpine/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/latest/php7.3/fpm-alpine/wp-config-docker.php
+++ b/latest/php7.3/fpm-alpine/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/latest/php7.3/fpm/wp-config-docker.php b/latest/php7.3/fpm/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/latest/php7.3/fpm/wp-config-docker.php
+++ b/latest/php7.3/fpm/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/latest/php7.4/apache/wp-config-docker.php b/latest/php7.4/apache/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/latest/php7.4/apache/wp-config-docker.php
+++ b/latest/php7.4/apache/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/latest/php7.4/fpm-alpine/wp-config-docker.php b/latest/php7.4/fpm-alpine/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/latest/php7.4/fpm-alpine/wp-config-docker.php
+++ b/latest/php7.4/fpm-alpine/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/latest/php7.4/fpm/wp-config-docker.php b/latest/php7.4/fpm/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/latest/php7.4/fpm/wp-config-docker.php
+++ b/latest/php7.4/fpm/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/latest/php8.0/apache/wp-config-docker.php b/latest/php8.0/apache/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/latest/php8.0/apache/wp-config-docker.php
+++ b/latest/php8.0/apache/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/latest/php8.0/fpm-alpine/wp-config-docker.php b/latest/php8.0/fpm-alpine/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/latest/php8.0/fpm-alpine/wp-config-docker.php
+++ b/latest/php8.0/fpm-alpine/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/latest/php8.0/fpm/wp-config-docker.php b/latest/php8.0/fpm/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/latest/php8.0/fpm/wp-config-docker.php
+++ b/latest/php8.0/fpm/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;
diff --git a/wp-config-docker.php b/wp-config-docker.php
index 31397ed3a2..247ecb7c28 100644
--- a/wp-config-docker.php
+++ b/wp-config-docker.php
@@ -26,7 +26,7 @@
 // a helper function to lookup "env_FILE", "env", then fallback
 function getenv_docker($env, $default) {
 	if ($fileEnv = getenv($env . '_FILE')) {
-		return file_get_contents($fileEnv);
+		return rtrim(file_get_contents($fileEnv), "\r\n");
 	}
 	else if (($val = getenv($env)) !== false) {
 		return $val;