Merge pull request #20 from RunOnFlux/develop

make nginx.conf persistent
RunOnFlux · Feb 20, 2024 · 52a5316 · 52a5316
2 parents 3d82666 + bd23067
commit 52a5316
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 20 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -143,7 +143,7 @@ RUN { \
    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install MySQL client
-RUN apt-get update && apt-get install -y default-mysql-client
+RUN apt-get update && apt-get install -y default-mysql-client nano
 
 # Install WP-CLI
 RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \
@@ -208,4 +208,4 @@ EXPOSE 2222/tcp
 
 ENTRYPOINT ["/usr/local/docker-entrypoint.sh"]
 # Start PHP-FPM and Nginx servers
-CMD /usr/local/php-fpm.sh & nginx -g "daemon off;" -c "/etc/nginx/nginx.conf" & /usr/sbin/sshd -D
+CMD /usr/local/php-fpm.sh & nginx -g "daemon off;" -c "/var/www/nginx.conf" & /usr/sbin/sshd -D
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -32,6 +32,17 @@ else
     echo "File $file_path does not exist."
 fi
 
+#copy nginx config
+file_path="/etc/nginx/nginx.conf"
+dst_path="/var/www/nginx.conf"
+if [ -f "$dst_path" ]; then
+    echo "$dst_path already exist."
+else
+    echo "Creating $dst_path..."
+    cp "$file_path" "/var/www/"
+    echo "Nginx file copied successfully."
+fi
+
 # loop over "pluggable" content in the source, and if it already exists in the destination, skip it
 # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded)
 for contentPath in \

diff --git a/nginx.conf b/nginx.conf
@@ -59,7 +59,6 @@ http {
       fastcgi_pass php;
       fastcgi_index index.php;
       fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-      include fastcgi_params;
     }
 
     # Deny all attempts to access hidden files such as .htaccess or .htpasswd

diff --git a/wp-config.php b/wp-config.php
@@ -27,13 +27,13 @@
 // (it gets parsed by the upstream wizard in https://github.com/WordPress/WordPress/blob/f27cb65e1ef25d11b535695a660e7282b98eb742/wp-admin/setup-config.php#L356-L392)
 
 // a helper function to lookup "env_FILE", "env", then fallback
-if (!function_exists('getenv_docker')) {
+if ( !function_exists('getenv_docker') ) {
 	// https://github.com/docker-library/wordpress/issues/588 (WP-CLI will load this file 2x)
-	function getenv_docker($env, $default) {
-		if ($fileEnv = getenv($env . '_FILE')) {
-			return rtrim(file_get_contents($fileEnv), "\r\n");
+	function getenv_docker( $env, $default ) {
+		if ( $fileEnv = getenv( $env . '_FILE') ) {
+			return rtrim( file_get_contents( $fileEnv ), "\r\n" );
 		}
-		else if (($val = getenv($env)) !== false) {
+		else if ( ( $val = getenv( $env ) ) !== false ) {
 			return $val;
 		}
 		else {
@@ -44,13 +44,13 @@ function getenv_docker($env, $default) {
 
 // ** Database 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', 'test_db') );
+define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', '') );
 
 /** Database username */
-define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'root') );
+define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', '') );
 
 /** Database password */
-define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', '123secret') );
+define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', '') );
 
 /**
  * Docker image fallback values above are sourced from the official WordPress installation wizard:
@@ -59,7 +59,7 @@ function getenv_docker($env, $default) {
  */
 
 /** Database hostname */
-define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
+define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', '') );
 
 /** Database charset to use in creating database tables. */
 define( 'DB_CHARSET', getenv_docker('WORDPRESS_DB_CHARSET', 'utf8') );
@@ -116,9 +116,9 @@ function getenv_docker($env, $default) {
 // Check DB connection
 $mysqli = new mysqli(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
 $is_slave = true;
-if ($mysqli->connect_errno) {// this is a slave node
+if ( $mysqli->connect_errno ) {// this is a slave node
   //Disable cron on slave nodes
-  define('DISABLE_WP_CRON',true);
+  define( 'DISABLE_WP_CRON' , true );
   //Disable WP_AUTO_UPDATE_CORE on slave nodes
   define( 'WP_AUTO_UPDATE_CORE', false );
 } else {
@@ -128,16 +128,16 @@ function getenv_docker($env, $default) {
 
 // If we're behind a proxy server and using HTTPS, we need to alert WordPress of that fact
 // see also https://wordpress.org/support/article/administration-over-ssl/#using-a-reverse-proxy
-if (!empty($_SERVER['HTTP_HOST']) || $_SERVER['REMOTE_ADDR'] == '127.0.0.1') {
-  if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strpos($_SERVER['HTTP_X_FORWARDED_PROTO'], 'https') !== false) {
+if ( !empty( $_SERVER['HTTP_HOST'] ) || $_SERVER['REMOTE_ADDR'] === '127.0.0.1' ) {
+  if ( isset( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) && strpos( $_SERVER['HTTP_X_FORWARDED_PROTO'], 'https' ) !== false ) {
     $_SERVER['HTTPS'] = 'on';
   } else {
     define( 'WP_HOME', 'http://' . $_SERVER['HTTP_HOST'] . '/' );
     define( 'WP_SITEURL', 'http://' . $_SERVER['HTTP_HOST'] . '/' );
   }
 } else {
     // request comming from FDM health check, check if node is slave
-    if ($is_slave) {
+    if ( $is_slave ) {
       header('HTTP/1.1 500 Internal Server Error');
       echo 'Database connection failed';
       exit(0);
@@ -148,9 +148,7 @@ function getenv_docker($env, $default) {
     }
 }
 
-// (we include this by default because reverse proxying is extremely common in container environments)
-
-if ($configExtra = getenv_docker('WORDPRESS_CONFIG_EXTRA', '')) {
+if ( $configExtra = getenv_docker('WORDPRESS_CONFIG_EXTRA', '') ) {
 	// eval($configExtra);
 }