diff --git a/docker-compose.yml b/docker-compose.yml index f2ae0ab7a..ab2d14586 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,14 +3,16 @@ services: build: context: . dockerfile: ./docker/php/Dockerfile - command: bash /var/www/html/docker/php/entrypoint.sh ports: - "80:80" volumes: - ./docker/php/apache.conf:/etc/apache2/sites-available/000-default.conf + - ./docker/php/custom.ini:/etc/php/8.2/apache2/conf.d/99-custom.ini - ./docker/php/logs:/var/log/apache2 - ./:/var/www/html - vendor:/var/www/html/vendor + depends_on: + - db db: image: mariadb @@ -31,8 +33,19 @@ services: ports: - "8088:8080" volumes: - - ./docker/adminer/php.ini:/etc/php/7.4/cli/conf.d/php.local.ini + - ./docker/adminer/php.ini:/etc/php/7.4/cli/conf.d/php.local.ini + phpmyadmin: + image: phpmyadmin + ports: + - "8081:80" + environment: + - PMA_HOST=db + - PMA_UPLOAD_LIMIT=1G + - UPLOAD_LIMIT=1G + - MYSQL_ROOT_PASSWORD=junghan5 + depends_on: + - db volumes: vendor: diff --git a/docker/php/clean_logs.sh b/docker/php/clean_logs.sh deleted file mode 100644 index 4f8ae3420..000000000 --- a/docker/php/clean_logs.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Variables -LOG_DIR="/var/log/apache2" -ERROR_LOG="${LOG_DIR}/error.log" -ACCESS_LOG="${LOG_DIR}/access.log" -LINES_TO_KEEP=50 - -# Truncate logs to keep only the last 50 lines -tail -n $LINES_TO_KEEP $ERROR_LOG > ${ERROR_LOG}.tmp && mv ${ERROR_LOG}.tmp $ERROR_LOG -tail -n $LINES_TO_KEEP $ACCESS_LOG > ${ACCESS_LOG}.tmp && mv ${ACCESS_LOG}.tmp $ACCESS_LOG diff --git a/docker/php/custom.ini b/docker/php/custom.ini new file mode 100644 index 000000000..2036db3c4 --- /dev/null +++ b/docker/php/custom.ini @@ -0,0 +1,6 @@ +max_execution_time = 600 +memory_limit = 4G +display_errors = On +display_startup_errors = On +log_errors = On +error_log = /var/log/apache2/php_errors.log \ No newline at end of file diff --git a/docker/php/entrypoint.sh b/docker/php/entrypoint.sh deleted file mode 100644 index 8a7435fc8..000000000 --- a/docker/php/entrypoint.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -trap "echo 'Stopping Apache...'; apachectl stop; exit 0" SIGTERM -apachectl -D FOREGROUND & -# Wait for Apache and all child processes to exit -wait $!