Final fixups and improvements

Author: williamdes

README.md

@@ -0,0 +1,41 @@
+# A Docker EasyAppointments image
+
+## Usage
+
+Note: you need to login to ghcr.io using your GitHub account:
+
+```sh
+docker login ghcr.io
+```
+
+```yml
+version: "2.3"
+
+services:
+    easyappointments:
+    image: ghcr.io/sudo-bot/docker-easyappointments/docker-easyappointments:latest
+    environment:
+        BASE_URL: http://easyappointments
+        DB_HOST: mariadb.local
+        DB_NAME: easyappointments
+        DB_USERNAME: easyappointments
+        DB_PASSWORD: easyappointments
+        # DEBUG_MODE: true
+    healthcheck:
+        test:
+        [
+            "CMD",
+            "curl",
+            "-s",
+            "--fail",
+            "http://127.0.0.1/.nginx/status",
+                ]
+        start_period: 5s
+        interval: 15s
+        timeout: 1s
+    networks:
+        # The network where mariadb.local resolves to an IP
+        mynetwork:
+    ports:
+        - "127.0.0.36:80:80"
+```

docker/Dockerfile

@@ -45,7 +45,9 @@ USER deploy:deploy
 
 RUN curl -# -L -o easyappointments.zip ${DIST_URL} && \
     unzip -q easyappointments.zip && \
-    rm easyappointments.zip
+    rm easyappointments.zip && \
+    echo -e '\n$config["uri_protocol"] = "REQUEST_URI";' >> application/config/config.php && \
+    echo -e '\n$config["index_page"] = "";' >> application/config/config.php
 
 # Metadata
 LABEL org.label-schema.vendor="Sudo-Bot" \

docker/config.php

@@ -29,6 +29,7 @@
 $dbName = getenv('DB_NAME');
 $dbUsername = getenv('DB_USERNAME');
 $dbPassword = getenv('DB_PASSWORD');
+$debugMode = getenv('DEBUG_MODE') === 'true' ? 'true' : 'false';
 
 $dataConfig = <<<PHP
 class Config {
@@ -39,7 +40,7 @@ class Config {
 
     const BASE_URL      = '$baseUrl';
     const LANGUAGE      = 'french';
-    const DEBUG_MODE    = false;
+    const DEBUG_MODE    = $debugMode;
 
     // ------------------------------------------------------------------------
     // DATABASE SETTINGS

docker/nginx-default.conf

@@ -3,6 +3,7 @@ server {
     listen [::]:80 default_server;
     server_tokens off;
     autoindex off;
+    index index.html index.php;
 
     # https://alexanderallen.medium.com/forwarding-nginx-logs-to-docker-3bb6283a207
     error_log  stderr warn;
@@ -11,10 +12,6 @@ server {
     root /var/www/easyappointments;
     client_max_body_size 512M;
 
-    location / {
-        index index.php;
-    }
-
     location /.nginx/status {
         stub_status;
         allow all;
@@ -30,20 +27,36 @@ server {
 		return 200 "User-agent: *\nDisallow: /";
 	}
 
-    location ~ \.php$ {
-        fastcgi_pass unix:/run/phpfpm/php-fpm.sock;
-        # regex to split $uri to $fastcgi_script_name and $fastcgi_path
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+    # Deny for accessing codes
+    location ~ ^/(application|system|vendor|engine|storage)/ {
+        return 403;
+    }
 
-        # Check that the PHP script exists before passing it
-        try_files $fastcgi_script_name =404;
+    # set expiration of assets to MAX for caching
+    location ~ ^/(assets)/ {
+        expires max;
+    }
 
-        # Bypass the fact that try_files resets $fastcgi_path_info
-        # see: https://trac.nginx.org/nginx/ticket/321
-        set $path_info $fastcgi_path_info;
-        fastcgi_param PATH_INFO $path_info;
+    ## Disable .htaccess and other hidden files
+    location ~ /\. {
+        deny all;
+        access_log off;
+        log_not_found off;
+    }
 
-        fastcgi_index index.php;
+    location / {
+        # Check if a file or directory index file exists, else route it to index.php.
+        try_files $uri $uri/ /index.php?/$request_uri;
+    }
+
+    location ~* \.php$ {
+        try_files $uri =404;
+        fastcgi_pass unix:/run/phpfpm/php-fpm.sock;
         include fastcgi.conf;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_script_name;
+        fastcgi_intercept_errors on;
     }
+
 }