Merge pull request #12 from startersclan/enhancement/ci-reduce-web-do…

…ckerfile-layers

Enhancement (ci): Reduce `web` Dockerfile layers

Dockerfile.web

@@ -59,11 +59,8 @@ RUN set -eux; \
     php -i; \
     php -m
 
-# Add default configs
-COPY ./config/web/supervisor.conf /supervisor.conf
-COPY ./config/web/etc/nginx/nginx.conf /etc/nginx/nginx.conf
-COPY ./config/web/usr/local/etc/php/conf.d/php.ini /usr/local/etc/php/conf.d/php.ini
-COPY ./config/web/usr/local/etc/php-fpm.d/php-fpm.conf /usr/local/etc/php-fpm.d/php-fpm.conf
+# Add configs
+COPY ./config/web/. /
 # Disable the built-in php-fpm configs, since we're using our own config
 RUN set -eux; \
     mv -v /usr/local/etc/php-fpm.d/docker.conf /usr/local/etc/php-fpm.d/docker.conf.disabled; \

README.md

@@ -34,7 +34,7 @@ a PHP frontend.
 
 ## Usage (docker)
 
-`web` image (See [./web/config.php](./web/config.php) for supported environment variables∑):
+`web` image (See [./web/config.php](./web/config.php) for supported environment variables):
 
 ```sh
 docker run --rm -it -e DB_ADDR=db -e DB_NAME=hlstatsxce -e DB_USER=hlstatsxce -e DB_PASS=hlstatsxce -p 80:80 startersclan/hlstatsx-community-edition:1.7.0-web
@@ -47,7 +47,7 @@ docker run --rm -it -e DB_ADDR=db -e DB_NAME=hlstatsxce -e DB_USER=hlstatsxce -e
 docker run --rm -it -p 27500:27500/udp startersclan/hlstatsx-community-edition:1.7.0-daemon --db-host=db:3306 --db-name=hlstatsxce --db-username=hlstatsxce --db-password=hlstatsxce #--help
 ```
 
-∑The tag convention is `<version>-<service>` or `<version>-<sha>-<service>`. For instance, for release `v1.2.3` on sha `0abcdef`:
+The tag convention is `<version>-<service>` or `<version>-<sha>-<service>`. For instance, for release `v1.2.3` on sha `0abcdef`:
 
 - `web` image tags: `1-web`, `1.2-web`, `1.2.3-web`, `1-0abcdef-web`, `1.2-0abcdef-web`, `1.2.3-0abcdef-web`
 - `daemon` image tags: `1-daemon`, `1.2-daemon`, `1.2.3-daemon`, `1-0abcdef-daemon`, `1.2-0abcdef-daemon`, `1.2.3-0abcdef-daemon`