diff --git a/.github/workflows/_build-push-all.yml b/.github/workflows/_build-push-all.yml index 1e4d39ae7..d987bc617 100644 --- a/.github/workflows/_build-push-all.yml +++ b/.github/workflows/_build-push-all.yml @@ -69,7 +69,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504 + uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit @@ -105,7 +105,7 @@ jobs: ${{ env.DOCKERFILE_X }} - name: Build and push platform images to registries id: docker_build - uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0 + uses: docker/build-push-action@c84f38281176d4c9cdb1626ffafcd6b3911b5d94 with: build-args: ${{ inputs.build_args }} cache-from: type=local,src=${{ inputs.buildx_cache_dir }} diff --git a/.github/workflows/_build-test-image.yml b/.github/workflows/_build-test-image.yml index be5c55927..1f66cc8bb 100644 --- a/.github/workflows/_build-test-image.yml +++ b/.github/workflows/_build-test-image.yml @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504 + uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit @@ -71,7 +71,7 @@ jobs: run: mkdir -p ${{ env.ARTIFACT_WORK_DIR }} - name: Build image id: docker_build - uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0 + uses: docker/build-push-action@c84f38281176d4c9cdb1626ffafcd6b3911b5d94 with: build-args: ${{ secrets.build_args }} cache-from: type=local,src=${{ inputs.buildx_cache_dir }} diff --git a/.github/workflows/_config.yml b/.github/workflows/_config.yml index d4b138c66..64a903509 100644 --- a/.github/workflows/_config.yml +++ b/.github/workflows/_config.yml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504 + uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit diff --git a/.github/workflows/_lint.yml b/.github/workflows/_lint.yml index e26bb51f7..d4d8d64d9 100644 --- a/.github/workflows/_lint.yml +++ b/.github/workflows/_lint.yml @@ -45,7 +45,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504 + uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit diff --git a/.github/workflows/_metadata.yml b/.github/workflows/_metadata.yml index f2460c81e..53ef9ccfc 100644 --- a/.github/workflows/_metadata.yml +++ b/.github/workflows/_metadata.yml @@ -41,7 +41,7 @@ jobs: tags: ${{ steps.prep.outputs.tags }} steps: - name: Harden Runner - uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504 + uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit diff --git a/.github/workflows/_test-image.yml b/.github/workflows/_test-image.yml index 04e76b931..8000ab102 100644 --- a/.github/workflows/_test-image.yml +++ b/.github/workflows/_test-image.yml @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504 + uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e4b3ac8d8..49533479b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504 + uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index e5c08579d..51ca028d1 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504 + uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index c5e5c162c..b7fe78096 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504 + uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - name: Checkout diff --git a/Dockerfile b/Dockerfile index b88d50bf0..63ad1b856 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=10.277 +ARG FOUNDRY_VERSION=10.278 ARG NODE_IMAGE_VERSION=16-alpine3.15 ARG VERSION diff --git a/README.md b/README.md index 7482d5180..2f7e70892 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![GitHub Build Status](https://github.com/felddy/foundryvtt-docker/workflows/build/badge.svg)](https://github.com/felddy/foundryvtt-docker/actions/workflows/build.yml) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5966/badge)](https://bestpractices.coreinfrastructure.org/projects/5966) [![CodeQL](https://github.com/felddy/foundryvtt-docker/workflows/CodeQL/badge.svg)](https://github.com/felddy/foundryvtt-docker/actions/workflows/codeql-analysis.yml) -[![FoundryVTT Release Version: v10.277](https://img.shields.io/badge/prerelease-v10.277-red?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/10.277) +[![FoundryVTT Release Version: v10.278](https://img.shields.io/badge/prerelease-v10.278-red?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/10.278) [![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) @@ -210,8 +210,8 @@ It is recommended that most users use the `:release` tag. |-----------|-------------| |`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:prerelease` | The most recent image from the `testing`, `development`, or `prototype` channels. Pre-releases are **VERY LIKELY to introduce breaking bugs** that will be disruptive to play. Do not install this version unless you are using for the specific purposes of testing. The intention of pre-release builds are to allow for previewing new features and to help developers to begin updating modules which are impacted by the changes. If you choose to update to this version for a live game you do so entirely at your own risk of having a bad experience. *Please back up your critical user data before installing this version.* | -|`felddy/foundryvtt:10.277.0`| An exact image version. | -|`felddy/foundryvtt:10.277`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:10.278.0`| An exact image version. | +|`felddy/foundryvtt:10.278`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:10`| 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/) | @@ -265,7 +265,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-10.277.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-10.278.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` | @@ -291,7 +291,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. | `10.277` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `10.278` | | `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` | @@ -326,8 +326,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=10.277.0 \ - --tag felddy/foundryvtt:10.277.0 \ + --build-arg VERSION=10.278.0 \ + --tag felddy/foundryvtt:10.278.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -357,9 +357,9 @@ Docker: docker buildx build \ --file Dockerfile-x \ --platform linux/amd64 \ - --build-arg VERSION=10.277.0 \ + --build-arg VERSION=10.278.0 \ --output type=docker \ - --tag felddy/foundryvtt:10.277.0 . + --tag felddy/foundryvtt:10.278.0 . ``` ## Pre-installed distribution builds ## @@ -377,8 +377,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=10.277.0 \ - --tag felddy/foundryvtt:10.277.0 \ + --build-arg VERSION=10.278.0 \ + --tag felddy/foundryvtt:10.278.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -387,8 +387,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=10.277.0 \ - --tag felddy/foundryvtt:10.277.0 \ + --build-arg VERSION=10.278.0 \ + --tag felddy/foundryvtt:10.278.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index 496ef1a0a..346ddd0a2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,7 +47,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=10.277 + # - FOUNDRY_VERSION=10.278 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/package.json b/package.json index 2d1b7dc54..295cd5345 100644 --- a/package.json +++ b/package.json @@ -4,20 +4,20 @@ "url": "https://github.com/felddy/foundryvtt-docker/issues" }, "dependencies": { - "cheerio": "^1.0.0-rc.10", + "cheerio": "^1.0.0-rc.12", "docopt": "^0.6.2", - "fetch-cookie": "^2.0.3", - "node-fetch": "^3.2.3", + "fetch-cookie": "^2.1.0", + "node-fetch": "^3.2.10", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.6.0" + "winston": "^3.8.1" }, "description": "Utilities to help boot a FoundryVTT server.", "devDependencies": { "@types/cheerio": "^0.22.31", "@types/docopt": "^0.6.33", - "@types/tough-cookie": "^4.0.1", + "@types/tough-cookie": "^4.0.2", "@types/tough-cookie-file-store": "^2.0.1", - "typescript": "^4.6.2" + "typescript": "^4.7.4" }, "homepage": "https://github.com/felddy/foundryvtt-docker#readme", "keywords": [ diff --git a/src/_version.py b/src/_version.py index 7c310d729..2531a5ba8 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "10.277.0" +__version__ = "10.278.0"