fixed merge conflict

Author: Israel Derdik

container/root/run.sh

@@ -9,8 +9,9 @@ sed -i "s/worker_processes [0-9]\+/worker_processes $(nproc)/" $CONFIG_SERVER
 sed -i "s/worker_connections [0-9]\+/worker_connections 1024/" $CONFIG_SERVER
 
 echo '[nginx] piping logs to STDOUT'
-
-sed -i "s/access_log [a-z\/\.\;]\+/access_log \/dev\/stdout;/" $CONFIG_SERVER
+# Ensure nginx is configured to write logs to STDOUT 
+# Also set log_format to output SERVER_APP_NAME placeholder 
+sed -i "s/access_log [a-z\/\.\;]\+/            log_format main \'\$remote_addr - \$remote_user [\$time_local] \"\$request\" \$status \$bytes_sent \"\$http_referer\" \"\$http_user_agent\" LOG_APP_NAME\';\n        access_log \/dev\/stdout main;\n/" $CONFIG_SERVER
 sed -i "s/error_log [a-z\/\.\ \;]\+/error_log \/dev\/stdout info;/" $CONFIG_SERVER
 
 if [[ $SERVER_MAX_BODY_SIZE ]]