diff --git a/README.md b/README.md index ff7a121..30fe0e4 100644 --- a/README.md +++ b/README.md @@ -42,11 +42,13 @@ If you want to use Docker for developing NamelessMC, please see the [docker comp 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-pr13** | **v2.0.0-pr13** | **8.1** | **Yes** | **Recommended** -dev | v2 development | 8.1 | Yes | Testing only, reinstall frequently. Downloads latest source code and includes composer and yarnpkg. +v2.0.1 | v2.0.1 | 8.1 | Yes | +v2.0 | Latest v2.0.x release | 8.1 | Yes +dev | v2 development | 8.1 | Yes | For development only, reinstall frequently. Downloads latest source code and includes composer and yarnpkg. ### Legacy tags @@ -62,6 +64,8 @@ v2-pr11 | v2.0.0-pr11 | 8.0 | Yes | v2-pr11-php74 | v2.0.0-pr11 | 7.4 | Yes | For compatibility with legacy modules v2-pr12 | v2.0.0-pr12 | 8.0 | Yes | v2-pr12-php74 | v2.0.0-pr12 | 7.4 | Yes | For compatibility with legacy modules +v2-pr13 | v2.0.0-pr13 | 8.1 | Yes | +v2.0.0 | v2.0.0 | 8.1 | 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. diff --git a/php_fpm/Dockerfile b/php_fpm/Dockerfile index 1de4d34..1565a33 100644 --- a/php_fpm/Dockerfile +++ b/php_fpm/Dockerfile @@ -29,6 +29,9 @@ ENV NAMELESS_PATH_HIDE=true # Enable friendly URLs and hide the option by default, they work fine with the included configuration and there is no reason to turn it off. ENV NAMELESS_FRIENDLY_URLS=true NAMELESS_FRIENDLY_URLS_HIDE=true +ARG NAMELESS_DOWNLOAD_VERSION=ERROR_NOT_SPECIFIED +ENV NAMELESS_DOWNLOAD_VERSION=NAMELESS_DOWNLOAD_VERSION + ENV PHP_PM="ondemand" \ PHP_PM_MAX_CHILDREN="16" \ PHP_PM_MAX_REQUESTS="200" \ diff --git a/php_fpm/entrypoint.sh b/php_fpm/entrypoint.sh index 6c15949..87177ff 100644 --- a/php_fpm/entrypoint.sh +++ b/php_fpm/entrypoint.sh @@ -13,7 +13,7 @@ else echo "Data directory is empty, downloading NamelessMC..." set -x mkdir -p /data - curl -L "https://github.com/NamelessMC/Nameless/releases/download/v2.0.0-pr13/nameless-deps-dist.tar.xz" | tar --xz --extract --no-same-owner --no-same-permissions --touch --directory=/data --file - + curl -L "https://github.com/NamelessMC/Nameless/releases/download/${NAMELESS_DOWNLOAD_VERSION}/nameless-deps-dist.tar.xz" | tar --xz --extract --no-same-owner --no-same-permissions --touch --directory=/data --file - cd /data # Remove some unnecessary files rm -rf \