diff --git a/.dockerignore b/.dockerignore index f66e813..3f43985 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,4 +6,4 @@ **/Thumbs.db .dockerignore Dockerfile -docker-compose.yaml \ No newline at end of file +docker-compose.yaml diff --git a/.env.example b/.env.example index 723a259..d3b6bc9 100755 --- a/.env.example +++ b/.env.example @@ -9,3 +9,4 @@ DB_PORT=3306 DB_NAME=openchat DB_USER=user DB_PASSWORD=password +DB_ROOT_PASSWORD=secret diff --git a/docker-compose.yml b/docker-compose.yml index 5824f77..bd4e54b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ services: - 33060:3306 environment: # `secret` as password is used only in local development. - MYSQL_ROOT_PASSWORD: secret + MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD} # The application db user can't be named `root`. MYSQL_USER: ${DB_USER} # Requires that `DB_USER` has been defined. MYSQL_PASSWORD: ${DB_PASSWORD} # Requires that `DB_PASSWORD` has been defined. @@ -54,4 +54,4 @@ services: - 8080:8080 - 8888:8888 networks: - - openchat \ No newline at end of file + - openchat diff --git a/docker/config/nginx/default.conf b/docker/config/nginx/default.conf deleted file mode 100644 index 754b617..0000000 --- a/docker/config/nginx/default.conf +++ /dev/null @@ -1,32 +0,0 @@ -server { - listen 80; - - root /var/www/html; - - # Default index pages - index index.php; - - # Default character set - charset utf-8; - - # Dont send the nginx version number in error pages and server header - server_tokens off; - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass app:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - } - - # Deny .ht* access - location ~ /\.ht { - deny all; - } -} \ No newline at end of file diff --git a/docker/config/php/php.ini b/docker/config/php/php.ini index a761b1c..87f539f 100644 --- a/docker/config/php/php.ini +++ b/docker/config/php/php.ini @@ -1,3 +1,3 @@ upload_max_filesize = 10M post_max_size = 10M -memory_limit = 128M \ No newline at end of file +memory_limit = 128M diff --git a/docker/config/supervisor/supervisord.conf b/docker/config/supervisor/supervisord.conf index e5c1320..1387bce 100644 --- a/docker/config/supervisor/supervisord.conf +++ b/docker/config/supervisor/supervisord.conf @@ -20,4 +20,4 @@ stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 stderr_logfile=/dev/fd/2 -stderr_logfile_maxbytes=0 \ No newline at end of file +stderr_logfile_maxbytes=0