README.md

@@ -22,7 +22,7 @@ Download the [latest docker-compose.yml](https://github.com/NamelessMC/Nameless-
 Create a directory on the host with correct permissions. By default the containers use `www-data` user id 33, so:
 ```
 mkdir web
-chown -R 33:33 web
+chown 33:33 web
 ```
 
 Then run `docker compose up -d`.
@@ -36,42 +36,37 @@ Check container logs using `docker compose logs`.
 
 ## Development
 
-If you want to use Docker for developing NamelessMC, please see the [docker compose file in the main repository](https://github.com/NamelessMC/Nameless/blob/v2/docker-compose.yaml).
+If you want to use Docker for developing NamelessMC, please see the [docker compose file in the main repo](https://github.com/NamelessMC/Nameless/blob/v2/docker-compose.yaml).
 
 ## Updating
-First, follow regular update instructions on the website (uploading files etc). After the upgrade is complete and your website is back up, change the image tag to the new version (e.g. change from `v2.0` to `v2.1`) to get the newest PHP library versions.
+First, follow regular update instructions on the website (uploading files etc). After the upgrade is complete and your website is back up, change the image tag to the new version (e.g. change from `v2-pr7` to `v2-pr8`) to get the newest PHP library versions.
 
 ## Available tags
 
 ### Supported tags
 | Tag | NamelessMC version | PHP version | Receives updates\* | Notes
 | --- | ------------------ | ----------- | ---------------- | -----
-v2.1 | Latest v2.1.x release (currently 2.1.2) | 8.2 | Yes | Recommended tag
+v2.0.2 | v2.0.2 | 8.1 | Yes |
-v2.1.2 | v2.1.2 | 8.2 | Yes
+v2.0 | Latest v2.0.x release (currently 2.0.2) | 8.1 | Yes
-dev | v2 development | 8.2 | Yes | For development only. Downloads latest source code and includes composer and npm.
+dev | v2 development | 8.1 | Yes | For development only, reinstall frequently. Downloads latest source code and includes composer and yarnpkg.
 
 ### Legacy tags
 
 | Tag | NamelessMC version | PHP version | Receives updates\* | Notes
 | --- | ------------------ | ----------- | ---------------- | -----
-v2-pr7 | v2.0.0-pr7 | 7.4 | No |
+v2-pr7 | v2.0.0-pr7 | 7.4 | Yes |
-v2-pr8 | v2.0.0-pr8 | 7.4 | No |
+v2-pr8 | v2.0.0-pr8 | 7.4 | Yes |
-v2-pr9 | v2.0.0-pr9 | 7.4 | No |
+v2-pr9 | v2.0.0-pr9 | 7.4 | Yes |
-v2-pr9-php8 | v2.0.0-pr9 | 8.0 | No | Experimental
+v2-pr9-php8 | v2.0.0-pr9 | 8.0 | Yes | Experimental
-v2-pr10 | v2.0.0-pr10 | 8.0 | No | Use PHP 7.4 for compatibility
+v2-pr10 | v2.0.0-pr10 | 8.0 | Yes | Use PHP 7.4 for compatibility
-v2-pr10-php74 | v2.0.0-pr10 | 7.4 | No |
+v2-pr10-php74 | v2.0.0-pr10 | 7.4 | Yes |
-v2-pr11 | v2.0.0-pr11 | 8.0 | No |
+v2-pr11 | v2.0.0-pr11 | 8.0 | Yes |
-v2-pr11-php74 | v2.0.0-pr11 | 7.4 | No | For compatibility with legacy modules
+v2-pr11-php74 | v2.0.0-pr11 | 7.4 | Yes | For compatibility with legacy modules
-v2-pr12 | v2.0.0-pr12 | 8.0 | No |
+v2-pr12 | v2.0.0-pr12 | 8.0 | Yes |
-v2-pr12-php74 | v2.0.0-pr12 | 7.4 | No | For compatibility with legacy modules
+v2-pr12-php74 | v2.0.0-pr12 | 7.4 | Yes | For compatibility with legacy modules
-v2-pr13 | v2.0.0-pr13 | 8.2 (8.1 before 2022-12-12) | Yes |
+v2-pr13 | v2.0.0-pr13 | 8.1 | Yes |
-v2.0.0 | v2.0.0 | 8.2 (8.1 before 2022-12-12) | Yes |
+v2.0.0 | v2.0.0 | 8.1 | Yes |
-v2.0.1 | v2.0.1 | 8.2 (8.1 before 2022-12-12)  | Yes |
+v2.0.1 | v2.0.1 | 8.1 | Yes |
-v2.0.2 | v2.0.2 | 8.2 (8.1 before 2022-12-12) | Yes |
-v2.0 | Latest v2.0.x release (currently 2.0.3) | 8.2 (8.1 before 2022-12-12) | Yes |
-v2.0.3 | v2.0.3 | 8.2 | Yes |
-v2.1.0 | v2.1.0 | 8.2 | Yes |
-v2.1.1 | v2.1.1 | 8.2 | Yes |
 dev-php8 | v2 development | 8.0 | No | Use `:dev` instead, it now uses PHP 8
 
 \* Image updates, not NamelessMC updates. Only the latest NamelessMC version is supported.

docker-compose.hardened.yaml

@@ -3,7 +3,7 @@ version: '2.4'
 services:
 
   nginx:
-    image: namelessmc/nginx:v2.1
+    image: namelessmc/nginx:v2-pr13
     ports: ['8080:8080']
     volumes:
       - type: bind # same as php container
@@ -25,7 +25,7 @@ services:
     # restart: always
 
   php:
-    image: namelessmc/php:v2.1
+    image: namelessmc/php:v2-pr13
     volumes:
       - type: bind # same as web container
         source: ./web

docker-compose.yaml

@@ -3,7 +3,7 @@ version: '3.2'
 services:
 
   nginx:
-    image: namelessmc/nginx:v2.1
+    image: namelessmc/nginx:dev
     ports: ['8080:8080']
     volumes:
       - type: bind # same as php container
@@ -16,7 +16,7 @@ services:
     # restart: always
 
   php:
-    image: namelessmc/php:v2.1
+    image: namelessmc/php:dev
     volumes:
       - type: bind # same as web container
         source: ./web
@@ -26,7 +26,7 @@ services:
     # restart: always
 
   db:
-    image: mariadb:10.11
+    image: mariadb
     volumes:
       - type: bind
         source: ./db
@@ -36,5 +36,4 @@ services:
       MARIADB_USER: nameless
       MARIADB_PASSWORD: nameless
       MARIADB_DATABASE: nameless
-      MARIADB_AUTO_UPGRADE: 1
     # restart: always

php_fpm/Dockerfile

@@ -1,8 +1,8 @@
-FROM php:8.2-fpm-bullseye
+FROM php:8.1-fpm-bullseye
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 RUN chmod +x /usr/local/bin/install-php-extensions && \
-    install-php-extensions gd pdo_mysql mysqli zip exif intl
+    install-php-extensions gd pdo_mysql mysqli zip exif
 
 # php-fpm loads configuration in alphabetical order so prefix with zz-
 RUN { \