Merge branch 'master' of github.com:parallax/k8s-openresty-php

Author: Daynnnnn

README.md

@@ -36,6 +36,7 @@ For help running these locally with docker run see the [docker run reference](ht
 | SITE_BRANCH                     | The running branch of your project, i.e. 'master'. Used by NR for app name.                                     | ✓        | ✓   | ✓      |
 | ENVIRONMENT                     | The environment you're running in, i.e. 'qa' or 'production'. Used by NR for app name.                          | ✓        | ✓   | ✓      |
 | ATATUS_APM_LICENSE_KEY          | Your Atatus license key. Atatus won't be used if this is not set.                                               | ✖        | ✓   | ✓      |
+| ATATUS_FRAMEWORK                | Manually set the Atatus framework (see Atatus docs, typically "Laravel" or "Symfony")                           | ✖        | ✓   | ✓      |
 | ATATUS_APM_RAW_SQL              | Set to any value (1, true, etc) to use raw sql logging into Atatus                                              | ✖        | ✓   | ✓      |
 | PHP_MEMORY_MAX                  | Maximum PHP request memory, in megabytes (i.e. '256'). Defaults to 128.                                         | ✖        | ✓   | ✓      |
 | MAX_EXECUTION_TIME              | Maximum PHP and Nginx execution/fastcgi read timeout	                                                          | ✖        | ✓   | ✓      |

openresty/conf/default.conf

@@ -1,9 +1,15 @@
+map $http_host $robots {
+	~.parallax.dev 'noindex, nofollow';
+	default '';
+}
+
 server {
 	listen 80 default_server;
 
 	root /src-shared/public;
 
 	add_header Pod $hostname;
+	add_header X-Robots-Tag $robots;
 
 	index index.php index.html index.htm;
 
@@ -69,4 +75,4 @@ server {
     	internal;
     }
 
-}
+}

php/Dockerfile

@@ -1,7 +1,7 @@
 FROM alpine:3.9
 
 ARG PHP_VERSION=7.3
-ARG ATATUS_VERSION=1.9.0
+ARG ATATUS_VERSION=1.12.0
 ARG ATATUS_ENABLED=TRUE
 
 ENV \

php/Dockerfile-5.6

@@ -1,7 +1,7 @@
 FROM alpine:3.8
 
 ARG PHP_VERSION=5.6
-ARG ATATUS_VERSION=1.9.0
+ARG ATATUS_VERSION=1.12.0
 ARG ATATUS_ENABLED=TRUE
 
 ENV \
@@ -187,6 +187,11 @@ ADD /php/conf/php-fpm.conf /etc/php/current/php-fpm.conf
 ADD /php/conf/php.ini /etc/php/current/php.ini
 ADD /php/conf/php-www.conf /etc/php/current/php-fpm.d/www.conf
 
+# Root CA override
+ADD /php/conf/root.cer /etc/root-ca/root.cer
+RUN sed -i -e 's#;curl.cainfo =#curl.cainfo="/etc/root-ca/root.cer"#g' /etc/php5/php.ini
+RUN sed -i -e 's#;openssl.cafile=#openssl.cafile="/etc/root-ca/root.cer"#g' /etc/php5/php.ini
+
 # Clear out garbage
 RUN unset DEPS && rm -rf /run/php && rm -rf /run/php-fpm7.3
 

php/Dockerfile-7.4

@@ -1,6 +1,6 @@
 FROM alpine:3.14
 
-ARG ATATUS_VERSION=1.9.0
+ARG ATATUS_VERSION=1.12.0
 ARG ATATUS_ENABLED=TRUE
 
 ENV \

php/Dockerfile-8.0

@@ -1,7 +1,7 @@
 FROM alpine:3.14
 
 ARG PHP_VERSION=8
-ARG ATATUS_VERSION=1.11.0
+ARG ATATUS_VERSION=1.12.0
 ARG ATATUS_ENABLED=TRUE
 
 ENV \

php/conf/root.cer

@@ -63,6 +63,17 @@ if [ ! -z "$ATATUS_APM_LICENSE_KEY" ] && [ "$ATATUS_APM_LICENSE_KEY" != "test" ]
 	    sed -i -e "s/atatus.sql.capture = \"normalized\"/atatus.sql.capture = \"raw\"/g" /etc/php/current/conf.d/atatus.ini
 
 	fi
+
+    # Atatus - configure framework in use manually if set
+    if [ ! -z "$ATATUS_FRAMEWORK" ]; then
+    
+        # Enabled
+        printf "\e[94m%-30s\e[0m \e[35m%-30s\e[0m\n" "Atatus Framework:" "$ATATUS_FRAMEWORK"
+    
+        # Set the atatus framework
+        sed -i -e "s/atatus.framework = \"\"/atatus.framework = \"$ATATUS_FRAMEWORK\"/g" /etc/php/current/conf.d/atatus.ini
+    
+    fi
 
 	# Atatus - configure laravel queues if desirable
 	if [ -z "$ATATUS_APM_DISABLE_LARAVEL_QUEUES" ]; then