From 726640bba4e8847b031e045c401bba3dd05314c8 Mon Sep 17 00:00:00 2001 From: Oskars Germovs Date: Sun, 15 Oct 2023 22:56:33 +0300 Subject: [PATCH] laravel.ini: 1.) added: tweaks docker-compose.yml: 1.) removed: from php-fpm* not needed port expost 2.) added: speedtest-tracker Signed-off-by: Oskars Germovs --- docker-compose.yml | 34 ++++++++++++++++++++++++++++------ php-fpm/laravel.ini | 10 +++++----- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 37535e7ae4..24f0d98c18 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -220,7 +220,6 @@ services: - "8100:9000" expose: - "8100" - - "9000" extra_hosts: - "dockerhost:${DOCKER_HOST_IP}" environment: @@ -244,7 +243,6 @@ services: - "8300:9000" expose: - "8300" - - "9000" extra_hosts: - "dockerhost:${DOCKER_HOST_IP}" environment: @@ -268,7 +266,6 @@ services: - "8200:9000" expose: - "8200" - - "9000" extra_hosts: - "dockerhost:${DOCKER_HOST_IP}" environment: @@ -292,7 +289,6 @@ services: - "8000:9000" expose: - "8000" - - "9000" extra_hosts: - "dockerhost:${DOCKER_HOST_IP}" environment: @@ -316,7 +312,6 @@ services: - "7400:9000" expose: - "7400" - - "9000" extra_hosts: - "dockerhost:${DOCKER_HOST_IP}" environment: @@ -340,7 +335,6 @@ services: - "5600:9000" expose: - "5600" - - "9000" extra_hosts: - "dockerhost:${DOCKER_HOST_IP}" environment: @@ -1343,6 +1337,7 @@ services: - "${HAPROXY_HOST_HTTP_PORT}:8085" volumes: - /var/run/docker.sock:/var/run/docker.sock + - ${DATA_PATH_HOST}/haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg links: - proxy - proxy2 @@ -2254,3 +2249,30 @@ services: networks: - frontend - backend + ### Speedtest Tracker ################################################## + speedtest-tracker: + expose: + - "8086" + - "8643" + ports: + - '8086:80' + - '8643:443' + environment: + - PUID=1000 + - PGID=1000 + - DB_CONNECTION=mysql + - DB_HOST=laradock-mysql-1 + - DB_PORT=3306 + - DB_DATABASE=${MYSQL_DATABASE} + - DB_USERNAME=${MYSQL_USER} + - DB_PASSWORD=${MYSQL_PASSWORD} + volumes: + - ${DATA_PATH_HOST}/speedtest-tracker/config/:/config + - ${DATA_PATH_HOST}/speedtest-tracker/ssl/web:/etc/ssl/web + image: 'ghcr.io/alexjustesen/speedtest-tracker:latest' + restart: unless-stopped + networks: + - backend + depends_on: + - workspace + - mysql diff --git a/php-fpm/laravel.ini b/php-fpm/laravel.ini index d491643b7a..b79258020e 100644 --- a/php-fpm/laravel.ini +++ b/php-fpm/laravel.ini @@ -1,16 +1,16 @@ -date.timezone=UTC -display_errors=Off +date.timezone=Europe/Riga +display_errors=On log_errors=On ; Maximum amount of memory a script may consume (128MB) ; http://php.net/memory-limit -memory_limit = 256M +memory_limit = 512M ; Maximum allowed size for uploaded files. ; http://php.net/upload-max-filesize -upload_max_filesize = 20M +upload_max_filesize = 512M ; Sets max size of post data allowed. ; http://php.net/post-max-size -post_max_size = 20M +post_max_size = 512M max_execution_time=600 default_socket_timeout=3600 request_terminate_timeout=600