diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 53a7f22c8..a7e85e33e 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -57,7 +57,7 @@ body: description: Paste the output from the command above. This will be automatically formatted, so no need for backticks. render: shell placeholder: | - com.foundryvtt.version = "11.308" + com.foundryvtt.version = "11.309" org.opencontainers.image.authors = "markf+github@geekpad.com" org.opencontainers.image.created = "2022-09-01T23:22:04.337Z" org.opencontainers.image.description = "An easy-to-deploy Dockerized Foundry Virtual Tabletop server." @@ -67,7 +67,7 @@ body: org.opencontainers.image.title = "foundryvtt-docker" org.opencontainers.image.url = "https://github.com/felddy/foundryvtt-docker" org.opencontainers.image.vendor = "Geekpad" - org.opencontainers.image.version = "11.308.0" + org.opencontainers.image.version = "11.309.0" validations: required: true - type: textarea @@ -78,7 +78,7 @@ body: render: console placeholder: | foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [debug] Timezone set to: US/Eastern - foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v11.308.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v11.309.0 foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [debug] CONTAINER_VERBOSE set. Debug logging enabled. foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Reading configured secrets from: /run/secrets/config.json foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] No Foundry Virtual Tabletop installation detected. diff --git a/.github/ISSUE_TEMPLATE/regression.yml b/.github/ISSUE_TEMPLATE/regression.yml index 18565efcc..708fceaf9 100644 --- a/.github/ISSUE_TEMPLATE/regression.yml +++ b/.github/ISSUE_TEMPLATE/regression.yml @@ -72,7 +72,7 @@ body: description: Paste the output from the command above. This will be automatically formatted, so no need for backticks. render: shell placeholder: | - com.foundryvtt.version = "11.308" + com.foundryvtt.version = "11.309" org.opencontainers.image.authors = "markf+github@geekpad.com" org.opencontainers.image.created = "2022-09-01T23:22:04.337Z" org.opencontainers.image.description = "An easy-to-deploy Dockerized Foundry Virtual Tabletop server." @@ -82,7 +82,7 @@ body: org.opencontainers.image.title = "foundryvtt-docker" org.opencontainers.image.url = "https://github.com/felddy/foundryvtt-docker" org.opencontainers.image.vendor = "Geekpad" - org.opencontainers.image.version = "11.308.0" + org.opencontainers.image.version = "11.309.0" validations: required: true - type: textarea @@ -93,7 +93,7 @@ body: render: console placeholder: | foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [debug] Timezone set to: US/Eastern - foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v11.308.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v11.309.0 foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [debug] CONTAINER_VERBOSE set. Debug logging enabled. foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Reading configured secrets from: /run/secrets/config.json foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] No Foundry Virtual Tabletop installation detected. diff --git a/Dockerfile b/Dockerfile index ebf44f47b..8a916b85e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=11.308 +ARG FOUNDRY_VERSION=11.309 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index b0f0d7d08..90e582cfc 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ [![CodeQL](https://github.com/felddy/foundryvtt-docker/workflows/CodeQL/badge.svg)](https://github.com/felddy/foundryvtt-docker/actions/workflows/codeql-analysis.yml) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/felddy/foundryvtt-docker/badge)](https://securityscorecards.dev/viewer/?uri=github.com/felddy/foundryvtt-docker) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5966/badge)](https://bestpractices.coreinfrastructure.org/projects/5966) -[![FoundryVTT Release Version: v11.308](https://img.shields.io/badge/release-v11.308-brightgreen?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAIRlWElmTU0AKgAAAAgABQESAAMAAAABAAEAAAEaAAUAAAABAAAASgEbAAUAAAABAAAAUgEoAAMAAAABAAIAAIdpAAQAAAABAAAAWgAAAAAAAABIAAAAAQAAAEgAAAABAAOgAQADAAAAAQABAACgAgAEAAAAAQAAAA6gAwAEAAAAAQAAAA4AAAAATspU+QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAAAiFJREFUKBVVks1rE1EUxc+d5tO0prZVSZsUhSBIPyC02ooWurJ0I7rQlRvdC/4N4h9gt7pyoRTswpWgILgQBIOIiC340VhbpC0Ek85MGmPmXc+baWpNGJg77/7uOffeB+z9FHB0FrH9eLwwqpOF0f34KrpsTicW+6L8KE8QhO/n8n1IOgtQHYZA+a/Ai9+Wd6v1g7liq5A2OjKSQNa9hkO4hAzOIylf6CHALk6hoWXsylPkfjyyApaJhVCxmERy5zLSuI7D8h1H5BWht1aBhS6wdI3pN7GabyuyS4JPrchzujmNjDxAVrrRL2PoxRSGxOfjssgEjkkJvVJBWu6h5M7YenvDoOO0OgicD4TPIKWbBG6xvwTaKCMwSU7hKxK6gt8mbsFIMaF5iDyjUg6iPnqc58higCr9fD4iTvWMziAmK2g73f/AADVWX0YXrlChirgOcqL3WXYBYpTfUuxzjkW30dI1C0ZW1RnjMopo4C56MIs6CgQrMER2cJoz9zjdO2iz17g2yZUjqzHWbuA4/ugiEz7DVRe/aLxmcvDQ5Cq+oWGWeDbAgiETXgArrVOFGzR0EkclxrVMcpfLgFThY5roe2yz95ZZkzcbj22+w2VG8Pz6Q/b5Gr6uM9mw04uo6ll4tOlhE8a8xNzGYihCJoT+u3I4kUIp6OM0X9CHHds8frbqsrXlh9CB62nj8L5a9Y4DHR/K68TgcHhoz607Qp34L72X0rdSdM+vAAAAAElFTkSuQmCC)](https://foundryvtt.com/releases/11.308) +[![FoundryVTT Release Version: v11.309](https://img.shields.io/badge/release-v11.309-brightgreen?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAIRlWElmTU0AKgAAAAgABQESAAMAAAABAAEAAAEaAAUAAAABAAAASgEbAAUAAAABAAAAUgEoAAMAAAABAAIAAIdpAAQAAAABAAAAWgAAAAAAAABIAAAAAQAAAEgAAAABAAOgAQADAAAAAQABAACgAgAEAAAAAQAAAA6gAwAEAAAAAQAAAA4AAAAATspU+QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAAAiFJREFUKBVVks1rE1EUxc+d5tO0prZVSZsUhSBIPyC02ooWurJ0I7rQlRvdC/4N4h9gt7pyoRTswpWgILgQBIOIiC340VhbpC0Ek85MGmPmXc+baWpNGJg77/7uOffeB+z9FHB0FrH9eLwwqpOF0f34KrpsTicW+6L8KE8QhO/n8n1IOgtQHYZA+a/Ai9+Wd6v1g7liq5A2OjKSQNa9hkO4hAzOIylf6CHALk6hoWXsylPkfjyyApaJhVCxmERy5zLSuI7D8h1H5BWht1aBhS6wdI3pN7GabyuyS4JPrchzujmNjDxAVrrRL2PoxRSGxOfjssgEjkkJvVJBWu6h5M7YenvDoOO0OgicD4TPIKWbBG6xvwTaKCMwSU7hKxK6gt8mbsFIMaF5iDyjUg6iPnqc58higCr9fD4iTvWMziAmK2g73f/AADVWX0YXrlChirgOcqL3WXYBYpTfUuxzjkW30dI1C0ZW1RnjMopo4C56MIs6CgQrMER2cJoz9zjdO2iz17g2yZUjqzHWbuA4/ugiEz7DVRe/aLxmcvDQ5Cq+oWGWeDbAgiETXgArrVOFGzR0EkclxrVMcpfLgFThY5roe2yz95ZZkzcbj22+w2VG8Pz6Q/b5Gr6uM9mw04uo6ll4tOlhE8a8xNzGYihCJoT+u3I4kUIp6OM0X9CHHds8frbqsrXlh9CB62nj8L5a9Y4DHR/K68TgcHhoz607Qp34L72X0rdSdM+vAAAAAElFTkSuQmCC)](https://foundryvtt.com/releases/11.309) [![Docker Pulls](https://img.shields.io/docker/pulls/felddy/foundryvtt)](https://hub.docker.com/r/felddy/foundryvtt) [![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/felddy/foundryvtt)](https://hub.docker.com/r/felddy/foundryvtt) @@ -43,17 +43,21 @@ docker run \ felddy/foundryvtt:release ``` -If you are using `bash`, or a similar shell, consider pre-pending the Docker -command with a space to prevent your credentials from being committed to the -shell history list. See: -[`HISTCONTROL`](https://www.gnu.org/software/bash/manual/html_node/Bash-Variables.html#index-HISTCONTROL) +> [!NOTE] +> If you are using `bash`, or a similar shell, consider pre-pending the Docker +> command with a space to prevent your credentials from being committed to the +> shell history list. See: +> [`HISTCONTROL`](https://www.gnu.org/software/bash/manual/html_node/Bash-Variables.html#index-HISTCONTROL) ### Running with Docker and a temporary URL ### -Alternatively, you may acquire a temporary download token from your user profile -page on the Foundry website. On the "Purchased Licenses" page, click the [🔗] -icon to the right of the standard `Node.js` download link to obtain a temporary -download URL for the software. +Alternatively, you may acquire a temporary download URL from your user profile +page on the Foundry website. + +1. Navigate to the [`Purchased Software Licenses` page](https://foundryvtt.com/me/licenses). +1. Change the `Operating System` menu item to `Linux/NodeJS`. +1. Click the `🔗 Timed URL` button to obtain the temporary URL. +1. Use the following command to start up a Foundry Virtual Tabletop server: ```console docker run \ @@ -208,8 +212,8 @@ It is recommended that most users use the `:release` tag. | Image:tag | Description | |-----------|-------------| |`felddy/foundryvtt:release` | The most recent image from the `stable` channel. These images are **considered stable**, and well-tested. Most users will use this tag. The `latest` tag always points to the same version as `release`.| -|`felddy/foundryvtt:11.308.0`| An exact image version. | -|`felddy/foundryvtt:11.308`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:11.309.0`| An exact image version. | +|`felddy/foundryvtt:11.309`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:11`| The most recent image matching the major version number. | |`felddy/foundryvtt:latest`| See the `release` tag. [Why does `latest` == `release`?](https://vsupalov.com/docker-latest-tag/) | @@ -263,7 +267,7 @@ secrets](#using-secrets) instead of environment variables. | Name | Purpose | Default | |-------|---------|---------| -| `CONTAINER_CACHE` | Set a path to cache downloads of the Foundry distribution archive and speed up subsequent container startups. The path should be in `/data` or another persistent mount point in the container. Set to `""` to disable. ***Note***: When the cache is disabled the container may sleep instead of exiting, in certain circumstances, to prevent a download loop. A distribution can be pre-downloaded and placed into a cache directory. The distribution's name must be of the form: `foundryvtt-11.308.zip`| `/data/container_cache` | +| `CONTAINER_CACHE` | Set a path to cache downloads of the Foundry distribution archive and speed up subsequent container startups. The path should be in `/data` or another persistent mount point in the container. Set to `""` to disable. ***Note***: When the cache is disabled the container may sleep instead of exiting, in certain circumstances, to prevent a download loop. A distribution can be pre-downloaded and placed into a cache directory. The distribution's name must be of the form: `foundryvtt-11.309.zip`| `/data/container_cache` | | `CONTAINER_PATCHES` | Set a path to a directory of shell scripts to be sourced after Foundry is installed but before it is started. The path should be in `/data` or another persistent mount point in the container. e.g.; `/data/container_patches` Patch files are sourced in lexicographic order. `CONTAINER_PATCHES` are processed after `CONTAINER_PATCH_URLS`.| | | `CONTAINER_PATCH_URLS` | Set to a space-delimited list of URLs to be sourced after Foundry is installed but before it is started. Patch URLs are sourced in the order specified. `CONTAINER_PATCH_URLS` are processed before `CONTAINER_PATCHES`. ⚠️ **Only use patch URLs from trusted sources!** | | | `CONTAINER_PRESERVE_CONFIG` | Normally new `options.json` and `admin.txt` files are generated by the container at each startup. Setting this to `true` prevents the container from modifying these files when they exist. If they do not exist, they will be created as normal. | `false` | @@ -293,7 +297,7 @@ secrets](#using-secrets) instead of environment variables. | `FOUNDRY_UID` | `uid` the daemon will be run under. | `foundry` | | `FOUNDRY_UPNP` | Allow Universal Plug and Play to automatically request port forwarding for the Foundry server port to your local network address. | `false` | | `FOUNDRY_UPNP_LEASE_DURATION` | Sets the Universal Plug and Play lease duration, allowing for the possibility of permanent leases for routers which do not support temporary leases. To define an indefinite lease duration set the value to `0`. | `null` | -| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `11.308` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `11.309` | | `FOUNDRY_WORLD` | The world to startup at system start. | `null` | | `TIMEZONE` | Container [TZ database name](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List) | `UTC` | @@ -328,8 +332,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=11.308.0 \ - --tag felddy/foundryvtt:11.308.0 \ + --build-arg VERSION=11.309.0 \ + --tag felddy/foundryvtt:11.309.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -352,9 +356,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=11.308.0 \ + --build-arg VERSION=11.309.0 \ --output type=docker \ - --tag felddy/foundryvtt:11.308.0 . + --tag felddy/foundryvtt:11.309.0 . ``` ## Pre-installed distribution builds ## @@ -372,8 +376,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=11.308.0 \ - --tag felddy/foundryvtt:11.308.0 \ + --build-arg VERSION=11.309.0 \ + --tag felddy/foundryvtt:11.309.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -382,8 +386,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=11.308.0 \ - --tag felddy/foundryvtt:11.308.0 \ + --build-arg VERSION=11.309.0 \ + --tag felddy/foundryvtt:11.309.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index 5e855ae96..9bdc3847e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,7 +50,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=11.308 + # - FOUNDRY_VERSION=11.309 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index cdb0ec0a2..1f76f1777 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "11.308.0" +__version__ = "11.309.0"