Skip to content

Commit 9393afd

Browse files
add support for manually setting the Atatus framework (ATATUS_FRAMEWORK), update agent
1 parent ffc0ebd commit 9393afd

File tree

6 files changed

+16
-4
lines changed

6 files changed

+16
-4
lines changed

README.md

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

php/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM alpine:3.9
22

33
ARG PHP_VERSION=7.3
4-
ARG ATATUS_VERSION=1.9.0
4+
ARG ATATUS_VERSION=1.12.0
55
ARG ATATUS_ENABLED=TRUE
66

77
ENV \

php/Dockerfile-5.6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM alpine:3.8
22

33
ARG PHP_VERSION=5.6
4-
ARG ATATUS_VERSION=1.9.0
4+
ARG ATATUS_VERSION=1.12.0
55
ARG ATATUS_ENABLED=TRUE
66

77
ENV \

php/Dockerfile-7.4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM alpine:3.14
22

3-
ARG ATATUS_VERSION=1.9.0
3+
ARG ATATUS_VERSION=1.12.0
44
ARG ATATUS_ENABLED=TRUE
55

66
ENV \

php/Dockerfile-8.0

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM alpine:3.14
22

33
ARG PHP_VERSION=8
4-
ARG ATATUS_VERSION=1.11.0
4+
ARG ATATUS_VERSION=1.12.0
55
ARG ATATUS_ENABLED=TRUE
66

77
ENV \

php/scripts/configure.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,17 @@ if [ ! -z "$ATATUS_APM_LICENSE_KEY" ] && [ "$ATATUS_APM_LICENSE_KEY" != "test" ]
6363
sed -i -e "s/atatus.sql.capture = \"normalized\"/atatus.sql.capture = \"raw\"/g" /etc/php/current/conf.d/atatus.ini
6464

6565
fi
66+
67+
# Atatus - configure framework in use manually if set
68+
if [ ! -z "$ATATUS_FRAMEWORK" ]; then
69+
70+
# Enabled
71+
printf "\e[94m%-30s\e[0m \e[35m%-30s\e[0m\n" "Atatus Framework:" "$ATATUS_FRAMEWORK"
72+
73+
# Set the atatus framework
74+
sed -i -e "s/atatus.framework = \"\"/atatus.framework = \"$ATATUS_FRAMEWORK\"/g" /etc/php/current/conf.d/atatus.ini
75+
76+
fi
6677

6778
# Atatus - configure laravel queues if desirable
6879
if [ -z "$ATATUS_APM_DISABLE_LARAVEL_QUEUES" ]; then

0 commit comments

Comments
 (0)