Remove newlines from _FILE contents

docker-library · Mar 16, 2021 · c313a26 · c313a26
1 parent 95ca33a
commit c313a26
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 19 deletions.
diff --git a/beta/php7.3/apache/wp-config-docker.php b/beta/php7.3/apache/wp-config-docker.php
diff --git a/beta/php7.3/fpm-alpine/wp-config-docker.php b/beta/php7.3/fpm-alpine/wp-config-docker.php
diff --git a/beta/php7.3/fpm/wp-config-docker.php b/beta/php7.3/fpm/wp-config-docker.php
diff --git a/beta/php7.4/apache/wp-config-docker.php b/beta/php7.4/apache/wp-config-docker.php
diff --git a/beta/php7.4/fpm-alpine/wp-config-docker.php b/beta/php7.4/fpm-alpine/wp-config-docker.php
diff --git a/beta/php7.4/fpm/wp-config-docker.php b/beta/php7.4/fpm/wp-config-docker.php
diff --git a/beta/php8.0/apache/wp-config-docker.php b/beta/php8.0/apache/wp-config-docker.php
diff --git a/beta/php8.0/fpm-alpine/wp-config-docker.php b/beta/php8.0/fpm-alpine/wp-config-docker.php
diff --git a/beta/php8.0/fpm/wp-config-docker.php b/beta/php8.0/fpm/wp-config-docker.php
diff --git a/latest/php7.3/apache/wp-config-docker.php b/latest/php7.3/apache/wp-config-docker.php
diff --git a/latest/php7.3/fpm-alpine/wp-config-docker.php b/latest/php7.3/fpm-alpine/wp-config-docker.php
diff --git a/latest/php7.3/fpm/wp-config-docker.php b/latest/php7.3/fpm/wp-config-docker.php
diff --git a/latest/php7.4/apache/wp-config-docker.php b/latest/php7.4/apache/wp-config-docker.php
diff --git a/latest/php7.4/fpm-alpine/wp-config-docker.php b/latest/php7.4/fpm-alpine/wp-config-docker.php
diff --git a/latest/php7.4/fpm/wp-config-docker.php b/latest/php7.4/fpm/wp-config-docker.php
diff --git a/latest/php8.0/apache/wp-config-docker.php b/latest/php8.0/apache/wp-config-docker.php
diff --git a/latest/php8.0/fpm-alpine/wp-config-docker.php b/latest/php8.0/fpm-alpine/wp-config-docker.php
diff --git a/latest/php8.0/fpm/wp-config-docker.php b/latest/php8.0/fpm/wp-config-docker.php
diff --git 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;