Fix #48

Author: RobiNN1

Dockerfile

@@ -18,27 +18,31 @@ COPY --from=builder /usr/local/lib/php/extensions /usr/local/lib/php/extensions
 COPY --from=builder /usr/local/etc/php/conf.d /usr/local/etc/php/conf.d
 COPY --from=builder /app /var/www/html
 
-# NGINX configuration is here intentionally
-RUN apk add --no-cache nginx \
-    && mkdir -p /var/www/html/tmp \
-    && chown -R nobody:nobody /var/www/html \
-    && chmod -R 777 /var/www/html \
-    && mkdir -p /run/nginx \
-    && echo 'server { \
-    listen 80; \
-    root /var/www/html; \
-    index index.php; \
-    location / { \
-        try_files $uri $uri/ /index.php?$query_string; \
-    } \
-    location ~ \.php$ { \
-        fastcgi_pass 127.0.0.1:9000; \
-        fastcgi_index index.php; \
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; \
-        include fastcgi_params; \
-    } \
-}' > /etc/nginx/http.d/default.conf
-
-EXPOSE 80
-
-CMD php-fpm -D && nginx -g 'daemon off;'
+RUN apk add --no-cache nginx gettext \
+    && mkdir -p /var/www/html/tmp /run/nginx /var/cache/nginx /var/log/nginx \
+    && chmod -R 777 /var/www/html /run/nginx /var/cache/nginx /var/log/nginx \
+    && sed -i 's|^listen = .*|listen = 127.0.0.1:9000|' /usr/local/etc/php-fpm.d/www.conf
+
+ENV PCA_NGINX_PORT=8080
+
+# NGINX config template
+RUN printf 'server {\n\
+    listen ${PCA_NGINX_PORT};\n\
+    root /var/www/html;\n\
+    index index.php;\n\
+    location / {\n\
+        try_files $uri $uri/ /index.php$is_args$args;\n\
+    }\n\
+    location ~ \\.php$ {\n\
+        fastcgi_pass 127.0.0.1:9000;\n\
+        fastcgi_index index.php;\n\
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;\n\
+        include fastcgi_params;\n\
+    }\n\
+}\n' > /etc/nginx/http.d/default.conf.template
+
+EXPOSE 8080
+
+CMD envsubst '${PCA_NGINX_PORT}' < /etc/nginx/http.d/default.conf.template > /etc/nginx/http.d/default.conf \
+    && php-fpm -D \
+    && nginx -g 'daemon off;'

README.md

@@ -84,8 +84,10 @@ Memcached:
 - `PCA_MEMCACHED_0_PORT` Optional when the default port is used.
 - `PCA_MEMCACHED_0_PATH` Unix domain socket (optional).
 
-PHP:
+Other:
+
 - `PCA_PHP_MEMORY_LIMIT` In case you need to increase the PHP memory limit in Docker.
+- `PCA_NGINX_PORT` In case you need to change NGINX port in Docker.
 
 Open the [config](https://github.com/RobiNN1/phpCacheAdmin/blob/master/config.dist.php) file for more info.
 
@@ -98,7 +100,7 @@ A Docker image is also available: https://hub.docker.com/r/robinn/phpcacheadmin
 Run with a single command:
 
 ```bash
-docker run -p 8080:80 -d --name phpcacheadmin -e "PCA_REDIS_0_HOST=redis_host" -e "PCA_REDIS_0_PORT=6379" -e "PCA_MEMCACHED_0_HOST=memcached_host" -e "PCA_MEMCACHED_0_PORT=11211" robinn/phpcacheadmin
+docker run -p 8080:8080 -d --name phpcacheadmin -e "PCA_REDIS_0_HOST=redis_host" -e "PCA_REDIS_0_PORT=6379" -e "PCA_MEMCACHED_0_HOST=memcached_host" -e "PCA_MEMCACHED_0_PORT=11211" robinn/phpcacheadmin
 ```
 
 Or use it in **docker-compose.yml**
@@ -108,7 +110,7 @@ services:
   phpcacheadmin:
     image: robinn/phpcacheadmin
     ports:
-      - "8080:80"
+      - "8080:8080"
     #volumes:
     # If you want to use config.php instead of ENV variables
     #  - "./config.php:/var/www/html/config.php"

docker-compose.yml

@@ -2,7 +2,7 @@ services:
   phpcacheadmin:
     build: .
     ports:
-      - "8080:80"
+      - "8080:8080"
     volumes:
       - "./:/var/www/html/"
     environment: