From 2e881be1afcfb33e8aa653ea1ed6d49c714f9fa1 Mon Sep 17 00:00:00 2001 From: Mark Feldhousen Date: Mon, 29 Apr 2024 14:02:43 -0400 Subject: [PATCH 001/139] Revert "Testing release 12.320.0" --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 28 +++++++++++++-------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 138aa5de3..afb4823cd 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 = "12.320" + com.foundryvtt.version = "11.315" 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 = "12.320.0" + org.opencontainers.image.version = "11.315.1" 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 v12.320.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v11.315.1 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 2fd6dd3a5..cea07a23d 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 = "12.320" + com.foundryvtt.version = "11.315" 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 = "12.320.0" + org.opencontainers.image.version = "11.315.1" 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 v12.320.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v11.315.1 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 765f80a2a..d31b77d4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.320 +ARG FOUNDRY_VERSION=11.315 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index 3280be6e9..4d9486f0a 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: v12.320](https://img.shields.io/badge/release-v12.320-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/12.320) +[![FoundryVTT Release Version: v11.315](https://img.shields.io/badge/release-v11.315-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.315) [![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) @@ -212,9 +212,9 @@ 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:12.320.0`| An exact image version. | -|`felddy/foundryvtt:12.320`| The most recent image matching the major and minor version numbers. | -|`felddy/foundryvtt:12`| The most recent image matching the major version number. | +|`felddy/foundryvtt:11.315.1`| An exact image version. | +|`felddy/foundryvtt:11.315`| 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/) | See the [tags tab](https://hub.docker.com/r/felddy/foundryvtt/tags) on Docker @@ -267,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-12.320.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.315.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.320` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `11.315` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.320.0 \ - --tag felddy/foundryvtt:12.320.0 \ + --build-arg VERSION=11.315.1 \ + --tag felddy/foundryvtt:11.315.1 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.320.0 \ + --build-arg VERSION=11.315.1 \ --output type=docker \ - --tag felddy/foundryvtt:12.320.0 . + --tag felddy/foundryvtt:11.315.1 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.320.0 \ - --tag felddy/foundryvtt:12.320.0 \ + --build-arg VERSION=11.315.1 \ + --tag felddy/foundryvtt:11.315.1 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.320.0 \ - --tag felddy/foundryvtt:12.320.0 \ + --build-arg VERSION=11.315.1 \ + --tag felddy/foundryvtt:11.315.1 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index a2822bb68..5660464fe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.320 + # - FOUNDRY_VERSION=11.315 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index 91926dc87..b830b3225 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.320.0" +__version__ = "11.315.1" From b8c6cd7f9e3ef42773a73ef70815fa87da869031 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 08:37:47 +0000 Subject: [PATCH 002/139] Bump coveralls from 3.3.1 to 4.0.0 Bumps [coveralls](https://github.com/TheKevJames/coveralls-python) from 3.3.1 to 4.0.0. - [Release notes](https://github.com/TheKevJames/coveralls-python/releases) - [Changelog](https://github.com/TheKevJames/coveralls-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/TheKevJames/coveralls-python/compare/3.3.1...4.0.0) --- updated-dependencies: - dependency-name: coveralls dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5ddbfe8b8..9ad45f5f8 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ def package_vars(version_file): extras_require={ "test": [ "coverage == 6.5.0", - "coveralls == 3.3.1", + "coveralls == 4.0.0", "docker == 7.0.0", "pre-commit == 3.7.0", "pytest == 8.2.0", From c5f27846d896d8b4d6886454c50d71678e07c305 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:51:34 +0000 Subject: [PATCH 003/139] Bump step-security/harden-runner from 2.7.0 to 2.7.1 Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.7.0 to 2.7.1. - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/63c24ba6bd7ba022e95695ff85de572c04a18142...a4aa98b93cab29d9b1101a6143fb8bce00e2eac4) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/stale-issues.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d065ff506..38986d853 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: block @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: block @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: block diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5947a5d65..b34feb250 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 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 22f956f35..fc45eaa42 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@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index e5287767f..2ae452035 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: audit # allowed-endpoints: > diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index 5998c2b8d..53879f9ee 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 8a316400e..e6a37ea41 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 From 3d708f96407d8e306d1553e025eba54e28502532 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:57:51 +0000 Subject: [PATCH 004/139] Bump actions/dependency-review-action from 4.2.5 to 4.3.1 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.2.5 to 4.3.1. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/5bbc3ba658137598168acb2ab73b21c432dd411b...e58c696e52cac8e62d61cc21fda89565d71505d7) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index fc45eaa42..11cf00715 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -18,4 +18,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 - name: 'Dependency Review' - uses: actions/dependency-review-action@5bbc3ba658137598168acb2ab73b21c432dd411b # tag=v4.2.5 + uses: actions/dependency-review-action@e58c696e52cac8e62d61cc21fda89565d71505d7 # tag=v4.3.1 From 4550eec96c5f427c932646f701e327fc17fbe2c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:04:40 +0000 Subject: [PATCH 005/139] Bump coverage from 6.5.0 to 7.5.0 Bumps [coverage](https://github.com/nedbat/coveragepy) from 6.5.0 to 7.5.0. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.5.0...7.5.0) --- updated-dependencies: - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9ad45f5f8..65e21d78d 100644 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ def package_vars(version_file): ], extras_require={ "test": [ - "coverage == 6.5.0", + "coverage == 7.5.0", "coveralls == 4.0.0", "docker == 7.0.0", "pre-commit == 3.7.0", From 07096e79ad1635bdd3499af663d6a6b06d738d30 Mon Sep 17 00:00:00 2001 From: Mark Feldhousen Date: Tue, 30 Apr 2024 12:25:35 -0400 Subject: [PATCH 006/139] Update setup.py Downgrade from 7.5.0. to 7.4.4 which is supported by coveralls 4.0.0 Signed-off-by: Mark Feldhousen --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 65e21d78d..3aaa78836 100644 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ def package_vars(version_file): ], extras_require={ "test": [ - "coverage == 7.5.0", + "coverage == 7.4.4", "coveralls == 4.0.0", "docker == 7.0.0", "pre-commit == 3.7.0", From 8a8e50cd550e3d5bf9b9bf1675f9b267613c9716 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 08:50:46 +0000 Subject: [PATCH 007/139] Bump actions/dependency-review-action from 4.3.1 to 4.3.2 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.3.1 to 4.3.2. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/e58c696e52cac8e62d61cc21fda89565d71505d7...0c155c5e8556a497adf53f2c18edabf945ed8e70) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 11cf00715..d613fe87c 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -18,4 +18,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 - name: 'Dependency Review' - uses: actions/dependency-review-action@e58c696e52cac8e62d61cc21fda89565d71505d7 # tag=v4.3.1 + uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # tag=v4.3.2 From 5d5bb894bebc9c3c412d987f60ab3e49085f1033 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 08:11:34 +0000 Subject: [PATCH 008/139] Bump actions/checkout from 4.1.4 to 4.1.5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/0ad4b8fadaa221de15dcec353f45205ec38ea70b...44c2b7a8a4ea60a981eaca3cf939b5f4305c123b) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/scorecards.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b34feb250..81983f17e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,7 +50,7 @@ jobs: egress-policy: audit - name: Checkout repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index d613fe87c..d88daf32b 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -16,6 +16,6 @@ jobs: with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 - name: 'Dependency Review' uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # tag=v4.3.2 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 2ae452035..b4a52acc7 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -108,7 +108,7 @@ jobs: echo "do_decryption=false" >> $GITHUB_OUTPUT fi - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 - id: setup-python uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # tag=v5.1.0 with: diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 9ac45c999..050893225 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -28,7 +28,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 with: persist-credentials: false diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index e6a37ea41..e7deb3db2 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -23,7 +23,7 @@ jobs: uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 - name: Sync repository labels if: success() uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b # tag=v5.0.0 From b9787503b867fe251519acfd7b0bfc381a1d2579 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 May 2024 20:32:57 +0000 Subject: [PATCH 009/139] Bump ossf/scorecard-action from 2.3.1 to 2.3.3 Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.1 to 2.3.3. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/0864cf19026789058feabb7e87baa5f140aac736...dc50aa9510b46c811795eb24b2f1ba02a914e534) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 050893225..6aef4b2fe 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -33,7 +33,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # tag=v2.3.1 + uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # tag=v2.3.3 with: results_file: results.sarif results_format: sarif From 63a098e68fdb68f84604a59066fa85b94d5ecf5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 08:23:59 +0000 Subject: [PATCH 010/139] Bump pre-commit from 3.7.0 to 3.7.1 Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.7.0 to 3.7.1. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v3.7.0...v3.7.1) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3aaa78836..394187574 100644 --- a/setup.py +++ b/setup.py @@ -76,7 +76,7 @@ def package_vars(version_file): "coverage == 7.4.4", "coveralls == 4.0.0", "docker == 7.0.0", - "pre-commit == 3.7.0", + "pre-commit == 3.7.1", "pytest == 8.2.0", "pytest-cov == 5.0.0", ] From 6ee472cdaa8a5c7de9ae833f4ac2853332ccbac8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 20:11:52 +0000 Subject: [PATCH 011/139] Bump coveralls from 4.0.0 to 4.0.1 Bumps [coveralls](https://github.com/TheKevJames/coveralls-python) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/TheKevJames/coveralls-python/releases) - [Changelog](https://github.com/TheKevJames/coveralls-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/TheKevJames/coveralls-python/compare/4.0.0...4.0.1) --- updated-dependencies: - dependency-name: coveralls dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 394187574..91a96862e 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ def package_vars(version_file): extras_require={ "test": [ "coverage == 7.4.4", - "coveralls == 4.0.0", + "coveralls == 4.0.1", "docker == 7.0.0", "pre-commit == 3.7.1", "pytest == 8.2.0", From e0cdf366648e91e9347609e3894cb26ca9571700 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 20:23:52 +0000 Subject: [PATCH 012/139] Bump actions/checkout from 4.1.5 to 4.1.6 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.5 to 4.1.6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/44c2b7a8a4ea60a981eaca3cf939b5f4305c123b...a5ac7e51b41094c92402da3b24376905380afc29) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/scorecards.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 81983f17e..8494dcc97 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,7 +50,7 @@ jobs: egress-policy: audit - name: Checkout repository - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index d88daf32b..53d078538 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -16,6 +16,6 @@ jobs: with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 - name: 'Dependency Review' uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # tag=v4.3.2 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index b4a52acc7..49535ca9b 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -108,7 +108,7 @@ jobs: echo "do_decryption=false" >> $GITHUB_OUTPUT fi - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 - id: setup-python uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # tag=v5.1.0 with: diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 6aef4b2fe..38d8ea073 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -28,7 +28,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 with: persist-credentials: false diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index e7deb3db2..de052539a 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -23,7 +23,7 @@ jobs: uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 - name: Sync repository labels if: success() uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b # tag=v5.0.0 From c1af2aa7516f6a3a58cd7594b36e55b53dcca1c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 08:01:40 +0000 Subject: [PATCH 013/139] Bump pytest from 8.2.0 to 8.2.1 Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.0 to 8.2.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.2.0...8.2.1) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 91a96862e..d1fd41423 100644 --- a/setup.py +++ b/setup.py @@ -77,7 +77,7 @@ def package_vars(version_file): "coveralls == 4.0.1", "docker == 7.0.0", "pre-commit == 3.7.1", - "pytest == 8.2.0", + "pytest == 8.2.1", "pytest-cov == 5.0.0", ] }, From a4463c1774aef0404c7685130509ec474a885047 Mon Sep 17 00:00:00 2001 From: Felddy Date: Wed, 22 May 2024 17:51:12 -0400 Subject: [PATCH 014/139] Pin requests dependency to work around docker-py incompatibility See: https://github.com/docker/docker-py/pull/3257 --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index d1fd41423..5c569d640 100644 --- a/setup.py +++ b/setup.py @@ -79,6 +79,9 @@ def package_vars(version_file): "pre-commit == 3.7.1", "pytest == 8.2.1", "pytest-cov == 5.0.0", + # TODO Unpin requests once docker-py is updated. + # See: https://github.com/docker/docker-py/pull/3257 + "requests == 2.31.0", ] }, ) From 721dce84c02b0fbb9c3aaae9046ed564bd077107 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 22:00:51 +0000 Subject: [PATCH 015/139] --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5c569d640..039e43931 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 69.5.1", + "setuptools == 70.0.0", "wheel == 0.43.0", ], extras_require={ From 7435c68511f9beae4dd86ba93c94a3931826a86c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 22:07:58 +0000 Subject: [PATCH 016/139] --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/stale-issues.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38986d853..c91a86fd8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: egress-policy: block @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: egress-policy: block @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: egress-policy: block diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 8494dcc97..852703213 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 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 53d078538..33213b817 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@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 49535ca9b..21ed2220c 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: egress-policy: audit # allowed-endpoints: > diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index 53879f9ee..befcd39e4 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index de052539a..551e0b317 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 From 0c87e4823af1015fd95375e11fb22dce5f94a81e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 22:13:36 +0000 Subject: [PATCH 017/139] Bump github/codeql-action from 2.13.4 to 3.25.6 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.13.4 to 3.25.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/cdcdbb579706841c47f7063dda365e292e5cad7a...9fdb3e49720b44c48891d036bb502feb25684276) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 852703213..3206b3a92 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a # tag=codeql-bundle-v2.13.4 + uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@cdcdbb579706841c47f7063dda365e292e5cad7a # tag=codeql-bundle-v2.13.4 + uses: github/codeql-action/autobuild@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a # tag=codeql-bundle-v2.13.4 + uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 38d8ea073..633fc51da 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # tag=codeql-bundle-v2.13.4 + uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 with: sarif_file: results.sarif From d31f4f24130d2370519e712cc44d8383a0b98abc Mon Sep 17 00:00:00 2001 From: Felddy Date: Thu, 23 May 2024 08:08:08 -0400 Subject: [PATCH 018/139] Unpin requests and bump docker-py --- setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 039e43931..dd833cf83 100644 --- a/setup.py +++ b/setup.py @@ -75,13 +75,10 @@ def package_vars(version_file): "test": [ "coverage == 7.4.4", "coveralls == 4.0.1", - "docker == 7.0.0", + "docker == 7.1.0", "pre-commit == 3.7.1", "pytest == 8.2.1", "pytest-cov == 5.0.0", - # TODO Unpin requests once docker-py is updated. - # See: https://github.com/docker/docker-py/pull/3257 - "requests == 2.31.0", ] }, ) From ec54102040c95b94de4640ff6f55ec0203292777 Mon Sep 17 00:00:00 2001 From: Felddy Date: Thu, 23 May 2024 10:28:10 -0400 Subject: [PATCH 019/139] Bump FoundryVTT version to 12.324 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 28 +++++++++++++-------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index afb4823cd..752039003 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.315" + com.foundryvtt.version = "12.324" 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.315.1" + org.opencontainers.image.version = "12.324.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.315.1 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.324.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 cea07a23d..398a14c9e 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.315" + com.foundryvtt.version = "12.324" 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.315.1" + org.opencontainers.image.version = "12.324.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.315.1 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.324.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 d31b77d4f..5402d611a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=11.315 +ARG FOUNDRY_VERSION=12.324 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index 4d9486f0a..b8dbc8a3a 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.315](https://img.shields.io/badge/release-v11.315-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.315) +[![FoundryVTT Release Version: v12.324](https://img.shields.io/badge/release-v12.324-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/12.324) [![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) @@ -212,9 +212,9 @@ 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.315.1`| An exact image version. | -|`felddy/foundryvtt:11.315`| 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:12.324.0`| An exact image version. | +|`felddy/foundryvtt:12.324`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12`| 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/) | See the [tags tab](https://hub.docker.com/r/felddy/foundryvtt/tags) on Docker @@ -267,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.315.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-12.324.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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.315` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.324` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=11.315.1 \ - --tag felddy/foundryvtt:11.315.1 \ + --build-arg VERSION=12.324.0 \ + --tag felddy/foundryvtt:12.324.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=11.315.1 \ + --build-arg VERSION=12.324.0 \ --output type=docker \ - --tag felddy/foundryvtt:11.315.1 . + --tag felddy/foundryvtt:12.324.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=11.315.1 \ - --tag felddy/foundryvtt:11.315.1 \ + --build-arg VERSION=12.324.0 \ + --tag felddy/foundryvtt:12.324.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=11.315.1 \ - --tag felddy/foundryvtt:11.315.1 \ + --build-arg VERSION=12.324.0 \ + --tag felddy/foundryvtt:12.324.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index 5660464fe..84b9e4ed3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=11.315 + # - FOUNDRY_VERSION=12.324 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index b830b3225..698bcd77f 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "11.315.1" +__version__ = "12.324.0" From 1f09b3acc9a430fa4248047289629d5a7db0ee16 Mon Sep 17 00:00:00 2001 From: Felddy Date: Fri, 24 May 2024 12:13:15 -0400 Subject: [PATCH 020/139] Add groups to Dependabot ecosystems --- .github/dependabot.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 70b2065f9..5117ccf84 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,6 +15,11 @@ updates: - "bot :robot:" - "dependencies :game_die:" - "docker :whale:" + groups: + docker-all: + applies-to: "version-updates" + patterns: + - "*" - package-ecosystem: "github-actions" directory: "/" @@ -24,6 +29,11 @@ updates: - "bot :robot:" - "dependencies :game_die:" - "github-actions :octocat:" + groups: + github-actions-all: + applies-to: "version-updates" + patterns: + - "*" - package-ecosystem: "npm" directory: "/" @@ -33,6 +43,11 @@ updates: - "bot :robot:" - "dependencies :game_die:" - "javascript :coffee:" + groups: + npm-all: + applies-to: "version-updates" + patterns: + - "*" - package-ecosystem: "pip" directory: "/" @@ -42,3 +57,8 @@ updates: - "bot :robot:" - "dependencies :game_die:" - "python :snake:" + groups: + pip-all: + applies-to: "version-updates" + patterns: + - "*" From 30234856b78d7e21986ecc080d539a49db0dad4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 08:57:12 +0000 Subject: [PATCH 021/139] Bump github/codeql-action in the github-actions-all group Bumps the github-actions-all group with 1 update: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.25.6 to 3.25.7 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/9fdb3e49720b44c48891d036bb502feb25684276...f079b8493333aace61c81488f8bd40919487bd9f) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3206b3a92..c23c0afb3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 + uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 + uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 + uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 633fc51da..203180e56 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 + uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 with: sarif_file: results.sarif From 77f45fdf5a3192179ed879b78a163343de5644ab Mon Sep 17 00:00:00 2001 From: Felddy Date: Fri, 31 May 2024 09:54:39 -0400 Subject: [PATCH 022/139] Bump FoundryVTT version to 12.325 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 26 +++++++++++++------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 752039003..03ad9a564 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 = "12.324" + com.foundryvtt.version = "12.325" 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 = "12.324.0" + org.opencontainers.image.version = "12.325.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 v12.324.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.325.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 398a14c9e..2f25733b9 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 = "12.324" + com.foundryvtt.version = "12.325" 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 = "12.324.0" + org.opencontainers.image.version = "12.325.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 v12.324.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.325.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 5402d611a..1df0be4d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.324 +ARG FOUNDRY_VERSION=12.325 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index b8dbc8a3a..fd439dfb6 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: v12.324](https://img.shields.io/badge/release-v12.324-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/12.324) +[![FoundryVTT Release Version: v12.325](https://img.shields.io/badge/release-v12.325-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/12.325) [![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) @@ -212,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:12.324.0`| An exact image version. | -|`felddy/foundryvtt:12.324`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12.325.0`| An exact image version. | +|`felddy/foundryvtt:12.325`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:12`| 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/) | @@ -267,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-12.324.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-12.325.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.324` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.325` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.324.0 \ - --tag felddy/foundryvtt:12.324.0 \ + --build-arg VERSION=12.325.0 \ + --tag felddy/foundryvtt:12.325.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.324.0 \ + --build-arg VERSION=12.325.0 \ --output type=docker \ - --tag felddy/foundryvtt:12.324.0 . + --tag felddy/foundryvtt:12.325.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.324.0 \ - --tag felddy/foundryvtt:12.324.0 \ + --build-arg VERSION=12.325.0 \ + --tag felddy/foundryvtt:12.325.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.324.0 \ - --tag felddy/foundryvtt:12.324.0 \ + --build-arg VERSION=12.325.0 \ + --tag felddy/foundryvtt:12.325.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index 84b9e4ed3..ebb81e0de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.324 + # - FOUNDRY_VERSION=12.325 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index 698bcd77f..9246ccc71 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.324.0" +__version__ = "12.325.0" From 7977d36241384813ede2ffbb64cecaf6c57105ae Mon Sep 17 00:00:00 2001 From: Felddy Date: Fri, 31 May 2024 10:16:32 -0400 Subject: [PATCH 023/139] Remove references to AWS S3 FoundryVTT is now using cloudflare's R2 object storage. Remove references to AWS S3, and use a generic term: "presigned URL". Normalize usage of `presigned` (not `pre-signed`). See: - https://developers.cloudflare.com/r2/api/s3/presigned-urls/ --- Dockerfile | 4 ++-- README.md | 6 +++--- src/entrypoint.sh | 22 +++++++++++----------- src/get_release_url.ts | 14 +++++++------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1df0be4d1..687641f51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,8 +41,8 @@ RUN \ if [ -n "${FOUNDRY_USERNAME}" ] && [ -n "${FOUNDRY_PASSWORD}" ]; then \ npm install && \ ./authenticate.js "${FOUNDRY_USERNAME}" "${FOUNDRY_PASSWORD}" cookiejar.json && \ - s3_url=$(./get_release_url.js --retry 5 cookiejar.json "${FOUNDRY_VERSION}") && \ - wget -O ${ARCHIVE} "${s3_url}" && \ + presigned_url=$(./get_release_url.js --retry 5 cookiejar.json "${FOUNDRY_VERSION}") && \ + wget -O ${ARCHIVE} "${presigned_url}" && \ unzip -d dist ${ARCHIVE} 'resources/*'; \ elif [ -n "${FOUNDRY_RELEASE_URL}" ]; then \ wget -O ${ARCHIVE} "${FOUNDRY_RELEASE_URL}" && \ diff --git a/README.md b/README.md index fd439dfb6..b8c5c6552 100644 --- a/README.md +++ b/README.md @@ -257,11 +257,11 @@ evaluated in the following order of precedence: ***Note:*** `FOUNDRY_USERNAME` and `FOUNDRY_PASSWORD` may be set [using secrets](#using-secrets) instead of environment variables. -#### Pre-signed URL variable #### +#### Presigned URL variable #### | Name | Purpose | |------------------|----------| -| `FOUNDRY_RELEASE_URL` | S3 pre-signed URL generate from the user's profile. Required for downloading an application distribution. | +| `FOUNDRY_RELEASE_URL` | The presigned URL generate from the user's profile. Required for downloading an application distribution. | ### Optional variables ### @@ -273,7 +273,7 @@ secrets](#using-secrets) instead of environment variables. | `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` | | `CONTAINER_PRESERVE_OWNER` | Normally the ownership of the `/data` directory and its contents are changed to match that of the server at startup. Setting this to a regular expression will exclude any matching paths and preserve their ownership. *Note: This is a match on the whole path, not a search.* This is useful if you want mount a volume as read-only inside `/data` (e.g.; a volume that contains assets mounted at `/data/Data/assets`). | | -| `CONTAINER_URL_FETCH_RETRY` | Number of times to retry fetching the S3 pre-signed URL using exponential back off. This behavior is useful in continuous integration environments where multiple parallel workflows can exceed the rate-limit of the URL generation service. | `0` | +| `CONTAINER_URL_FETCH_RETRY` | Number of times to retry fetching the presigned URL using exponential back off. This behavior is useful in continuous integration environments where multiple parallel workflows can exceed the rate-limit of the URL generation service. | `0` | | `CONTAINER_VERBOSE` | Set to `true` to enable verbose logging for the container utility scripts. | `false` | | `FOUNDRY_ADMIN_KEY` | Admin password to be applied at startup. If omitted the admin password will be cleared. May be set [using secrets](#using-secrets). | | | `FOUNDRY_AWS_CONFIG` | An absolute or relative path that points to the [awsConfig.json](https://foundryvtt.com/article/aws-s3/) or `true` for AWS environment variable [credentials evaluation](https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-credentials-node.html) usage. | `null` | diff --git a/src/entrypoint.sh b/src/entrypoint.sh index 53a8c4921..5a4cae868 100755 --- a/src/entrypoint.sh +++ b/src/entrypoint.sh @@ -89,9 +89,9 @@ fi # Check to see if an install is required install_required=false -# Track whether an S3 URL request is made. +# Track whether a presigned URL request is made. # We use this information to protect from a download loop. -requested_s3_url=false +requested_presigned_url=false if [ -f "resources/app/package.json" ]; then # FoundryVTT no longer supports the "version" field in package.json # We need to build up a pseudo-version using the generation and build values @@ -113,7 +113,7 @@ if [ $install_required = true ]; then # Determine how we are going to get the release URL if [ "${FOUNDRY_RELEASE_URL:-}" ]; then log "Using FOUNDRY_RELEASE_URL to download release." - s3_url="${FOUNDRY_RELEASE_URL}" + presigned_url="${FOUNDRY_RELEASE_URL}" fi if [[ "${FOUNDRY_USERNAME:-}" && "${FOUNDRY_PASSWORD:-}" ]]; then log "Using FOUNDRY_USERNAME and FOUNDRY_PASSWORD to authenticate." @@ -124,16 +124,16 @@ if [ $install_required = true ]; then ./authenticate.js ${CONTAINER_VERBOSE+--log-level=debug} \ --user-agent="${node_user_agent}" \ "${FOUNDRY_USERNAME}" "${FOUNDRY_PASSWORD}" "${cookiejar_file}" - if [[ ! "${s3_url:-}" ]]; then - # If the s3_url wasn't set by FOUNDRY_RELEASE_URL generate one now. + if [[ ! "${presigned_url:-}" ]]; then + # If the presigned_url wasn't set by FOUNDRY_RELEASE_URL generate one now. log "Using authenticated credentials to download release." # CONTAINER_VERBOSE default value should not be quoted. # shellcheck disable=SC2086 - s3_url=$(./get_release_url.js ${CONTAINER_VERBOSE+--log-level=debug} \ + presigned_url=$(./get_release_url.js ${CONTAINER_VERBOSE+--log-level=debug} \ ${CONTAINER_URL_FETCH_RETRY+--retry=${CONTAINER_URL_FETCH_RETRY}} \ --user-agent="${node_user_agent}" \ "${cookiejar_file}" "${FOUNDRY_VERSION}") - requested_s3_url=true + requested_presigned_url=true fi fi @@ -153,14 +153,14 @@ if [ $install_required = true ]; then release_filename="${CONTAINER_CACHE%%+(/)}${CONTAINER_CACHE:+/}foundryvtt-${FOUNDRY_VERSION}.zip" set -o nounset - if [[ "${s3_url:-}" ]]; then + if [[ "${presigned_url:-}" ]]; then log "Downloading Foundry Virtual Tabletop release." # Download release if newer than cached version. # Filter out warnings about bad date formats if the file is missing. curl ${CONTAINER_VERBOSE+--verbose} --fail --location \ --user-agent "${curl_user_agent}" \ --time-cond "${release_filename}" \ - --output "${downloading_filename}" "${s3_url}" 2>&1 \ + --output "${downloading_filename}" "${presigned_url}" 2>&1 \ | tr "\r" "\n" \ | sed --unbuffered '/^Warning: .* date/d' @@ -357,9 +357,9 @@ if [ $exit_code -ne 0 ]; then log_error "Child process failed with error code: $exit_code" fi -# If the container requested a new S3 URL but disabled the cache +# If the container requested a new presigned URL but disabled the cache # we are going to sleep forever to prevent a download loop. -if [[ "${requested_s3_url}" == "true" && "${CONTAINER_CACHE:-}" == "" ]]; then +if [[ "${requested_presigned_url}" == "true" && "${CONTAINER_CACHE:-}" == "" ]]; then log_warn "Server exited after downloading a release while the CONTAINER_CACHE was disabled." log_warn "This configuration could lead to a restart loop putting excessive load on the release server." log_warn "Please re-enable the CONTAINER_CACHE to allow the container to safely exit." diff --git a/src/get_release_url.ts b/src/get_release_url.ts index 54334ab5f..23dfa9f9b 100755 --- a/src/get_release_url.ts +++ b/src/get_release_url.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node const doc = ` -Generate a Foundry Virtual Tabletop pre-signed release URL using cookies from +Generate a Foundry Virtual Tabletop presigned release URL using cookies from authenticate.js. The utility will print the release URL to standard out. @@ -77,7 +77,7 @@ async function sleepWithProgress(attempt: number): Promise { } /** - * fetchReleaseURL - Fetch the pre-signed S3 URL. + * fetchReleaseURL - Fetch the presigned URL. * * @param {string} build Build to download. * @param {number} retries Number of retries to attempt. @@ -87,7 +87,7 @@ async function fetchReleaseURL( build: string, retries: number, ): Promise { - logger.info(`Fetching S3 pre-signed release URL for build ${build}...`); + logger.info(`Fetching presigned release URL for build ${build}...`); const release_url: string = `${BASE_URL}/releases/download?build=${build}&platform=linux`; for (var attempt = 1; attempt <= 1 + retries; attempt++) { // If this is not the first attempt, wait a bit before trying again. @@ -109,10 +109,10 @@ async function fetchReleaseURL( continue; } - const s3_url: string | null = response.headers.get("location"); - logger.debug(`S3 presigned URL: ${s3_url}`); + const presigned_url: string | null = response.headers.get("location"); + logger.debug(`Presigned URL: ${presigned_url}`); - return s3_url; + return presigned_url; } throw new Error(`Failed to fetch release URL.`); } @@ -154,7 +154,7 @@ async function main(): Promise { ); } - // Generate an S3 pre-signed URL and print it to stdout. + // Generate a presigned URL and print it to stdout. const releaseURL: string | null = await fetchReleaseURL( foundry_build, retries, From 7a648b40d5420136f0f7c8ab0e73da237caf6c05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 08:28:05 +0000 Subject: [PATCH 024/139] Bump pytest from 8.2.1 to 8.2.2 in the pip-all group Bumps the pip-all group with 1 update: [pytest](https://github.com/pytest-dev/pytest). Updates `pytest` from 8.2.1 to 8.2.2 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.2.1...8.2.2) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index dd833cf83..4f81a7431 100644 --- a/setup.py +++ b/setup.py @@ -77,7 +77,7 @@ def package_vars(version_file): "coveralls == 4.0.1", "docker == 7.1.0", "pre-commit == 3.7.1", - "pytest == 8.2.1", + "pytest == 8.2.2", "pytest-cov == 5.0.0", ] }, From 238c39fb0f448eeb08664d0d7a3ab1d154782314 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 16:37:51 +0000 Subject: [PATCH 025/139] Bump the github-actions-all group across 1 directory with 3 updates Bumps the github-actions-all group with 3 updates in the / directory: [step-security/harden-runner](https://github.com/step-security/harden-runner), [github/codeql-action](https://github.com/github/codeql-action) and [actions/dependency-review-action](https://github.com/actions/dependency-review-action). Updates `step-security/harden-runner` from 2.8.0 to 2.8.1 - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/f086349bfa2bd1361f7909c78558e816508cdc10...17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6) Updates `github/codeql-action` from 3.25.7 to 3.25.8 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/f079b8493333aace61c81488f8bd40919487bd9f...2e230e8fe0ad3a14a340ad0815ddb96d599d2aff) Updates `actions/dependency-review-action` from 4.3.2 to 4.3.3 - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/0c155c5e8556a497adf53f2c18edabf945ed8e70...72eb03d02c7872a771aacd928f3123ac62ad6d3a) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/dependency-review.yml | 4 ++-- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/scorecards.yml | 2 +- .github/workflows/stale-issues.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c91a86fd8..2decba34b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: block @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: block @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: block diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c23c0afb3..3f87a48b5 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 + uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 + uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 + uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 33213b817..b4449cc7e 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 - name: 'Dependency Review' - uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # tag=v4.3.2 + uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # tag=v4.3.3 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 21ed2220c..042e11ac5 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: audit # allowed-endpoints: > diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 203180e56..845618bbc 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 + uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 with: sarif_file: results.sarif diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index befcd39e4..f668ef3b3 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 551e0b317..f4b96c524 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 From 90423b58bd4e44baec10a2d8e17e1688e909bf88 Mon Sep 17 00:00:00 2001 From: Felddy Date: Sat, 8 Jun 2024 21:17:02 -0400 Subject: [PATCH 026/139] Add redaction regex for Cloudflare pre-signed URLs --- tests/conftest.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/conftest.py b/tests/conftest.py index cec0af534..5918eaea9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -13,7 +13,10 @@ MAIN_SERVICE_NAME = "foundry" REDACTION_REGEXES = [ + # AWS S3 pre-signed URL re.compile(r"AWSAccessKeyId=(.*?)&Signature=(.*?)&"), + # Cloudflare R2 pre-signed URL + re.compile(r"\?verify=([0-9]+-[a-zA-Z0-9%]+)"), ] VERSION_FILE = "src/_version.py" VERSION_SERVICE_NAME = f"{MAIN_SERVICE_NAME}-version" From e7a3033a7b248ff0f406379416dc4e6e9a7d26bf Mon Sep 17 00:00:00 2001 From: Felddy Date: Tue, 11 Jun 2024 13:39:20 -0400 Subject: [PATCH 027/139] Bump FoundryVTT version to 12.327 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 26 +++++++++++++------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 03ad9a564..50eb9681a 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 = "12.325" + com.foundryvtt.version = "12.327" 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 = "12.325.0" + org.opencontainers.image.version = "12.327.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 v12.325.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.327.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 2f25733b9..e620df950 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 = "12.325" + com.foundryvtt.version = "12.327" 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 = "12.325.0" + org.opencontainers.image.version = "12.327.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 v12.325.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.327.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 687641f51..1ac66a463 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.325 +ARG FOUNDRY_VERSION=12.327 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index b8c5c6552..8fd028cb4 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: v12.325](https://img.shields.io/badge/release-v12.325-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/12.325) +[![FoundryVTT Release Version: v12.327](https://img.shields.io/badge/release-v12.327-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/12.327) [![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) @@ -212,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:12.325.0`| An exact image version. | -|`felddy/foundryvtt:12.325`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12.327.0`| An exact image version. | +|`felddy/foundryvtt:12.327`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:12`| 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/) | @@ -267,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-12.325.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-12.327.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.325` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.327` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.325.0 \ - --tag felddy/foundryvtt:12.325.0 \ + --build-arg VERSION=12.327.0 \ + --tag felddy/foundryvtt:12.327.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.325.0 \ + --build-arg VERSION=12.327.0 \ --output type=docker \ - --tag felddy/foundryvtt:12.325.0 . + --tag felddy/foundryvtt:12.327.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.325.0 \ - --tag felddy/foundryvtt:12.325.0 \ + --build-arg VERSION=12.327.0 \ + --tag felddy/foundryvtt:12.327.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.325.0 \ - --tag felddy/foundryvtt:12.325.0 \ + --build-arg VERSION=12.327.0 \ + --tag felddy/foundryvtt:12.327.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index ebb81e0de..c6e720722 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.325 + # - FOUNDRY_VERSION=12.327 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index 9246ccc71..a5c9c4e9d 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.325.0" +__version__ = "12.327.0" From 6fbf8ff78cab9695c9b70c030160dcc864736fc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2024 08:33:28 +0000 Subject: [PATCH 028/139] Bump typescript from 5.4.5 to 5.5.2 in the npm-all group Bumps the npm-all group with 1 update: [typescript](https://github.com/Microsoft/TypeScript). Updates `typescript` from 5.4.5 to 5.5.2 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.4.5...v5.5.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-all ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7461e4a68..246951ab3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.4.5" + "typescript": "^5.5.2" } }, "node_modules/@colors/colors": { @@ -603,9 +603,9 @@ } }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", + "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -1113,9 +1113,9 @@ "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==" }, "typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", + "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", "dev": true }, "universalify": { diff --git a/package.json b/package.json index e422d5d6f..b2f507902 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.4.5" + "typescript": "^5.5.2" }, "homepage": "https://github.com/felddy/foundryvtt-docker#readme", "keywords": [ From 3f41507654aa08d92fc6034320caa6903ec64ceb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 08:27:25 +0000 Subject: [PATCH 029/139] Bump setuptools in the pip-all group across 1 directory Bumps the pip-all group with 1 update in the / directory: [setuptools](https://github.com/pypa/setuptools). Updates `setuptools` from 70.0.0 to 70.1.1 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v70.0.0...v70.1.1) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4f81a7431..4f7c5cb8a 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 70.0.0", + "setuptools == 70.1.1", "wheel == 0.43.0", ], extras_require={ From 7e00db7ff0bae008a8980823595478097b5da76f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 08:38:10 +0000 Subject: [PATCH 030/139] Bump the github-actions-all group across 1 directory with 2 updates Bumps the github-actions-all group with 2 updates in the / directory: [actions/checkout](https://github.com/actions/checkout) and [github/codeql-action](https://github.com/github/codeql-action). Updates `actions/checkout` from 4.1.6 to 4.1.7 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/a5ac7e51b41094c92402da3b24376905380afc29...692973e3d937129bcbf40652eb9f2f61becf3332) Updates `github/codeql-action` from 3.25.8 to 3.25.10 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2e230e8fe0ad3a14a340ad0815ddb96d599d2aff...23acc5c183826b7a8a97bce3cecc52db901f8251) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/scorecards.yml | 4 ++-- .github/workflows/sync-labels.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3f87a48b5..59ef3cdab 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,11 +50,11 @@ jobs: egress-policy: audit - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 + uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 + uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 + uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index b4449cc7e..5b5e110d1 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -16,6 +16,6 @@ jobs: with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 - name: 'Dependency Review' uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # tag=v4.3.3 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 042e11ac5..91cb2fd1d 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -108,7 +108,7 @@ jobs: echo "do_decryption=false" >> $GITHUB_OUTPUT fi - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 - id: setup-python uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # tag=v5.1.0 with: diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 845618bbc..b220a9d36 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -28,7 +28,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 with: persist-credentials: false @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 + uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 with: sarif_file: results.sarif diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index f4b96c524..b23954428 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -23,7 +23,7 @@ jobs: uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 - name: Sync repository labels if: success() uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b # tag=v5.0.0 From 008a17a00ba10fc5ca0ee278c340495e5c4f9d70 Mon Sep 17 00:00:00 2001 From: Felddy Date: Fri, 28 Jun 2024 10:32:00 -0400 Subject: [PATCH 031/139] Bump FoundryVTT version to 12.328 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 26 +++++++++++++------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 50eb9681a..f9af91482 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 = "12.327" + com.foundryvtt.version = "12.328" 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 = "12.327.0" + org.opencontainers.image.version = "12.328.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 v12.327.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.328.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 e620df950..209aa672f 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 = "12.327" + com.foundryvtt.version = "12.328" 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 = "12.327.0" + org.opencontainers.image.version = "12.328.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 v12.327.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.328.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 1ac66a463..0d6989207 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.327 +ARG FOUNDRY_VERSION=12.328 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index 8fd028cb4..f8cf0cba9 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: v12.327](https://img.shields.io/badge/release-v12.327-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/12.327) +[![FoundryVTT Release Version: v12.328](https://img.shields.io/badge/release-v12.328-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/12.328) [![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) @@ -212,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:12.327.0`| An exact image version. | -|`felddy/foundryvtt:12.327`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12.328.0`| An exact image version. | +|`felddy/foundryvtt:12.328`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:12`| 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/) | @@ -267,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-12.327.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-12.328.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.327` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.328` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.327.0 \ - --tag felddy/foundryvtt:12.327.0 \ + --build-arg VERSION=12.328.0 \ + --tag felddy/foundryvtt:12.328.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.327.0 \ + --build-arg VERSION=12.328.0 \ --output type=docker \ - --tag felddy/foundryvtt:12.327.0 . + --tag felddy/foundryvtt:12.328.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.327.0 \ - --tag felddy/foundryvtt:12.327.0 \ + --build-arg VERSION=12.328.0 \ + --tag felddy/foundryvtt:12.328.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.327.0 \ - --tag felddy/foundryvtt:12.327.0 \ + --build-arg VERSION=12.328.0 \ + --tag felddy/foundryvtt:12.328.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index c6e720722..60bedf976 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.327 + # - FOUNDRY_VERSION=12.328 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index a5c9c4e9d..a924a78fc 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.327.0" +__version__ = "12.328.0" From 9de4bb57dac917ee4ace519f254342da1891bdf0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 08:21:40 +0000 Subject: [PATCH 032/139] Bump setuptools from 70.1.1 to 70.2.0 in the pip-all group Bumps the pip-all group with 1 update: [setuptools](https://github.com/pypa/setuptools). Updates `setuptools` from 70.1.1 to 70.2.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v70.1.1...v70.2.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4f7c5cb8a..881c39703 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 70.1.1", + "setuptools == 70.2.0", "wheel == 0.43.0", ], extras_require={ From c2520770011d1705bb31682f152898eb37ec5e0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 08:19:09 +0000 Subject: [PATCH 033/139] Bump the github-actions-all group across 1 directory with 3 updates Bumps the github-actions-all group with 3 updates in the / directory: [github/codeql-action](https://github.com/github/codeql-action), [actions/download-artifact](https://github.com/actions/download-artifact) and [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `github/codeql-action` from 3.25.10 to 3.25.11 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/23acc5c183826b7a8a97bce3cecc52db901f8251...b611370bb5703a7efb587f9d136a52ea24c5c38c) Updates `actions/download-artifact` from 4.1.7 to 4.1.8 - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/65a9edc5881444af0b9093a5e628f2fe47ea3b2e...fa0a91b85d4f404e444e00e005971372dc801d16) Updates `actions/upload-artifact` from 4.3.3 to 4.3.4 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/65462800fd760344b1a7b4382951275a0abb4808...0b2256b8c012f0828dc542b3febcab082c67f72b) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/docker-pytest-image.yml | 6 +++--- .github/workflows/scorecards.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 59ef3cdab..1a8dfb5aa 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 + uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 + uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 + uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 91cb2fd1d..61ee0a9dc 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -133,7 +133,7 @@ jobs: pip install --upgrade --requirement requirements-test.txt - name: Download Docker image artifact - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # tag=v4.1.7 + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # tag=v4.1.8 with: name: ${{ inputs.image_artifact_name }} path: ${{ env.ARTIFACT_WORK_DIR }} @@ -183,7 +183,7 @@ jobs: - name: Upload unencrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'false' - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # tag=v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # tag=v4.3.4 with: name: ${{ inputs.data_artifact_name }} path: data.tar.gz @@ -191,7 +191,7 @@ jobs: - name: Upload encrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'true' - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # tag=v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # tag=v4.3.4 with: name: ${{ inputs.data_artifact_name }} path: data.tar.7z diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index b220a9d36..0b84f21ed 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -52,7 +52,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # tag=v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # tag=v4.3.4 with: name: SARIF file path: results.sarif @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 + uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 with: sarif_file: results.sarif From 41a04f937702baf5a1124cd2342f91184b7ff2b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 08:57:17 +0000 Subject: [PATCH 034/139] Bump the pip-all group across 1 directory with 3 updates Bumps the pip-all group with 3 updates in the / directory: [setuptools](https://github.com/pypa/setuptools), [coverage](https://github.com/nedbat/coveragepy) and [pytest](https://github.com/pytest-dev/pytest). Updates `setuptools` from 70.2.0 to 71.1.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v70.2.0...v71.1.0) Updates `coverage` from 7.4.4 to 7.6.0 - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.4.4...7.6.0) Updates `pytest` from 8.2.2 to 8.3.1 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.2.2...8.3.1) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-major dependency-group: pip-all - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-minor dependency-group: pip-all - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-minor dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 881c39703..4fee55834 100644 --- a/setup.py +++ b/setup.py @@ -68,16 +68,16 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 70.2.0", + "setuptools == 71.1.0", "wheel == 0.43.0", ], extras_require={ "test": [ - "coverage == 7.4.4", + "coverage == 7.6.0", "coveralls == 4.0.1", "docker == 7.1.0", "pre-commit == 3.7.1", - "pytest == 8.2.2", + "pytest == 8.3.1", "pytest-cov == 5.0.0", ] }, From 08335be14bdcffb0b9af433607601f3cac29b07e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:19:12 +0000 Subject: [PATCH 035/139] Bump the github-actions-all group across 1 directory with 4 updates Bumps the github-actions-all group with 4 updates in the / directory: [step-security/harden-runner](https://github.com/step-security/harden-runner), [github/codeql-action](https://github.com/github/codeql-action), [actions/dependency-review-action](https://github.com/actions/dependency-review-action) and [actions/setup-python](https://github.com/actions/setup-python). Updates `step-security/harden-runner` from 2.8.1 to 2.9.0 - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6...0d381219ddf674d61a7572ddd19d7941e271515c) Updates `github/codeql-action` from 3.25.11 to 3.25.13 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/b611370bb5703a7efb587f9d136a52ea24c5c38c...2d790406f505036ef40ecba973cc774a50395aac) Updates `actions/dependency-review-action` from 4.3.3 to 4.3.4 - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/72eb03d02c7872a771aacd928f3123ac62ad6d3a...5a2ce3f5b92ee19cbb1541a4984c76d921601d7c) Updates `actions/setup-python` from 5.1.0 to 5.1.1 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/82c7e631bb3cdc910f68e0081d67478d79c6982d...39cd14951b08e74b54015e9e001cdefcf80e669f) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/dependency-review.yml | 4 ++-- .github/workflows/docker-pytest-image.yml | 4 ++-- .github/workflows/scorecards.yml | 2 +- .github/workflows/stale-issues.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2decba34b..55a4ef5db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: egress-policy: block @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: egress-policy: block @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: egress-policy: block diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1a8dfb5aa..408f984bb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 + uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 + uses: github/codeql-action/autobuild@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 + uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 5b5e110d1..2d5ccf8ab 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 - name: 'Dependency Review' - uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # tag=v4.3.3 + uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # tag=v4.3.4 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 61ee0a9dc..ad5b23c3a 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: egress-policy: audit # allowed-endpoints: > @@ -110,7 +110,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 - id: setup-python - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # tag=v5.1.0 + uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # tag=v5.1.1 with: python-version: ${{ inputs.python_version }} diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 0b84f21ed..7ea1a031f 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 + uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 with: sarif_file: results.sarif diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index f668ef3b3..543ee7335 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index b23954428..047b65ab6 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 From 987c2f3578e99b230edea3f117c222f86ab9eded Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:36:26 +0000 Subject: [PATCH 036/139] Bump the npm-all group with 2 updates Bumps the npm-all group with 2 updates: [winston](https://github.com/winstonjs/winston) and [typescript](https://github.com/Microsoft/TypeScript). Updates `winston` from 3.13.0 to 3.13.1 - [Release notes](https://github.com/winstonjs/winston/releases) - [Changelog](https://github.com/winstonjs/winston/blob/master/CHANGELOG.md) - [Commits](https://github.com/winstonjs/winston/compare/v3.13.0...v3.13.1) Updates `typescript` from 5.5.2 to 5.5.3 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.5.2...v5.5.3) --- updated-dependencies: - dependency-name: winston dependency-type: direct:production update-type: version-update:semver-patch dependency-group: npm-all - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-all ... Signed-off-by: dependabot[bot] --- package-lock.json | 32 ++++++++++++++++---------------- package.json | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 246951ab3..490692f94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,14 +14,14 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.13.0" + "winston": "^3.13.1" }, "devDependencies": { "@types/cheerio": "^0.22.35", "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.5.2" + "typescript": "^5.5.3" } }, "node_modules/@colors/colors": { @@ -603,9 +603,9 @@ } }, "node_modules/typescript": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", - "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", + "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -646,15 +646,15 @@ } }, "node_modules/winston": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz", - "integrity": "sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", + "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", "async": "^3.2.3", "is-stream": "^2.0.0", - "logform": "^2.4.0", + "logform": "^2.6.0", "one-time": "^1.0.0", "readable-stream": "^3.4.0", "safe-stable-stringify": "^2.3.1", @@ -1113,9 +1113,9 @@ "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==" }, "typescript": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", - "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", + "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", "dev": true }, "universalify": { @@ -1143,15 +1143,15 @@ "integrity": "sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA==" }, "winston": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz", - "integrity": "sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", + "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", "requires": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", "async": "^3.2.3", "is-stream": "^2.0.0", - "logform": "^2.4.0", + "logform": "^2.6.0", "one-time": "^1.0.0", "readable-stream": "^3.4.0", "safe-stable-stringify": "^2.3.1", diff --git a/package.json b/package.json index b2f507902..89ab4900c 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.13.0" + "winston": "^3.13.1" }, "description": "Utilities to help boot a FoundryVTT server.", "devDependencies": { @@ -17,7 +17,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.5.2" + "typescript": "^5.5.3" }, "homepage": "https://github.com/felddy/foundryvtt-docker#readme", "keywords": [ From b4df24ac9cfb74a3b4df2fe27f10be12dda8f896 Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 22 Jul 2024 11:50:27 -0400 Subject: [PATCH 037/139] Bump FoundryVTT version to 12.329 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 26 +++++++++++++------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index f9af91482..d570d5624 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 = "12.328" + com.foundryvtt.version = "12.329" 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 = "12.328.0" + org.opencontainers.image.version = "12.329.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 v12.328.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.329.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 209aa672f..78c872d32 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 = "12.328" + com.foundryvtt.version = "12.329" 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 = "12.328.0" + org.opencontainers.image.version = "12.329.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 v12.328.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.329.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 0d6989207..937689319 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.328 +ARG FOUNDRY_VERSION=12.329 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index f8cf0cba9..d390db913 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: v12.328](https://img.shields.io/badge/release-v12.328-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/12.328) +[![FoundryVTT Release Version: v12.329](https://img.shields.io/badge/release-v12.329-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/12.329) [![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) @@ -212,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:12.328.0`| An exact image version. | -|`felddy/foundryvtt:12.328`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12.329.0`| An exact image version. | +|`felddy/foundryvtt:12.329`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:12`| 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/) | @@ -267,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-12.328.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-12.329.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.328` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.329` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.328.0 \ - --tag felddy/foundryvtt:12.328.0 \ + --build-arg VERSION=12.329.0 \ + --tag felddy/foundryvtt:12.329.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.328.0 \ + --build-arg VERSION=12.329.0 \ --output type=docker \ - --tag felddy/foundryvtt:12.328.0 . + --tag felddy/foundryvtt:12.329.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.328.0 \ - --tag felddy/foundryvtt:12.328.0 \ + --build-arg VERSION=12.329.0 \ + --tag felddy/foundryvtt:12.329.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.328.0 \ - --tag felddy/foundryvtt:12.328.0 \ + --build-arg VERSION=12.329.0 \ + --tag felddy/foundryvtt:12.329.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index 60bedf976..8496d1938 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.328 + # - FOUNDRY_VERSION=12.329 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index a924a78fc..48ff754a6 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.328.0" +__version__ = "12.329.0" From 7062c0f0e4ed9858a4e4f0bb867e855a81db6b07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:21:28 +0000 Subject: [PATCH 038/139] Bump typescript from 5.5.3 to 5.5.4 in the npm-all group Bumps the npm-all group with 1 update: [typescript](https://github.com/Microsoft/TypeScript). Updates `typescript` from 5.5.3 to 5.5.4 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.5.3...v5.5.4) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-all ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 490692f94..7cf5910c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.5.3" + "typescript": "^5.5.4" } }, "node_modules/@colors/colors": { @@ -603,9 +603,9 @@ } }, "node_modules/typescript": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", - "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -1113,9 +1113,9 @@ "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==" }, "typescript": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", - "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true }, "universalify": { diff --git a/package.json b/package.json index 89ab4900c..8afef969a 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.5.3" + "typescript": "^5.5.4" }, "homepage": "https://github.com/felddy/foundryvtt-docker#readme", "keywords": [ From 6362de6c3f9a0d5133ee926739503c8fb789a1e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 08:52:47 +0000 Subject: [PATCH 039/139] Bump pytest from 8.3.1 to 8.3.2 in the pip-all group Bumps the pip-all group with 1 update: [pytest](https://github.com/pytest-dev/pytest). Updates `pytest` from 8.3.1 to 8.3.2 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.3.1...8.3.2) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4fee55834..8e5460704 100644 --- a/setup.py +++ b/setup.py @@ -77,7 +77,7 @@ def package_vars(version_file): "coveralls == 4.0.1", "docker == 7.1.0", "pre-commit == 3.7.1", - "pytest == 8.3.1", + "pytest == 8.3.2", "pytest-cov == 5.0.0", ] }, From 513ed6409258b4ed1348c2ee4e894f31b269e233 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 20:12:14 +0000 Subject: [PATCH 040/139] Bump the github-actions-all group across 1 directory with 2 updates Bumps the github-actions-all group with 2 updates in the / directory: [github/codeql-action](https://github.com/github/codeql-action) and [ossf/scorecard-action](https://github.com/ossf/scorecard-action). Updates `github/codeql-action` from 3.25.13 to 3.25.15 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2d790406f505036ef40ecba973cc774a50395aac...afb54ba388a7dca6ecae48f608c4ff05ff4cc77a) Updates `ossf/scorecard-action` from 2.3.3 to 2.4.0 - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/dc50aa9510b46c811795eb24b2f1ba02a914e534...62b2cac7ed8198b15735ed49ab1e5cf35480ba46) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 408f984bb..b43128813 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 + uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 + uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 + uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 7ea1a031f..569aec8ce 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -33,7 +33,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # tag=v2.3.3 + uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # tag=v2.4.0 with: results_file: results.sarif results_format: sarif @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 + uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 with: sarif_file: results.sarif From 8f79e196ca2978b62819946517008e07fb5d3eff Mon Sep 17 00:00:00 2001 From: Felddy Date: Fri, 26 Jul 2024 16:26:25 -0400 Subject: [PATCH 041/139] Bump FoundryVTT version to 12.330 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 26 +++++++++++++------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index d570d5624..fdae016d9 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 = "12.329" + com.foundryvtt.version = "12.330" 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 = "12.329.0" + org.opencontainers.image.version = "12.330.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 v12.329.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.330.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 78c872d32..d301899a7 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 = "12.329" + com.foundryvtt.version = "12.330" 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 = "12.329.0" + org.opencontainers.image.version = "12.330.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 v12.329.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.330.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 937689319..52760fedb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.329 +ARG FOUNDRY_VERSION=12.330 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index d390db913..c8bf7c3d8 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: v12.329](https://img.shields.io/badge/release-v12.329-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/12.329) +[![FoundryVTT Release Version: v12.330](https://img.shields.io/badge/release-v12.330-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/12.330) [![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) @@ -212,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:12.329.0`| An exact image version. | -|`felddy/foundryvtt:12.329`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12.330.0`| An exact image version. | +|`felddy/foundryvtt:12.330`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:12`| 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/) | @@ -267,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-12.329.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-12.330.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.329` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.330` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.329.0 \ - --tag felddy/foundryvtt:12.329.0 \ + --build-arg VERSION=12.330.0 \ + --tag felddy/foundryvtt:12.330.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.329.0 \ + --build-arg VERSION=12.330.0 \ --output type=docker \ - --tag felddy/foundryvtt:12.329.0 . + --tag felddy/foundryvtt:12.330.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.329.0 \ - --tag felddy/foundryvtt:12.329.0 \ + --build-arg VERSION=12.330.0 \ + --tag felddy/foundryvtt:12.330.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.329.0 \ - --tag felddy/foundryvtt:12.329.0 \ + --build-arg VERSION=12.330.0 \ + --tag felddy/foundryvtt:12.330.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index 8496d1938..5235532f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.329 + # - FOUNDRY_VERSION=12.330 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index 48ff754a6..c5d1fd3c2 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.329.0" +__version__ = "12.330.0" From 8e648d4e0ce8a6f8fbb1b4bc47ba5dafaa09e424 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 08:33:39 +0000 Subject: [PATCH 042/139] Bump the pip-all group with 2 updates Bumps the pip-all group with 2 updates: [setuptools](https://github.com/pypa/setuptools) and [pre-commit](https://github.com/pre-commit/pre-commit). Updates `setuptools` from 71.1.0 to 72.0.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v71.1.0...v72.0.0) Updates `pre-commit` from 3.7.1 to 3.8.0 - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v3.7.1...v3.8.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-major dependency-group: pip-all - dependency-name: pre-commit dependency-type: direct:development update-type: version-update:semver-minor dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 8e5460704..83da53275 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 71.1.0", + "setuptools == 72.0.0", "wheel == 0.43.0", ], extras_require={ @@ -76,7 +76,7 @@ def package_vars(version_file): "coverage == 7.6.0", "coveralls == 4.0.1", "docker == 7.1.0", - "pre-commit == 3.7.1", + "pre-commit == 3.8.0", "pytest == 8.3.2", "pytest-cov == 5.0.0", ] From 8d4e9ee358177f8512fdebb8593dafeeeea129d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 08:36:49 +0000 Subject: [PATCH 043/139] Bump the github-actions-all group across 1 directory with 3 updates Bumps the github-actions-all group with 3 updates in the / directory: [step-security/harden-runner](https://github.com/step-security/harden-runner), [github/codeql-action](https://github.com/github/codeql-action) and [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `step-security/harden-runner` from 2.9.0 to 2.9.1 - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/0d381219ddf674d61a7572ddd19d7941e271515c...5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde) Updates `github/codeql-action` from 3.25.15 to 3.26.1 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/afb54ba388a7dca6ecae48f608c4ff05ff4cc77a...29d86d22a34ea372b1bbf3b2dced2e25ca6b3384) Updates `actions/upload-artifact` from 4.3.4 to 4.3.6 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/0b2256b8c012f0828dc542b3febcab082c67f72b...834a144ee995460fba8ed112a2fc961b36a5ec5a) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 6 +++--- .github/workflows/scorecards.yml | 4 ++-- .github/workflows/stale-issues.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55a4ef5db..208eea7b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: egress-policy: block @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: egress-policy: block @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: egress-policy: block diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b43128813..e2a3d2a2f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 + uses: github/codeql-action/init@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 + uses: github/codeql-action/autobuild@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 + uses: github/codeql-action/analyze@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 2d5ccf8ab..6ca956127 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@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index ad5b23c3a..93b8faf37 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: egress-policy: audit # allowed-endpoints: > @@ -183,7 +183,7 @@ jobs: - name: Upload unencrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'false' - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # tag=v4.3.4 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # tag=v4.3.6 with: name: ${{ inputs.data_artifact_name }} path: data.tar.gz @@ -191,7 +191,7 @@ jobs: - name: Upload encrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'true' - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # tag=v4.3.4 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # tag=v4.3.6 with: name: ${{ inputs.data_artifact_name }} path: data.tar.7z diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 569aec8ce..c67241dc8 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -52,7 +52,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # tag=v4.3.4 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # tag=v4.3.6 with: name: SARIF file path: results.sarif @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 + uses: github/codeql-action/upload-sarif@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 with: sarif_file: results.sarif diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index 543ee7335..3b8495b0e 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 047b65ab6..4f1444469 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 From 7c97a039c32eb9f8a9cf12c6600caf79541a2a9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 22:41:31 +0000 Subject: [PATCH 044/139] Bump the pip-all group across 1 directory with 3 updates Bumps the pip-all group with 3 updates in the / directory: [setuptools](https://github.com/pypa/setuptools), [wheel](https://github.com/pypa/wheel) and [coverage](https://github.com/nedbat/coveragepy). Updates `setuptools` from 72.0.0 to 72.2.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v72.0.0...v72.2.0) Updates `wheel` from 0.43.0 to 0.44.0 - [Release notes](https://github.com/pypa/wheel/releases) - [Changelog](https://github.com/pypa/wheel/blob/main/docs/news.rst) - [Commits](https://github.com/pypa/wheel/compare/0.43.0...0.44.0) Updates `coverage` from 7.6.0 to 7.6.1 - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.6.0...7.6.1) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-all - dependency-name: wheel dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-all - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-patch dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 83da53275..ae6ef4511 100644 --- a/setup.py +++ b/setup.py @@ -68,12 +68,12 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 72.0.0", - "wheel == 0.43.0", + "setuptools == 72.2.0", + "wheel == 0.44.0", ], extras_require={ "test": [ - "coverage == 7.6.0", + "coverage == 7.6.1", "coveralls == 4.0.1", "docker == 7.1.0", "pre-commit == 3.8.0", From 274377d7c2e171095148781bd2a37db33c604c3c Mon Sep 17 00:00:00 2001 From: Felddy Date: Thu, 15 Aug 2024 18:45:53 -0400 Subject: [PATCH 045/139] Bump cheerio dependency to version 1.0.0 --- package-lock.json | 234 ++++++++++++++++++++++++++++++++++++---------- package.json | 2 +- 2 files changed, 185 insertions(+), 51 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7cf5910c0..870b6d49c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "MIT", "dependencies": { - "cheerio": "^1.0.0-rc.12", + "cheerio": "^1.0.0", "docopt": "^0.6.2", "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", @@ -94,20 +94,25 @@ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" }, "node_modules/cheerio": { - "version": "1.0.0-rc.12", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz", - "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz", + "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==", + "license": "MIT", "dependencies": { "cheerio-select": "^2.1.0", "dom-serializer": "^2.0.0", "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "htmlparser2": "^8.0.1", - "parse5": "^7.0.0", - "parse5-htmlparser2-tree-adapter": "^7.0.0" + "domutils": "^3.1.0", + "encoding-sniffer": "^0.2.0", + "htmlparser2": "^9.1.0", + "parse5": "^7.1.2", + "parse5-htmlparser2-tree-adapter": "^7.0.0", + "parse5-parser-stream": "^7.1.2", + "undici": "^6.19.5", + "whatwg-mimetype": "^4.0.0" }, "engines": { - "node": ">= 6" + "node": ">=18.17" }, "funding": { "url": "https://github.com/cheeriojs/cheerio?sponsor=1" @@ -250,13 +255,14 @@ } }, "node_modules/domutils": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz", - "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", - "domhandler": "^5.0.1" + "domhandler": "^5.0.3" }, "funding": { "url": "https://github.com/fb55/domutils?sponsor=1" @@ -267,10 +273,24 @@ "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" }, + "node_modules/encoding-sniffer": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz", + "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==", + "license": "MIT", + "dependencies": { + "iconv-lite": "^0.6.3", + "whatwg-encoding": "^3.1.1" + }, + "funding": { + "url": "https://github.com/fb55/encoding-sniffer?sponsor=1" + } + }, "node_modules/entities": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.3.1.tgz", - "integrity": "sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -331,9 +351,9 @@ } }, "node_modules/htmlparser2": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz", - "integrity": "sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", + "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", { @@ -341,11 +361,24 @@ "url": "https://github.com/sponsors/fb55" } ], + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", - "domhandler": "^5.0.2", - "domutils": "^3.0.1", - "entities": "^4.3.0" + "domhandler": "^5.0.3", + "domutils": "^3.1.0", + "entities": "^4.5.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" } }, "node_modules/inherits": { @@ -450,11 +483,12 @@ } }, "node_modules/parse5": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.0.0.tgz", - "integrity": "sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", + "license": "MIT", "dependencies": { - "entities": "^4.3.0" + "entities": "^4.4.0" }, "funding": { "url": "https://github.com/inikulin/parse5?sponsor=1" @@ -472,6 +506,18 @@ "url": "https://github.com/inikulin/parse5?sponsor=1" } }, + "node_modules/parse5-parser-stream": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz", + "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==", + "license": "MIT", + "dependencies": { + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", @@ -535,6 +581,12 @@ "node": ">=10" } }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, "node_modules/set-cookie-parser": { "version": "2.4.8", "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.4.8.tgz", @@ -615,6 +667,15 @@ "node": ">=14.17" } }, + "node_modules/undici": { + "version": "6.19.7", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.7.tgz", + "integrity": "sha512-HR3W/bMGPSr90i8AAp2C4DM3wChFdJPLrWYpIS++LxS8K+W535qftjt+4MyjNYHeWabMj1nvtmLIi7l++iq91A==", + "license": "MIT", + "engines": { + "node": ">=18.17" + } + }, "node_modules/universalify": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", @@ -645,6 +706,27 @@ "node": ">= 8" } }, + "node_modules/whatwg-encoding": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "license": "MIT", + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/winston": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", @@ -748,17 +830,21 @@ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" }, "cheerio": { - "version": "1.0.0-rc.12", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz", - "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz", + "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==", "requires": { "cheerio-select": "^2.1.0", "dom-serializer": "^2.0.0", "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "htmlparser2": "^8.0.1", - "parse5": "^7.0.0", - "parse5-htmlparser2-tree-adapter": "^7.0.0" + "domutils": "^3.1.0", + "encoding-sniffer": "^0.2.0", + "htmlparser2": "^9.1.0", + "parse5": "^7.1.2", + "parse5-htmlparser2-tree-adapter": "^7.0.0", + "parse5-parser-stream": "^7.1.2", + "undici": "^6.19.5", + "whatwg-mimetype": "^4.0.0" } }, "cheerio-select": { @@ -865,13 +951,13 @@ } }, "domutils": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz", - "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", "requires": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", - "domhandler": "^5.0.1" + "domhandler": "^5.0.3" } }, "enabled": { @@ -879,10 +965,19 @@ "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" }, + "encoding-sniffer": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz", + "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==", + "requires": { + "iconv-lite": "^0.6.3", + "whatwg-encoding": "^3.1.1" + } + }, "entities": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.3.1.tgz", - "integrity": "sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg==" + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==" }, "fecha": { "version": "4.2.3", @@ -921,14 +1016,22 @@ } }, "htmlparser2": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz", - "integrity": "sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", + "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", "requires": { "domelementtype": "^2.3.0", - "domhandler": "^5.0.2", - "domutils": "^3.0.1", - "entities": "^4.3.0" + "domhandler": "^5.0.3", + "domutils": "^3.1.0", + "entities": "^4.5.0" + } + }, + "iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "inherits": { @@ -1001,11 +1104,11 @@ } }, "parse5": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.0.0.tgz", - "integrity": "sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", "requires": { - "entities": "^4.3.0" + "entities": "^4.4.0" } }, "parse5-htmlparser2-tree-adapter": { @@ -1017,6 +1120,14 @@ "parse5": "^7.0.0" } }, + "parse5-parser-stream": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz", + "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==", + "requires": { + "parse5": "^7.0.0" + } + }, "psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", @@ -1057,6 +1168,11 @@ "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz", "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==" }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, "set-cookie-parser": { "version": "2.4.8", "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.4.8.tgz", @@ -1118,6 +1234,11 @@ "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true }, + "undici": { + "version": "6.19.7", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.7.tgz", + "integrity": "sha512-HR3W/bMGPSr90i8AAp2C4DM3wChFdJPLrWYpIS++LxS8K+W535qftjt+4MyjNYHeWabMj1nvtmLIi7l++iq91A==" + }, "universalify": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", @@ -1142,6 +1263,19 @@ "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz", "integrity": "sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA==" }, + "whatwg-encoding": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "requires": { + "iconv-lite": "0.6.3" + } + }, + "whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==" + }, "winston": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", diff --git a/package.json b/package.json index 8afef969a..f6954c306 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "url": "https://github.com/felddy/foundryvtt-docker/issues" }, "dependencies": { - "cheerio": "^1.0.0-rc.12", + "cheerio": "^1.0.0", "docopt": "^0.6.2", "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", From d22f37ca8ffefd2dcfeed1d5069a9b669f421925 Mon Sep 17 00:00:00 2001 From: Felddy Date: Thu, 15 Aug 2024 18:48:59 -0400 Subject: [PATCH 046/139] Fix breaking change caused by cheerio update See: https://github.com/cheeriojs/cheerio/pull/3974 --- src/authenticate.ts | 2 +- src/get_license.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/authenticate.ts b/src/authenticate.ts index 687a9bab1..35df2e2db 100755 --- a/src/authenticate.ts +++ b/src/authenticate.ts @@ -24,7 +24,7 @@ Options: // Imports import { CookieJar, Cookie } from "tough-cookie"; import { FileCookieStore } from "tough-cookie-file-store"; -import cheerio from "cheerio"; +import * as cheerio from "cheerio"; import createLogger from "./logging.js"; import winston from "winston"; import docopt from "docopt"; diff --git a/src/get_license.ts b/src/get_license.ts index b756793be..7bda46b1c 100755 --- a/src/get_license.ts +++ b/src/get_license.ts @@ -32,7 +32,7 @@ Options: // Imports import { CookieJar } from "tough-cookie"; import { FileCookieStore } from "tough-cookie-file-store"; -import cheerio from "cheerio"; +import * as cheerio from "cheerio"; import createLogger from "./logging.js"; import docopt from "docopt"; import fetchCookie from "fetch-cookie"; From 1525a6f0582e4a437d8d9f3d69e040a26d1adb1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 23:00:02 +0000 Subject: [PATCH 047/139] Bump winston in the npm-all group across 1 directory Bumps the npm-all group with 1 update in the / directory: [winston](https://github.com/winstonjs/winston). Updates `winston` from 3.13.1 to 3.14.2 - [Release notes](https://github.com/winstonjs/winston/releases) - [Changelog](https://github.com/winstonjs/winston/blob/master/CHANGELOG.md) - [Commits](https://github.com/winstonjs/winston/compare/v3.13.1...v3.14.2) --- updated-dependencies: - dependency-name: winston dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm-all ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 870b6d49c..d93774f94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.13.1" + "winston": "^3.14.2" }, "devDependencies": { "@types/cheerio": "^0.22.35", @@ -728,9 +728,9 @@ } }, "node_modules/winston": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", - "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.2.tgz", + "integrity": "sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg==", "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", @@ -1277,9 +1277,9 @@ "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==" }, "winston": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", - "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.2.tgz", + "integrity": "sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg==", "requires": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", diff --git a/package.json b/package.json index f6954c306..d76117c03 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.13.1" + "winston": "^3.14.2" }, "description": "Utilities to help boot a FoundryVTT server.", "devDependencies": { From 0b8bbee314db2ac9d136f0c3a9da0339eb686576 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 01:18:51 +0000 Subject: [PATCH 048/139] Bump github/codeql-action in the github-actions-all group Bumps the github-actions-all group with 1 update: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.26.1 to 3.26.2 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/29d86d22a34ea372b1bbf3b2dced2e25ca6b3384...429e1977040da7a23b6822b13c129cd1ba93dbb2) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e2a3d2a2f..6367192fa 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 + uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 + uses: github/codeql-action/autobuild@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 + uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index c67241dc8..f6ed23e4e 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 + uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 with: sarif_file: results.sarif From 1ce822ab1215a7231a9933d39340cc028ad9d1fc Mon Sep 17 00:00:00 2001 From: Felddy Date: Thu, 15 Aug 2024 21:29:16 -0400 Subject: [PATCH 049/139] Bump FoundryVTT version to 12.331 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 26 +++++++++++++------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index fdae016d9..be4aaf414 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 = "12.330" + com.foundryvtt.version = "12.331" 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 = "12.330.0" + org.opencontainers.image.version = "12.331.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 v12.330.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.331.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 d301899a7..674177fa6 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 = "12.330" + com.foundryvtt.version = "12.331" 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 = "12.330.0" + org.opencontainers.image.version = "12.331.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 v12.330.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.331.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 52760fedb..a38870c19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.330 +ARG FOUNDRY_VERSION=12.331 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index c8bf7c3d8..80b102857 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: v12.330](https://img.shields.io/badge/release-v12.330-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/12.330) +[![FoundryVTT Release Version: v12.331](https://img.shields.io/badge/release-v12.331-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/12.331) [![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) @@ -212,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:12.330.0`| An exact image version. | -|`felddy/foundryvtt:12.330`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12.331.0`| An exact image version. | +|`felddy/foundryvtt:12.331`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:12`| 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/) | @@ -267,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-12.330.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-12.331.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.330` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.331` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.330.0 \ - --tag felddy/foundryvtt:12.330.0 \ + --build-arg VERSION=12.331.0 \ + --tag felddy/foundryvtt:12.331.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.330.0 \ + --build-arg VERSION=12.331.0 \ --output type=docker \ - --tag felddy/foundryvtt:12.330.0 . + --tag felddy/foundryvtt:12.331.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.330.0 \ - --tag felddy/foundryvtt:12.330.0 \ + --build-arg VERSION=12.331.0 \ + --tag felddy/foundryvtt:12.331.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.330.0 \ - --tag felddy/foundryvtt:12.330.0 \ + --build-arg VERSION=12.331.0 \ + --tag felddy/foundryvtt:12.331.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index 5235532f1..ec05904b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.330 + # - FOUNDRY_VERSION=12.331 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index c5d1fd3c2..fabeb204a 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.330.0" +__version__ = "12.331.0" From 8052a8350fd73d9692bcf0f832a6b6e590eaeb2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 08:29:57 +0000 Subject: [PATCH 050/139] Bump github/codeql-action Bumps the github-actions-all group with 1 update in the / directory: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.26.2 to 3.26.5 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/429e1977040da7a23b6822b13c129cd1ba93dbb2...2c779ab0d087cd7fe7b826087247c2c81f27bfa6) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6367192fa..a5e4dd278 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 + uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 + uses: github/codeql-action/autobuild@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 + uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index f6ed23e4e..c875821a1 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 + uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 with: sarif_file: results.sarif From 077d35679121068b554423abb03d07d87b5c5662 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:10:42 +0000 Subject: [PATCH 051/139] Bump setuptools in the pip-all group across 1 directory Bumps the pip-all group with 1 update in the / directory: [setuptools](https://github.com/pypa/setuptools). Updates `setuptools` from 72.2.0 to 74.0.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v72.2.0...v74.0.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-major dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ae6ef4511..f859baa08 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 72.2.0", + "setuptools == 74.0.0", "wheel == 0.44.0", ], extras_require={ From fd94d6254638323232e28e8f3566c7742757b783 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 08:18:14 +0000 Subject: [PATCH 052/139] Bump setuptools in the pip-all group across 1 directory Bumps the pip-all group with 1 update in the / directory: [setuptools](https://github.com/pypa/setuptools). Updates `setuptools` from 74.0.0 to 74.1.2 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v74.0.0...v74.1.2) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f859baa08..437256327 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 74.0.0", + "setuptools == 74.1.2", "wheel == 0.44.0", ], extras_require={ From 4a3dfba64052762728c7f344fec8fabba502ce30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 08:51:33 +0000 Subject: [PATCH 053/139] Bump the github-actions-all group across 1 directory with 3 updates Bumps the github-actions-all group with 3 updates in the / directory: [github/codeql-action](https://github.com/github/codeql-action), [actions/setup-python](https://github.com/actions/setup-python) and [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `github/codeql-action` from 3.26.5 to 3.26.6 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2c779ab0d087cd7fe7b826087247c2c81f27bfa6...4dd16135b69a43b6c8efb853346f8437d92d3c93) Updates `actions/setup-python` from 5.1.1 to 5.2.0 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/39cd14951b08e74b54015e9e001cdefcf80e669f...f677139bbe7f9c59b41e40162b753c062f5d49a3) Updates `actions/upload-artifact` from 4.3.6 to 4.4.0 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/834a144ee995460fba8ed112a2fc961b36a5ec5a...50769540e7f4bd5e21e526ee35c689e35e0d6874) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/docker-pytest-image.yml | 6 +++--- .github/workflows/scorecards.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a5e4dd278..b6fb583e6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 + uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 + uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 + uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 93b8faf37..e3599fb46 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -110,7 +110,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 - id: setup-python - uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # tag=v5.1.1 + uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # tag=v5.2.0 with: python-version: ${{ inputs.python_version }} @@ -183,7 +183,7 @@ jobs: - name: Upload unencrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'false' - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # tag=v4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # tag=v4.4.0 with: name: ${{ inputs.data_artifact_name }} path: data.tar.gz @@ -191,7 +191,7 @@ jobs: - name: Upload encrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'true' - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # tag=v4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # tag=v4.4.0 with: name: ${{ inputs.data_artifact_name }} path: data.tar.7z diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index c875821a1..77d5f7368 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -52,7 +52,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # tag=v4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # tag=v4.4.0 with: name: SARIF file path: results.sarif @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 + uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 with: sarif_file: results.sarif From 05862ea6f4e1e1f300dce937df74de606ffadd37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 11:10:05 +0000 Subject: [PATCH 054/139] Bump typescript from 5.5.4 to 5.6.2 in the npm-all group Bumps the npm-all group with 1 update: [typescript](https://github.com/microsoft/TypeScript). Updates `typescript` from 5.5.4 to 5.6.2 - [Release notes](https://github.com/microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/microsoft/TypeScript/compare/v5.5.4...v5.6.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-all ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index d93774f94..16e5ea354 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.5.4" + "typescript": "^5.6.2" } }, "node_modules/@colors/colors": { @@ -655,9 +655,9 @@ } }, "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -1229,9 +1229,9 @@ "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==" }, "typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "dev": true }, "undici": { diff --git a/package.json b/package.json index d76117c03..bff450c42 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.5.4" + "typescript": "^5.6.2" }, "homepage": "https://github.com/felddy/foundryvtt-docker#readme", "keywords": [ From 4f95f1220768c21b721485a8731c0b46d8af1fca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 08:10:47 +0000 Subject: [PATCH 055/139] Bump step-security/harden-runner in the github-actions-all group Bumps the github-actions-all group with 1 update: [step-security/harden-runner](https://github.com/step-security/harden-runner). Updates `step-security/harden-runner` from 2.9.1 to 2.10.1 - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde...91182cccc01eb5e619899d80e4e971d6181294a7) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/stale-issues.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 208eea7b0..f6142cdd3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: block @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: block @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: block diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b6fb583e6..a7417f500 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 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 6ca956127..2fbafd5e6 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@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index e3599fb46..b45f6729a 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: audit # allowed-endpoints: > diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index 3b8495b0e..0170f2dc4 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 4f1444469..88f44cb74 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 From 4edd5687313153a8efdb76d6db72a56983be61fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 08:22:30 +0000 Subject: [PATCH 056/139] Bump the pip-all group across 1 directory with 4 updates Bumps the pip-all group with 4 updates in the / directory: [setuptools](https://github.com/pypa/setuptools), [coverage](https://github.com/nedbat/coveragepy), [pre-commit](https://github.com/pre-commit/pre-commit) and [pytest](https://github.com/pytest-dev/pytest). Updates `setuptools` from 74.1.2 to 75.2.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v74.1.2...v75.2.0) Updates `coverage` from 7.6.1 to 7.6.4 - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.6.1...7.6.4) Updates `pre-commit` from 3.8.0 to 4.0.1 - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v3.8.0...v4.0.1) Updates `pytest` from 8.3.2 to 8.3.3 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.3.2...8.3.3) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-major dependency-group: pip-all - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-patch dependency-group: pip-all - dependency-name: pre-commit dependency-type: direct:development update-type: version-update:semver-major dependency-group: pip-all - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 437256327..8f13340f8 100644 --- a/setup.py +++ b/setup.py @@ -68,16 +68,16 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 74.1.2", + "setuptools == 75.2.0", "wheel == 0.44.0", ], extras_require={ "test": [ - "coverage == 7.6.1", + "coverage == 7.6.4", "coveralls == 4.0.1", "docker == 7.1.0", - "pre-commit == 3.8.0", - "pytest == 8.3.2", + "pre-commit == 4.0.1", + "pytest == 8.3.3", "pytest-cov == 5.0.0", ] }, From 34e9553dbf829f259c99414a76b147b956c05b53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 18:17:58 +0000 Subject: [PATCH 057/139] Bump the github-actions-all group across 1 directory with 4 updates Bumps the github-actions-all group with 4 updates in the / directory: [actions/checkout](https://github.com/actions/checkout), [github/codeql-action](https://github.com/github/codeql-action), [actions/cache](https://github.com/actions/cache) and [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/checkout` from 4.1.7 to 4.2.1 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871) Updates `github/codeql-action` from 3.26.6 to 3.26.13 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/4dd16135b69a43b6c8efb853346f8437d92d3c93...f779452ac5af1c261dce0346a8f964149f49322b) Updates `actions/cache` from 4.0.2 to 4.1.1 - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/0c45773b623bea8c8e75f6c82b208c3cf94ea4f9...3624ceb22c1c5a301c8db4169662070a689d9ea8) Updates `actions/upload-artifact` from 4.4.0 to 4.4.3 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/50769540e7f4bd5e21e526ee35c689e35e0d6874...b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 8 ++++---- .github/workflows/scorecards.yml | 6 +++--- .github/workflows/sync-labels.yml | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a7417f500..2bad79070 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,11 +50,11 @@ jobs: egress-policy: audit - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 + uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 + uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 + uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 2fbafd5e6..c21adc8a2 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -16,6 +16,6 @@ jobs: with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 - name: 'Dependency Review' uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # tag=v4.3.4 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index b45f6729a..721b68fbe 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -108,14 +108,14 @@ jobs: echo "do_decryption=false" >> $GITHUB_OUTPUT fi - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 - id: setup-python uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # tag=v5.2.0 with: python-version: ${{ inputs.python_version }} - name: Cache testing environments - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # tag=v4.0.2 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # tag=v4.1.1 env: BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\ py${{ steps.setup-python.outputs.python-version }}-" @@ -183,7 +183,7 @@ jobs: - name: Upload unencrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'false' - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # tag=v4.4.0 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # tag=v4.4.3 with: name: ${{ inputs.data_artifact_name }} path: data.tar.gz @@ -191,7 +191,7 @@ jobs: - name: Upload encrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'true' - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # tag=v4.4.0 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # tag=v4.4.3 with: name: ${{ inputs.data_artifact_name }} path: data.tar.7z diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 77d5f7368..c8f2ca7a7 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -28,7 +28,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 with: persist-credentials: false @@ -52,7 +52,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # tag=v4.4.0 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # tag=v4.4.3 with: name: SARIF file path: results.sarif @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 + uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 with: sarif_file: results.sarif diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 88f44cb74..73264512c 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -23,7 +23,7 @@ jobs: uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 - name: Sync repository labels if: success() uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b # tag=v5.0.0 From c1ccbe8aa15f77b94fa4d364decc3ddfbad179a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 18:27:23 +0000 Subject: [PATCH 058/139] Bump the npm-all group across 1 directory with 2 updates Bumps the npm-all group with 2 updates in the / directory: [winston](https://github.com/winstonjs/winston) and [typescript](https://github.com/microsoft/TypeScript). Updates `winston` from 3.14.2 to 3.15.0 - [Release notes](https://github.com/winstonjs/winston/releases) - [Changelog](https://github.com/winstonjs/winston/blob/master/CHANGELOG.md) - [Commits](https://github.com/winstonjs/winston/compare/v3.14.2...v3.15.0) Updates `typescript` from 5.6.2 to 5.6.3 - [Release notes](https://github.com/microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/microsoft/TypeScript/compare/v5.6.2...v5.6.3) --- updated-dependencies: - dependency-name: winston dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm-all - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-all ... Signed-off-by: dependabot[bot] --- package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 16e5ea354..61f07a3b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,14 +14,14 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.14.2" + "winston": "^3.15.0" }, "devDependencies": { "@types/cheerio": "^0.22.35", "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.6.2" + "typescript": "^5.6.3" } }, "node_modules/@colors/colors": { @@ -655,9 +655,9 @@ } }, "node_modules/typescript": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", - "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -728,9 +728,9 @@ } }, "node_modules/winston": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.2.tgz", - "integrity": "sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg==", + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.15.0.tgz", + "integrity": "sha512-RhruH2Cj0bV0WgNL+lOfoUBI4DVfdUNjVnJGVovWZmrcKtrFTTRzgXYK2O9cymSGjrERCtaAeHwMNnUWXlwZow==", "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", @@ -1229,9 +1229,9 @@ "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==" }, "typescript": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", - "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true }, "undici": { @@ -1277,9 +1277,9 @@ "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==" }, "winston": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.2.tgz", - "integrity": "sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg==", + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.15.0.tgz", + "integrity": "sha512-RhruH2Cj0bV0WgNL+lOfoUBI4DVfdUNjVnJGVovWZmrcKtrFTTRzgXYK2O9cymSGjrERCtaAeHwMNnUWXlwZow==", "requires": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", diff --git a/package.json b/package.json index bff450c42..d05380318 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.14.2" + "winston": "^3.15.0" }, "description": "Utilities to help boot a FoundryVTT server.", "devDependencies": { @@ -17,7 +17,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.6.2" + "typescript": "^5.6.3" }, "homepage": "https://github.com/felddy/foundryvtt-docker#readme", "keywords": [ From 41c6325bd9a9a9e6e3354aa479f019d5d2f6d1b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 08:42:27 +0000 Subject: [PATCH 059/139] Bump the github-actions-all group across 1 directory with 6 updates Bumps the github-actions-all group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [actions/checkout](https://github.com/actions/checkout) | `4.2.1` | `4.2.2` | | [github/codeql-action](https://github.com/github/codeql-action) | `3.26.13` | `3.27.0` | | [actions/dependency-review-action](https://github.com/actions/dependency-review-action) | `4.3.4` | `4.4.0` | | [actions/setup-python](https://github.com/actions/setup-python) | `5.2.0` | `5.3.0` | | [actions/cache](https://github.com/actions/cache) | `4.1.1` | `4.1.2` | | [crazy-max/ghaction-github-labeler](https://github.com/crazy-max/ghaction-github-labeler) | `5.0.0` | `5.1.0` | Updates `actions/checkout` from 4.2.1 to 4.2.2 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871...11bd71901bbe5b1630ceea73d27597364c9af683) Updates `github/codeql-action` from 3.26.13 to 3.27.0 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/f779452ac5af1c261dce0346a8f964149f49322b...662472033e021d55d94146f66f6058822b0b39fd) Updates `actions/dependency-review-action` from 4.3.4 to 4.4.0 - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/5a2ce3f5b92ee19cbb1541a4984c76d921601d7c...4081bf99e2866ebe428fc0477b69eb4fcda7220a) Updates `actions/setup-python` from 5.2.0 to 5.3.0 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/f677139bbe7f9c59b41e40162b753c062f5d49a3...0b93645e9fea7318ecaed2b359559ac225c90a2b) Updates `actions/cache` from 4.1.1 to 4.1.2 - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/3624ceb22c1c5a301c8db4169662070a689d9ea8...6849a6489940f00c2f30c0fb92c6274307ccb58a) Updates `crazy-max/ghaction-github-labeler` from 5.0.0 to 5.1.0 - [Release notes](https://github.com/crazy-max/ghaction-github-labeler/releases) - [Commits](https://github.com/crazy-max/ghaction-github-labeler/compare/de749cf181958193cb7debf1a9c5bb28922f3e1b...b54af0c25861143e7c8813d7cbbf46d2c341680c) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: crazy-max/ghaction-github-labeler dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/dependency-review.yml | 4 ++-- .github/workflows/docker-pytest-image.yml | 6 +++--- .github/workflows/scorecards.yml | 4 ++-- .github/workflows/sync-labels.yml | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2bad79070..982a85655 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,11 +50,11 @@ jobs: egress-policy: audit - name: Checkout repository - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 + uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # tag=codeql-bundle-v3.27.0 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 + uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # tag=codeql-bundle-v3.27.0 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 + uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # tag=codeql-bundle-v3.27.0 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index c21adc8a2..1587b9454 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -16,6 +16,6 @@ jobs: with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2 - name: 'Dependency Review' - uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # tag=v4.3.4 + uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # tag=v4.4.0 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 721b68fbe..4a9474a3a 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -108,14 +108,14 @@ jobs: echo "do_decryption=false" >> $GITHUB_OUTPUT fi - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2 - id: setup-python - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # tag=v5.2.0 + uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # tag=v5.3.0 with: python-version: ${{ inputs.python_version }} - name: Cache testing environments - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # tag=v4.1.1 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # tag=v4.1.2 env: BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\ py${{ steps.setup-python.outputs.python-version }}-" diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index c8f2ca7a7..29402f0be 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -28,7 +28,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2 with: persist-credentials: false @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 + uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # tag=codeql-bundle-v3.27.0 with: sarif_file: results.sarif diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 73264512c..f796b3da5 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -23,10 +23,10 @@ jobs: uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2 - name: Sync repository labels if: success() - uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b # tag=v5.0.0 + uses: crazy-max/ghaction-github-labeler@b54af0c25861143e7c8813d7cbbf46d2c341680c # tag=v5.1.0 with: # This is a hideous ternary equivalent so we only do a dry run unless # this workflow is triggered by the develop branch. From 4784c3615fdc5d86e37fad9b3db132e84cae337f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 17:20:25 +0000 Subject: [PATCH 060/139] Bump the pip-all group with 2 updates Bumps the pip-all group with 2 updates: [setuptools](https://github.com/pypa/setuptools) and [pytest-cov](https://github.com/pytest-dev/pytest-cov). Updates `setuptools` from 75.2.0 to 75.3.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v75.2.0...v75.3.0) Updates `pytest-cov` from 5.0.0 to 6.0.0 - [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-cov/compare/v5.0.0...v6.0.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-all - dependency-name: pytest-cov dependency-type: direct:development update-type: version-update:semver-major dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 8f13340f8..076bb59d9 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 75.2.0", + "setuptools == 75.3.0", "wheel == 0.44.0", ], extras_require={ @@ -78,7 +78,7 @@ def package_vars(version_file): "docker == 7.1.0", "pre-commit == 4.0.1", "pytest == 8.3.3", - "pytest-cov == 5.0.0", + "pytest-cov == 6.0.0", ] }, ) From ea0d5f57767192ae8add73abdc126f5e2302e34a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 17:55:18 +0000 Subject: [PATCH 061/139] Bump winston from 3.15.0 to 3.16.0 in the npm-all group Bumps the npm-all group with 1 update: [winston](https://github.com/winstonjs/winston). Updates `winston` from 3.15.0 to 3.16.0 - [Release notes](https://github.com/winstonjs/winston/releases) - [Changelog](https://github.com/winstonjs/winston/blob/master/CHANGELOG.md) - [Commits](https://github.com/winstonjs/winston/compare/v3.15.0...v3.16.0) --- updated-dependencies: - dependency-name: winston dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm-all ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 61f07a3b8..fa7815734 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.15.0" + "winston": "^3.16.0" }, "devDependencies": { "@types/cheerio": "^0.22.35", @@ -728,9 +728,9 @@ } }, "node_modules/winston": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.15.0.tgz", - "integrity": "sha512-RhruH2Cj0bV0WgNL+lOfoUBI4DVfdUNjVnJGVovWZmrcKtrFTTRzgXYK2O9cymSGjrERCtaAeHwMNnUWXlwZow==", + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.16.0.tgz", + "integrity": "sha512-xz7+cyGN5M+4CmmD4Npq1/4T+UZaz7HaeTlAruFUTjk79CNMq+P6H30vlE4z0qfqJ01VHYQwd7OZo03nYm/+lg==", "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", @@ -1277,9 +1277,9 @@ "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==" }, "winston": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.15.0.tgz", - "integrity": "sha512-RhruH2Cj0bV0WgNL+lOfoUBI4DVfdUNjVnJGVovWZmrcKtrFTTRzgXYK2O9cymSGjrERCtaAeHwMNnUWXlwZow==", + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.16.0.tgz", + "integrity": "sha512-xz7+cyGN5M+4CmmD4Npq1/4T+UZaz7HaeTlAruFUTjk79CNMq+P6H30vlE4z0qfqJ01VHYQwd7OZo03nYm/+lg==", "requires": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", diff --git a/package.json b/package.json index d05380318..1737a1442 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.15.0" + "winston": "^3.16.0" }, "description": "Utilities to help boot a FoundryVTT server.", "devDependencies": { From a8b2ed0136cea9fb94e531427cea209441663fe7 Mon Sep 17 00:00:00 2001 From: Mark Feldhousen Date: Mon, 29 Apr 2024 14:02:43 -0400 Subject: [PATCH 062/139] Revert "Testing release 12.320.0" --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 28 +++++++++++++-------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 138aa5de3..afb4823cd 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 = "12.320" + com.foundryvtt.version = "11.315" 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 = "12.320.0" + org.opencontainers.image.version = "11.315.1" 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 v12.320.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v11.315.1 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 2fd6dd3a5..cea07a23d 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 = "12.320" + com.foundryvtt.version = "11.315" 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 = "12.320.0" + org.opencontainers.image.version = "11.315.1" 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 v12.320.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v11.315.1 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 765f80a2a..d31b77d4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.320 +ARG FOUNDRY_VERSION=11.315 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index 3280be6e9..4d9486f0a 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: v12.320](https://img.shields.io/badge/release-v12.320-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/12.320) +[![FoundryVTT Release Version: v11.315](https://img.shields.io/badge/release-v11.315-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.315) [![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) @@ -212,9 +212,9 @@ 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:12.320.0`| An exact image version. | -|`felddy/foundryvtt:12.320`| The most recent image matching the major and minor version numbers. | -|`felddy/foundryvtt:12`| The most recent image matching the major version number. | +|`felddy/foundryvtt:11.315.1`| An exact image version. | +|`felddy/foundryvtt:11.315`| 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/) | See the [tags tab](https://hub.docker.com/r/felddy/foundryvtt/tags) on Docker @@ -267,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-12.320.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.315.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.320` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `11.315` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.320.0 \ - --tag felddy/foundryvtt:12.320.0 \ + --build-arg VERSION=11.315.1 \ + --tag felddy/foundryvtt:11.315.1 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.320.0 \ + --build-arg VERSION=11.315.1 \ --output type=docker \ - --tag felddy/foundryvtt:12.320.0 . + --tag felddy/foundryvtt:11.315.1 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.320.0 \ - --tag felddy/foundryvtt:12.320.0 \ + --build-arg VERSION=11.315.1 \ + --tag felddy/foundryvtt:11.315.1 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.320.0 \ - --tag felddy/foundryvtt:12.320.0 \ + --build-arg VERSION=11.315.1 \ + --tag felddy/foundryvtt:11.315.1 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index a2822bb68..5660464fe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.320 + # - FOUNDRY_VERSION=11.315 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index 91926dc87..b830b3225 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.320.0" +__version__ = "11.315.1" From 19308429a16a2eb208b0ed33f62c7e71a10c92d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 08:37:47 +0000 Subject: [PATCH 063/139] Bump coveralls from 3.3.1 to 4.0.0 Bumps [coveralls](https://github.com/TheKevJames/coveralls-python) from 3.3.1 to 4.0.0. - [Release notes](https://github.com/TheKevJames/coveralls-python/releases) - [Changelog](https://github.com/TheKevJames/coveralls-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/TheKevJames/coveralls-python/compare/3.3.1...4.0.0) --- updated-dependencies: - dependency-name: coveralls dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5ddbfe8b8..9ad45f5f8 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ def package_vars(version_file): extras_require={ "test": [ "coverage == 6.5.0", - "coveralls == 3.3.1", + "coveralls == 4.0.0", "docker == 7.0.0", "pre-commit == 3.7.0", "pytest == 8.2.0", From e80f6ec09b57a1b2c87709215049cdcee1334920 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:51:34 +0000 Subject: [PATCH 064/139] Bump step-security/harden-runner from 2.7.0 to 2.7.1 Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.7.0 to 2.7.1. - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/63c24ba6bd7ba022e95695ff85de572c04a18142...a4aa98b93cab29d9b1101a6143fb8bce00e2eac4) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/stale-issues.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d065ff506..38986d853 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: block @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: block @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: block diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5947a5d65..b34feb250 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 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 22f956f35..fc45eaa42 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@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index e5287767f..2ae452035 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: audit # allowed-endpoints: > diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index 5998c2b8d..53879f9ee 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 8a316400e..e6a37ea41 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # tag=v2.7.0 + uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 From b6c34bca77fa33b4bf533dd4f91ba62ba81f777f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:57:51 +0000 Subject: [PATCH 065/139] Bump actions/dependency-review-action from 4.2.5 to 4.3.1 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.2.5 to 4.3.1. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/5bbc3ba658137598168acb2ab73b21c432dd411b...e58c696e52cac8e62d61cc21fda89565d71505d7) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index fc45eaa42..11cf00715 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -18,4 +18,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 - name: 'Dependency Review' - uses: actions/dependency-review-action@5bbc3ba658137598168acb2ab73b21c432dd411b # tag=v4.2.5 + uses: actions/dependency-review-action@e58c696e52cac8e62d61cc21fda89565d71505d7 # tag=v4.3.1 From ac21d865c83da900881815c277f6bf2cb22d8a05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:04:40 +0000 Subject: [PATCH 066/139] Bump coverage from 6.5.0 to 7.5.0 Bumps [coverage](https://github.com/nedbat/coveragepy) from 6.5.0 to 7.5.0. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.5.0...7.5.0) --- updated-dependencies: - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9ad45f5f8..65e21d78d 100644 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ def package_vars(version_file): ], extras_require={ "test": [ - "coverage == 6.5.0", + "coverage == 7.5.0", "coveralls == 4.0.0", "docker == 7.0.0", "pre-commit == 3.7.0", From 31b477baecb666151723cc5afc085d9135da17c4 Mon Sep 17 00:00:00 2001 From: Mark Feldhousen Date: Tue, 30 Apr 2024 12:25:35 -0400 Subject: [PATCH 067/139] Update setup.py Downgrade from 7.5.0. to 7.4.4 which is supported by coveralls 4.0.0 Signed-off-by: Mark Feldhousen --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 65e21d78d..3aaa78836 100644 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ def package_vars(version_file): ], extras_require={ "test": [ - "coverage == 7.5.0", + "coverage == 7.4.4", "coveralls == 4.0.0", "docker == 7.0.0", "pre-commit == 3.7.0", From 73252e43c31f4ff277c511bb2dff56f80f679cd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 08:50:46 +0000 Subject: [PATCH 068/139] Bump actions/dependency-review-action from 4.3.1 to 4.3.2 Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.3.1 to 4.3.2. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/e58c696e52cac8e62d61cc21fda89565d71505d7...0c155c5e8556a497adf53f2c18edabf945ed8e70) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 11cf00715..d613fe87c 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -18,4 +18,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 - name: 'Dependency Review' - uses: actions/dependency-review-action@e58c696e52cac8e62d61cc21fda89565d71505d7 # tag=v4.3.1 + uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # tag=v4.3.2 From a9c78d7788b035b364193802b95925c8c30ad8cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 08:11:34 +0000 Subject: [PATCH 069/139] Bump actions/checkout from 4.1.4 to 4.1.5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/0ad4b8fadaa221de15dcec353f45205ec38ea70b...44c2b7a8a4ea60a981eaca3cf939b5f4305c123b) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/scorecards.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b34feb250..81983f17e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,7 +50,7 @@ jobs: egress-policy: audit - name: Checkout repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index d613fe87c..d88daf32b 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -16,6 +16,6 @@ jobs: with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 - name: 'Dependency Review' uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # tag=v4.3.2 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 2ae452035..b4a52acc7 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -108,7 +108,7 @@ jobs: echo "do_decryption=false" >> $GITHUB_OUTPUT fi - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 - id: setup-python uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # tag=v5.1.0 with: diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 9ac45c999..050893225 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -28,7 +28,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 with: persist-credentials: false diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index e6a37ea41..e7deb3db2 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -23,7 +23,7 @@ jobs: uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # tag=v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 - name: Sync repository labels if: success() uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b # tag=v5.0.0 From e277c1ea0e9d44584b7c4dfd98145cca391ff71d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 May 2024 20:32:57 +0000 Subject: [PATCH 070/139] Bump ossf/scorecard-action from 2.3.1 to 2.3.3 Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.1 to 2.3.3. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/0864cf19026789058feabb7e87baa5f140aac736...dc50aa9510b46c811795eb24b2f1ba02a914e534) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 050893225..6aef4b2fe 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -33,7 +33,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # tag=v2.3.1 + uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # tag=v2.3.3 with: results_file: results.sarif results_format: sarif From dbe2427304a13415c3a8a2cdb9038877d11af232 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 08:23:59 +0000 Subject: [PATCH 071/139] Bump pre-commit from 3.7.0 to 3.7.1 Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.7.0 to 3.7.1. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v3.7.0...v3.7.1) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3aaa78836..394187574 100644 --- a/setup.py +++ b/setup.py @@ -76,7 +76,7 @@ def package_vars(version_file): "coverage == 7.4.4", "coveralls == 4.0.0", "docker == 7.0.0", - "pre-commit == 3.7.0", + "pre-commit == 3.7.1", "pytest == 8.2.0", "pytest-cov == 5.0.0", ] From 3dfc92cbc0a9dd2709c51b98a5bc3036d1f19757 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 20:11:52 +0000 Subject: [PATCH 072/139] Bump coveralls from 4.0.0 to 4.0.1 Bumps [coveralls](https://github.com/TheKevJames/coveralls-python) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/TheKevJames/coveralls-python/releases) - [Changelog](https://github.com/TheKevJames/coveralls-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/TheKevJames/coveralls-python/compare/4.0.0...4.0.1) --- updated-dependencies: - dependency-name: coveralls dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 394187574..91a96862e 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ def package_vars(version_file): extras_require={ "test": [ "coverage == 7.4.4", - "coveralls == 4.0.0", + "coveralls == 4.0.1", "docker == 7.0.0", "pre-commit == 3.7.1", "pytest == 8.2.0", From 592d1c3094d78a28f2865058a4d768f49326e475 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 20:23:52 +0000 Subject: [PATCH 073/139] Bump actions/checkout from 4.1.5 to 4.1.6 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.5 to 4.1.6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/44c2b7a8a4ea60a981eaca3cf939b5f4305c123b...a5ac7e51b41094c92402da3b24376905380afc29) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/scorecards.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 81983f17e..8494dcc97 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,7 +50,7 @@ jobs: egress-policy: audit - name: Checkout repository - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index d88daf32b..53d078538 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -16,6 +16,6 @@ jobs: with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 - name: 'Dependency Review' uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # tag=v4.3.2 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index b4a52acc7..49535ca9b 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -108,7 +108,7 @@ jobs: echo "do_decryption=false" >> $GITHUB_OUTPUT fi - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 - id: setup-python uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # tag=v5.1.0 with: diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 6aef4b2fe..38d8ea073 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -28,7 +28,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 with: persist-credentials: false diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index e7deb3db2..de052539a 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -23,7 +23,7 @@ jobs: uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 - name: Sync repository labels if: success() uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b # tag=v5.0.0 From d88f9d6360afd1377c78a7cd18a8d006ded2e48e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 08:01:40 +0000 Subject: [PATCH 074/139] Bump pytest from 8.2.0 to 8.2.1 Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.0 to 8.2.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.2.0...8.2.1) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 91a96862e..d1fd41423 100644 --- a/setup.py +++ b/setup.py @@ -77,7 +77,7 @@ def package_vars(version_file): "coveralls == 4.0.1", "docker == 7.0.0", "pre-commit == 3.7.1", - "pytest == 8.2.0", + "pytest == 8.2.1", "pytest-cov == 5.0.0", ] }, From 1fe8d135733cb9a2c5472a77716cd6f287283aa8 Mon Sep 17 00:00:00 2001 From: Felddy Date: Wed, 22 May 2024 17:51:12 -0400 Subject: [PATCH 075/139] Pin requests dependency to work around docker-py incompatibility See: https://github.com/docker/docker-py/pull/3257 --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index d1fd41423..5c569d640 100644 --- a/setup.py +++ b/setup.py @@ -79,6 +79,9 @@ def package_vars(version_file): "pre-commit == 3.7.1", "pytest == 8.2.1", "pytest-cov == 5.0.0", + # TODO Unpin requests once docker-py is updated. + # See: https://github.com/docker/docker-py/pull/3257 + "requests == 2.31.0", ] }, ) From 8b3f4f86052a1d8695b550803a011dd86f94d71a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 22:00:51 +0000 Subject: [PATCH 076/139] --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5c569d640..039e43931 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 69.5.1", + "setuptools == 70.0.0", "wheel == 0.43.0", ], extras_require={ From c59194ee214128294ccd51c8d2613cb569d5f169 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 22:07:58 +0000 Subject: [PATCH 077/139] --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/stale-issues.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38986d853..c91a86fd8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: egress-policy: block @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: egress-policy: block @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: egress-policy: block diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 8494dcc97..852703213 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 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 53d078538..33213b817 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@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 49535ca9b..21ed2220c 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: egress-policy: audit # allowed-endpoints: > diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index 53879f9ee..befcd39e4 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index de052539a..551e0b317 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # tag=v2.7.1 + uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 From 6e9e8073f8c97e8835f8ec9ddaa7b5f53d008014 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 22:13:36 +0000 Subject: [PATCH 078/139] Bump github/codeql-action from 2.13.4 to 3.25.6 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.13.4 to 3.25.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/cdcdbb579706841c47f7063dda365e292e5cad7a...9fdb3e49720b44c48891d036bb502feb25684276) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 852703213..3206b3a92 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a # tag=codeql-bundle-v2.13.4 + uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@cdcdbb579706841c47f7063dda365e292e5cad7a # tag=codeql-bundle-v2.13.4 + uses: github/codeql-action/autobuild@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a # tag=codeql-bundle-v2.13.4 + uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 38d8ea073..633fc51da 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # tag=codeql-bundle-v2.13.4 + uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 with: sarif_file: results.sarif From 4a06dcc3590e513e4138604bb3f5dab1e2cd54d6 Mon Sep 17 00:00:00 2001 From: Felddy Date: Thu, 23 May 2024 08:08:08 -0400 Subject: [PATCH 079/139] Unpin requests and bump docker-py --- setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 039e43931..dd833cf83 100644 --- a/setup.py +++ b/setup.py @@ -75,13 +75,10 @@ def package_vars(version_file): "test": [ "coverage == 7.4.4", "coveralls == 4.0.1", - "docker == 7.0.0", + "docker == 7.1.0", "pre-commit == 3.7.1", "pytest == 8.2.1", "pytest-cov == 5.0.0", - # TODO Unpin requests once docker-py is updated. - # See: https://github.com/docker/docker-py/pull/3257 - "requests == 2.31.0", ] }, ) From 1984aca71124a276b0f0847c142b44b1465198a0 Mon Sep 17 00:00:00 2001 From: Felddy Date: Thu, 23 May 2024 10:28:10 -0400 Subject: [PATCH 080/139] Bump FoundryVTT version to 12.324 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 28 +++++++++++++-------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index afb4823cd..752039003 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.315" + com.foundryvtt.version = "12.324" 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.315.1" + org.opencontainers.image.version = "12.324.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.315.1 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.324.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 cea07a23d..398a14c9e 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.315" + com.foundryvtt.version = "12.324" 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.315.1" + org.opencontainers.image.version = "12.324.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.315.1 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.324.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 d31b77d4f..5402d611a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=11.315 +ARG FOUNDRY_VERSION=12.324 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index 4d9486f0a..b8dbc8a3a 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.315](https://img.shields.io/badge/release-v11.315-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.315) +[![FoundryVTT Release Version: v12.324](https://img.shields.io/badge/release-v12.324-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/12.324) [![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) @@ -212,9 +212,9 @@ 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.315.1`| An exact image version. | -|`felddy/foundryvtt:11.315`| 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:12.324.0`| An exact image version. | +|`felddy/foundryvtt:12.324`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12`| 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/) | See the [tags tab](https://hub.docker.com/r/felddy/foundryvtt/tags) on Docker @@ -267,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.315.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-12.324.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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.315` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.324` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=11.315.1 \ - --tag felddy/foundryvtt:11.315.1 \ + --build-arg VERSION=12.324.0 \ + --tag felddy/foundryvtt:12.324.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=11.315.1 \ + --build-arg VERSION=12.324.0 \ --output type=docker \ - --tag felddy/foundryvtt:11.315.1 . + --tag felddy/foundryvtt:12.324.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=11.315.1 \ - --tag felddy/foundryvtt:11.315.1 \ + --build-arg VERSION=12.324.0 \ + --tag felddy/foundryvtt:12.324.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=11.315.1 \ - --tag felddy/foundryvtt:11.315.1 \ + --build-arg VERSION=12.324.0 \ + --tag felddy/foundryvtt:12.324.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index 5660464fe..84b9e4ed3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=11.315 + # - FOUNDRY_VERSION=12.324 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index b830b3225..698bcd77f 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "11.315.1" +__version__ = "12.324.0" From e4e1812b59a4eb3b54a0fdc5578f25a78369b24d Mon Sep 17 00:00:00 2001 From: Felddy Date: Fri, 24 May 2024 12:13:15 -0400 Subject: [PATCH 081/139] Add groups to Dependabot ecosystems --- .github/dependabot.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 70b2065f9..5117ccf84 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,6 +15,11 @@ updates: - "bot :robot:" - "dependencies :game_die:" - "docker :whale:" + groups: + docker-all: + applies-to: "version-updates" + patterns: + - "*" - package-ecosystem: "github-actions" directory: "/" @@ -24,6 +29,11 @@ updates: - "bot :robot:" - "dependencies :game_die:" - "github-actions :octocat:" + groups: + github-actions-all: + applies-to: "version-updates" + patterns: + - "*" - package-ecosystem: "npm" directory: "/" @@ -33,6 +43,11 @@ updates: - "bot :robot:" - "dependencies :game_die:" - "javascript :coffee:" + groups: + npm-all: + applies-to: "version-updates" + patterns: + - "*" - package-ecosystem: "pip" directory: "/" @@ -42,3 +57,8 @@ updates: - "bot :robot:" - "dependencies :game_die:" - "python :snake:" + groups: + pip-all: + applies-to: "version-updates" + patterns: + - "*" From a22aaae8d4c1036a58e9aed624890df599423113 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 08:57:12 +0000 Subject: [PATCH 082/139] Bump github/codeql-action in the github-actions-all group Bumps the github-actions-all group with 1 update: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.25.6 to 3.25.7 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/9fdb3e49720b44c48891d036bb502feb25684276...f079b8493333aace61c81488f8bd40919487bd9f) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3206b3a92..c23c0afb3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 + uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 + uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 + uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 633fc51da..203180e56 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # tag=codeql-bundle-v3.25.6 + uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 with: sarif_file: results.sarif From f19d56b69197a22c2303395bd80ebf71c305d237 Mon Sep 17 00:00:00 2001 From: Felddy Date: Fri, 31 May 2024 09:54:39 -0400 Subject: [PATCH 083/139] Bump FoundryVTT version to 12.325 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 26 +++++++++++++------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 752039003..03ad9a564 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 = "12.324" + com.foundryvtt.version = "12.325" 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 = "12.324.0" + org.opencontainers.image.version = "12.325.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 v12.324.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.325.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 398a14c9e..2f25733b9 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 = "12.324" + com.foundryvtt.version = "12.325" 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 = "12.324.0" + org.opencontainers.image.version = "12.325.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 v12.324.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.325.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 5402d611a..1df0be4d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.324 +ARG FOUNDRY_VERSION=12.325 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index b8dbc8a3a..fd439dfb6 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: v12.324](https://img.shields.io/badge/release-v12.324-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/12.324) +[![FoundryVTT Release Version: v12.325](https://img.shields.io/badge/release-v12.325-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/12.325) [![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) @@ -212,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:12.324.0`| An exact image version. | -|`felddy/foundryvtt:12.324`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12.325.0`| An exact image version. | +|`felddy/foundryvtt:12.325`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:12`| 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/) | @@ -267,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-12.324.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-12.325.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.324` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.325` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.324.0 \ - --tag felddy/foundryvtt:12.324.0 \ + --build-arg VERSION=12.325.0 \ + --tag felddy/foundryvtt:12.325.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.324.0 \ + --build-arg VERSION=12.325.0 \ --output type=docker \ - --tag felddy/foundryvtt:12.324.0 . + --tag felddy/foundryvtt:12.325.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.324.0 \ - --tag felddy/foundryvtt:12.324.0 \ + --build-arg VERSION=12.325.0 \ + --tag felddy/foundryvtt:12.325.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.324.0 \ - --tag felddy/foundryvtt:12.324.0 \ + --build-arg VERSION=12.325.0 \ + --tag felddy/foundryvtt:12.325.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index 84b9e4ed3..ebb81e0de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.324 + # - FOUNDRY_VERSION=12.325 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index 698bcd77f..9246ccc71 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.324.0" +__version__ = "12.325.0" From 5f055b8c69def90aa728378ccbdd04d11a94fc47 Mon Sep 17 00:00:00 2001 From: Felddy Date: Fri, 31 May 2024 10:16:32 -0400 Subject: [PATCH 084/139] Remove references to AWS S3 FoundryVTT is now using cloudflare's R2 object storage. Remove references to AWS S3, and use a generic term: "presigned URL". Normalize usage of `presigned` (not `pre-signed`). See: - https://developers.cloudflare.com/r2/api/s3/presigned-urls/ --- Dockerfile | 4 ++-- README.md | 6 +++--- src/entrypoint.sh | 22 +++++++++++----------- src/get_release_url.ts | 14 +++++++------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1df0be4d1..687641f51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,8 +41,8 @@ RUN \ if [ -n "${FOUNDRY_USERNAME}" ] && [ -n "${FOUNDRY_PASSWORD}" ]; then \ npm install && \ ./authenticate.js "${FOUNDRY_USERNAME}" "${FOUNDRY_PASSWORD}" cookiejar.json && \ - s3_url=$(./get_release_url.js --retry 5 cookiejar.json "${FOUNDRY_VERSION}") && \ - wget -O ${ARCHIVE} "${s3_url}" && \ + presigned_url=$(./get_release_url.js --retry 5 cookiejar.json "${FOUNDRY_VERSION}") && \ + wget -O ${ARCHIVE} "${presigned_url}" && \ unzip -d dist ${ARCHIVE} 'resources/*'; \ elif [ -n "${FOUNDRY_RELEASE_URL}" ]; then \ wget -O ${ARCHIVE} "${FOUNDRY_RELEASE_URL}" && \ diff --git a/README.md b/README.md index fd439dfb6..b8c5c6552 100644 --- a/README.md +++ b/README.md @@ -257,11 +257,11 @@ evaluated in the following order of precedence: ***Note:*** `FOUNDRY_USERNAME` and `FOUNDRY_PASSWORD` may be set [using secrets](#using-secrets) instead of environment variables. -#### Pre-signed URL variable #### +#### Presigned URL variable #### | Name | Purpose | |------------------|----------| -| `FOUNDRY_RELEASE_URL` | S3 pre-signed URL generate from the user's profile. Required for downloading an application distribution. | +| `FOUNDRY_RELEASE_URL` | The presigned URL generate from the user's profile. Required for downloading an application distribution. | ### Optional variables ### @@ -273,7 +273,7 @@ secrets](#using-secrets) instead of environment variables. | `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` | | `CONTAINER_PRESERVE_OWNER` | Normally the ownership of the `/data` directory and its contents are changed to match that of the server at startup. Setting this to a regular expression will exclude any matching paths and preserve their ownership. *Note: This is a match on the whole path, not a search.* This is useful if you want mount a volume as read-only inside `/data` (e.g.; a volume that contains assets mounted at `/data/Data/assets`). | | -| `CONTAINER_URL_FETCH_RETRY` | Number of times to retry fetching the S3 pre-signed URL using exponential back off. This behavior is useful in continuous integration environments where multiple parallel workflows can exceed the rate-limit of the URL generation service. | `0` | +| `CONTAINER_URL_FETCH_RETRY` | Number of times to retry fetching the presigned URL using exponential back off. This behavior is useful in continuous integration environments where multiple parallel workflows can exceed the rate-limit of the URL generation service. | `0` | | `CONTAINER_VERBOSE` | Set to `true` to enable verbose logging for the container utility scripts. | `false` | | `FOUNDRY_ADMIN_KEY` | Admin password to be applied at startup. If omitted the admin password will be cleared. May be set [using secrets](#using-secrets). | | | `FOUNDRY_AWS_CONFIG` | An absolute or relative path that points to the [awsConfig.json](https://foundryvtt.com/article/aws-s3/) or `true` for AWS environment variable [credentials evaluation](https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-credentials-node.html) usage. | `null` | diff --git a/src/entrypoint.sh b/src/entrypoint.sh index 53a8c4921..5a4cae868 100755 --- a/src/entrypoint.sh +++ b/src/entrypoint.sh @@ -89,9 +89,9 @@ fi # Check to see if an install is required install_required=false -# Track whether an S3 URL request is made. +# Track whether a presigned URL request is made. # We use this information to protect from a download loop. -requested_s3_url=false +requested_presigned_url=false if [ -f "resources/app/package.json" ]; then # FoundryVTT no longer supports the "version" field in package.json # We need to build up a pseudo-version using the generation and build values @@ -113,7 +113,7 @@ if [ $install_required = true ]; then # Determine how we are going to get the release URL if [ "${FOUNDRY_RELEASE_URL:-}" ]; then log "Using FOUNDRY_RELEASE_URL to download release." - s3_url="${FOUNDRY_RELEASE_URL}" + presigned_url="${FOUNDRY_RELEASE_URL}" fi if [[ "${FOUNDRY_USERNAME:-}" && "${FOUNDRY_PASSWORD:-}" ]]; then log "Using FOUNDRY_USERNAME and FOUNDRY_PASSWORD to authenticate." @@ -124,16 +124,16 @@ if [ $install_required = true ]; then ./authenticate.js ${CONTAINER_VERBOSE+--log-level=debug} \ --user-agent="${node_user_agent}" \ "${FOUNDRY_USERNAME}" "${FOUNDRY_PASSWORD}" "${cookiejar_file}" - if [[ ! "${s3_url:-}" ]]; then - # If the s3_url wasn't set by FOUNDRY_RELEASE_URL generate one now. + if [[ ! "${presigned_url:-}" ]]; then + # If the presigned_url wasn't set by FOUNDRY_RELEASE_URL generate one now. log "Using authenticated credentials to download release." # CONTAINER_VERBOSE default value should not be quoted. # shellcheck disable=SC2086 - s3_url=$(./get_release_url.js ${CONTAINER_VERBOSE+--log-level=debug} \ + presigned_url=$(./get_release_url.js ${CONTAINER_VERBOSE+--log-level=debug} \ ${CONTAINER_URL_FETCH_RETRY+--retry=${CONTAINER_URL_FETCH_RETRY}} \ --user-agent="${node_user_agent}" \ "${cookiejar_file}" "${FOUNDRY_VERSION}") - requested_s3_url=true + requested_presigned_url=true fi fi @@ -153,14 +153,14 @@ if [ $install_required = true ]; then release_filename="${CONTAINER_CACHE%%+(/)}${CONTAINER_CACHE:+/}foundryvtt-${FOUNDRY_VERSION}.zip" set -o nounset - if [[ "${s3_url:-}" ]]; then + if [[ "${presigned_url:-}" ]]; then log "Downloading Foundry Virtual Tabletop release." # Download release if newer than cached version. # Filter out warnings about bad date formats if the file is missing. curl ${CONTAINER_VERBOSE+--verbose} --fail --location \ --user-agent "${curl_user_agent}" \ --time-cond "${release_filename}" \ - --output "${downloading_filename}" "${s3_url}" 2>&1 \ + --output "${downloading_filename}" "${presigned_url}" 2>&1 \ | tr "\r" "\n" \ | sed --unbuffered '/^Warning: .* date/d' @@ -357,9 +357,9 @@ if [ $exit_code -ne 0 ]; then log_error "Child process failed with error code: $exit_code" fi -# If the container requested a new S3 URL but disabled the cache +# If the container requested a new presigned URL but disabled the cache # we are going to sleep forever to prevent a download loop. -if [[ "${requested_s3_url}" == "true" && "${CONTAINER_CACHE:-}" == "" ]]; then +if [[ "${requested_presigned_url}" == "true" && "${CONTAINER_CACHE:-}" == "" ]]; then log_warn "Server exited after downloading a release while the CONTAINER_CACHE was disabled." log_warn "This configuration could lead to a restart loop putting excessive load on the release server." log_warn "Please re-enable the CONTAINER_CACHE to allow the container to safely exit." diff --git a/src/get_release_url.ts b/src/get_release_url.ts index 54334ab5f..23dfa9f9b 100755 --- a/src/get_release_url.ts +++ b/src/get_release_url.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node const doc = ` -Generate a Foundry Virtual Tabletop pre-signed release URL using cookies from +Generate a Foundry Virtual Tabletop presigned release URL using cookies from authenticate.js. The utility will print the release URL to standard out. @@ -77,7 +77,7 @@ async function sleepWithProgress(attempt: number): Promise { } /** - * fetchReleaseURL - Fetch the pre-signed S3 URL. + * fetchReleaseURL - Fetch the presigned URL. * * @param {string} build Build to download. * @param {number} retries Number of retries to attempt. @@ -87,7 +87,7 @@ async function fetchReleaseURL( build: string, retries: number, ): Promise { - logger.info(`Fetching S3 pre-signed release URL for build ${build}...`); + logger.info(`Fetching presigned release URL for build ${build}...`); const release_url: string = `${BASE_URL}/releases/download?build=${build}&platform=linux`; for (var attempt = 1; attempt <= 1 + retries; attempt++) { // If this is not the first attempt, wait a bit before trying again. @@ -109,10 +109,10 @@ async function fetchReleaseURL( continue; } - const s3_url: string | null = response.headers.get("location"); - logger.debug(`S3 presigned URL: ${s3_url}`); + const presigned_url: string | null = response.headers.get("location"); + logger.debug(`Presigned URL: ${presigned_url}`); - return s3_url; + return presigned_url; } throw new Error(`Failed to fetch release URL.`); } @@ -154,7 +154,7 @@ async function main(): Promise { ); } - // Generate an S3 pre-signed URL and print it to stdout. + // Generate a presigned URL and print it to stdout. const releaseURL: string | null = await fetchReleaseURL( foundry_build, retries, From 5274b08b5ab82a01ecae1ffb18e7498d36711ef8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 08:28:05 +0000 Subject: [PATCH 085/139] Bump pytest from 8.2.1 to 8.2.2 in the pip-all group Bumps the pip-all group with 1 update: [pytest](https://github.com/pytest-dev/pytest). Updates `pytest` from 8.2.1 to 8.2.2 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.2.1...8.2.2) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index dd833cf83..4f81a7431 100644 --- a/setup.py +++ b/setup.py @@ -77,7 +77,7 @@ def package_vars(version_file): "coveralls == 4.0.1", "docker == 7.1.0", "pre-commit == 3.7.1", - "pytest == 8.2.1", + "pytest == 8.2.2", "pytest-cov == 5.0.0", ] }, From c44df0bff453e5e483107eaca31d081c87fc36e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 16:37:51 +0000 Subject: [PATCH 086/139] Bump the github-actions-all group across 1 directory with 3 updates Bumps the github-actions-all group with 3 updates in the / directory: [step-security/harden-runner](https://github.com/step-security/harden-runner), [github/codeql-action](https://github.com/github/codeql-action) and [actions/dependency-review-action](https://github.com/actions/dependency-review-action). Updates `step-security/harden-runner` from 2.8.0 to 2.8.1 - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/f086349bfa2bd1361f7909c78558e816508cdc10...17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6) Updates `github/codeql-action` from 3.25.7 to 3.25.8 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/f079b8493333aace61c81488f8bd40919487bd9f...2e230e8fe0ad3a14a340ad0815ddb96d599d2aff) Updates `actions/dependency-review-action` from 4.3.2 to 4.3.3 - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/0c155c5e8556a497adf53f2c18edabf945ed8e70...72eb03d02c7872a771aacd928f3123ac62ad6d3a) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/dependency-review.yml | 4 ++-- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/scorecards.yml | 2 +- .github/workflows/stale-issues.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c91a86fd8..2decba34b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: block @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: block @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: block diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c23c0afb3..3f87a48b5 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 + uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 + uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 + uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 33213b817..b4449cc7e 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 - name: 'Dependency Review' - uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # tag=v4.3.2 + uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # tag=v4.3.3 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 21ed2220c..042e11ac5 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: audit # allowed-endpoints: > diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 203180e56..845618bbc 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # tag=codeql-bundle-v3.25.7 + uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 with: sarif_file: results.sarif diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index befcd39e4..f668ef3b3 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 551e0b317..f4b96c524 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # tag=v2.8.0 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 From 5863f3cf33f71addb350e08be4c281b6e60f2ed3 Mon Sep 17 00:00:00 2001 From: Felddy Date: Sat, 8 Jun 2024 21:17:02 -0400 Subject: [PATCH 087/139] Add redaction regex for Cloudflare pre-signed URLs --- tests/conftest.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/conftest.py b/tests/conftest.py index cec0af534..5918eaea9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -13,7 +13,10 @@ MAIN_SERVICE_NAME = "foundry" REDACTION_REGEXES = [ + # AWS S3 pre-signed URL re.compile(r"AWSAccessKeyId=(.*?)&Signature=(.*?)&"), + # Cloudflare R2 pre-signed URL + re.compile(r"\?verify=([0-9]+-[a-zA-Z0-9%]+)"), ] VERSION_FILE = "src/_version.py" VERSION_SERVICE_NAME = f"{MAIN_SERVICE_NAME}-version" From 8c1868cbf82ec66708fd36e28f6caa816adc5068 Mon Sep 17 00:00:00 2001 From: Felddy Date: Tue, 11 Jun 2024 13:39:20 -0400 Subject: [PATCH 088/139] Bump FoundryVTT version to 12.327 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 26 +++++++++++++------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 03ad9a564..50eb9681a 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 = "12.325" + com.foundryvtt.version = "12.327" 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 = "12.325.0" + org.opencontainers.image.version = "12.327.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 v12.325.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.327.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 2f25733b9..e620df950 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 = "12.325" + com.foundryvtt.version = "12.327" 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 = "12.325.0" + org.opencontainers.image.version = "12.327.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 v12.325.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.327.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 687641f51..1ac66a463 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.325 +ARG FOUNDRY_VERSION=12.327 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index b8c5c6552..8fd028cb4 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: v12.325](https://img.shields.io/badge/release-v12.325-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/12.325) +[![FoundryVTT Release Version: v12.327](https://img.shields.io/badge/release-v12.327-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/12.327) [![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) @@ -212,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:12.325.0`| An exact image version. | -|`felddy/foundryvtt:12.325`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12.327.0`| An exact image version. | +|`felddy/foundryvtt:12.327`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:12`| 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/) | @@ -267,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-12.325.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-12.327.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.325` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.327` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.325.0 \ - --tag felddy/foundryvtt:12.325.0 \ + --build-arg VERSION=12.327.0 \ + --tag felddy/foundryvtt:12.327.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.325.0 \ + --build-arg VERSION=12.327.0 \ --output type=docker \ - --tag felddy/foundryvtt:12.325.0 . + --tag felddy/foundryvtt:12.327.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.325.0 \ - --tag felddy/foundryvtt:12.325.0 \ + --build-arg VERSION=12.327.0 \ + --tag felddy/foundryvtt:12.327.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.325.0 \ - --tag felddy/foundryvtt:12.325.0 \ + --build-arg VERSION=12.327.0 \ + --tag felddy/foundryvtt:12.327.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index ebb81e0de..c6e720722 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.325 + # - FOUNDRY_VERSION=12.327 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index 9246ccc71..a5c9c4e9d 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.325.0" +__version__ = "12.327.0" From 303676b5efa02c645216dbbd2d621d790a117aea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2024 08:33:28 +0000 Subject: [PATCH 089/139] Bump typescript from 5.4.5 to 5.5.2 in the npm-all group Bumps the npm-all group with 1 update: [typescript](https://github.com/Microsoft/TypeScript). Updates `typescript` from 5.4.5 to 5.5.2 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.4.5...v5.5.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-all ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7461e4a68..246951ab3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.4.5" + "typescript": "^5.5.2" } }, "node_modules/@colors/colors": { @@ -603,9 +603,9 @@ } }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", + "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -1113,9 +1113,9 @@ "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==" }, "typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", + "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", "dev": true }, "universalify": { diff --git a/package.json b/package.json index e422d5d6f..b2f507902 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.4.5" + "typescript": "^5.5.2" }, "homepage": "https://github.com/felddy/foundryvtt-docker#readme", "keywords": [ From 0f83aba90c65a6209bc9a7dade304feb80b3189b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 08:27:25 +0000 Subject: [PATCH 090/139] Bump setuptools in the pip-all group across 1 directory Bumps the pip-all group with 1 update in the / directory: [setuptools](https://github.com/pypa/setuptools). Updates `setuptools` from 70.0.0 to 70.1.1 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v70.0.0...v70.1.1) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4f81a7431..4f7c5cb8a 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 70.0.0", + "setuptools == 70.1.1", "wheel == 0.43.0", ], extras_require={ From 21917c865043f5fe68735a4a4ecb4dbc492075d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 08:38:10 +0000 Subject: [PATCH 091/139] Bump the github-actions-all group across 1 directory with 2 updates Bumps the github-actions-all group with 2 updates in the / directory: [actions/checkout](https://github.com/actions/checkout) and [github/codeql-action](https://github.com/github/codeql-action). Updates `actions/checkout` from 4.1.6 to 4.1.7 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/a5ac7e51b41094c92402da3b24376905380afc29...692973e3d937129bcbf40652eb9f2f61becf3332) Updates `github/codeql-action` from 3.25.8 to 3.25.10 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2e230e8fe0ad3a14a340ad0815ddb96d599d2aff...23acc5c183826b7a8a97bce3cecc52db901f8251) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/scorecards.yml | 4 ++-- .github/workflows/sync-labels.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3f87a48b5..59ef3cdab 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,11 +50,11 @@ jobs: egress-policy: audit - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 + uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 + uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 + uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index b4449cc7e..5b5e110d1 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -16,6 +16,6 @@ jobs: with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 - name: 'Dependency Review' uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # tag=v4.3.3 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 042e11ac5..91cb2fd1d 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -108,7 +108,7 @@ jobs: echo "do_decryption=false" >> $GITHUB_OUTPUT fi - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 - id: setup-python uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # tag=v5.1.0 with: diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 845618bbc..b220a9d36 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -28,7 +28,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 with: persist-credentials: false @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=codeql-bundle-v3.25.8 + uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 with: sarif_file: results.sarif diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index f4b96c524..b23954428 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -23,7 +23,7 @@ jobs: uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 - name: Sync repository labels if: success() uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b # tag=v5.0.0 From 551325f5fa89a023280610a369d1ec2a361ee313 Mon Sep 17 00:00:00 2001 From: Felddy Date: Fri, 28 Jun 2024 10:32:00 -0400 Subject: [PATCH 092/139] Bump FoundryVTT version to 12.328 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 26 +++++++++++++------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 50eb9681a..f9af91482 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 = "12.327" + com.foundryvtt.version = "12.328" 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 = "12.327.0" + org.opencontainers.image.version = "12.328.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 v12.327.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.328.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 e620df950..209aa672f 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 = "12.327" + com.foundryvtt.version = "12.328" 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 = "12.327.0" + org.opencontainers.image.version = "12.328.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 v12.327.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.328.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 1ac66a463..0d6989207 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.327 +ARG FOUNDRY_VERSION=12.328 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index 8fd028cb4..f8cf0cba9 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: v12.327](https://img.shields.io/badge/release-v12.327-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/12.327) +[![FoundryVTT Release Version: v12.328](https://img.shields.io/badge/release-v12.328-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/12.328) [![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) @@ -212,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:12.327.0`| An exact image version. | -|`felddy/foundryvtt:12.327`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12.328.0`| An exact image version. | +|`felddy/foundryvtt:12.328`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:12`| 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/) | @@ -267,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-12.327.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-12.328.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.327` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.328` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.327.0 \ - --tag felddy/foundryvtt:12.327.0 \ + --build-arg VERSION=12.328.0 \ + --tag felddy/foundryvtt:12.328.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.327.0 \ + --build-arg VERSION=12.328.0 \ --output type=docker \ - --tag felddy/foundryvtt:12.327.0 . + --tag felddy/foundryvtt:12.328.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.327.0 \ - --tag felddy/foundryvtt:12.327.0 \ + --build-arg VERSION=12.328.0 \ + --tag felddy/foundryvtt:12.328.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.327.0 \ - --tag felddy/foundryvtt:12.327.0 \ + --build-arg VERSION=12.328.0 \ + --tag felddy/foundryvtt:12.328.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index c6e720722..60bedf976 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.327 + # - FOUNDRY_VERSION=12.328 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index a5c9c4e9d..a924a78fc 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.327.0" +__version__ = "12.328.0" From b69f9efcf66abf0bd26b15f2dd640bf175a535fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 08:21:40 +0000 Subject: [PATCH 093/139] Bump setuptools from 70.1.1 to 70.2.0 in the pip-all group Bumps the pip-all group with 1 update: [setuptools](https://github.com/pypa/setuptools). Updates `setuptools` from 70.1.1 to 70.2.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v70.1.1...v70.2.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4f7c5cb8a..881c39703 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 70.1.1", + "setuptools == 70.2.0", "wheel == 0.43.0", ], extras_require={ From 087b9a711ef714542ae74bce0c572a63102d99ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 08:19:09 +0000 Subject: [PATCH 094/139] Bump the github-actions-all group across 1 directory with 3 updates Bumps the github-actions-all group with 3 updates in the / directory: [github/codeql-action](https://github.com/github/codeql-action), [actions/download-artifact](https://github.com/actions/download-artifact) and [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `github/codeql-action` from 3.25.10 to 3.25.11 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/23acc5c183826b7a8a97bce3cecc52db901f8251...b611370bb5703a7efb587f9d136a52ea24c5c38c) Updates `actions/download-artifact` from 4.1.7 to 4.1.8 - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/65a9edc5881444af0b9093a5e628f2fe47ea3b2e...fa0a91b85d4f404e444e00e005971372dc801d16) Updates `actions/upload-artifact` from 4.3.3 to 4.3.4 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/65462800fd760344b1a7b4382951275a0abb4808...0b2256b8c012f0828dc542b3febcab082c67f72b) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/docker-pytest-image.yml | 6 +++--- .github/workflows/scorecards.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 59ef3cdab..1a8dfb5aa 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 + uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 + uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 + uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 91cb2fd1d..61ee0a9dc 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -133,7 +133,7 @@ jobs: pip install --upgrade --requirement requirements-test.txt - name: Download Docker image artifact - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # tag=v4.1.7 + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # tag=v4.1.8 with: name: ${{ inputs.image_artifact_name }} path: ${{ env.ARTIFACT_WORK_DIR }} @@ -183,7 +183,7 @@ jobs: - name: Upload unencrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'false' - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # tag=v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # tag=v4.3.4 with: name: ${{ inputs.data_artifact_name }} path: data.tar.gz @@ -191,7 +191,7 @@ jobs: - name: Upload encrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'true' - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # tag=v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # tag=v4.3.4 with: name: ${{ inputs.data_artifact_name }} path: data.tar.7z diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index b220a9d36..0b84f21ed 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -52,7 +52,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # tag=v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # tag=v4.3.4 with: name: SARIF file path: results.sarif @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=codeql-bundle-v3.25.10 + uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 with: sarif_file: results.sarif From f9df9f776cfa45f9d78aa0c85bcffeeee6dd4196 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 08:57:17 +0000 Subject: [PATCH 095/139] Bump the pip-all group across 1 directory with 3 updates Bumps the pip-all group with 3 updates in the / directory: [setuptools](https://github.com/pypa/setuptools), [coverage](https://github.com/nedbat/coveragepy) and [pytest](https://github.com/pytest-dev/pytest). Updates `setuptools` from 70.2.0 to 71.1.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v70.2.0...v71.1.0) Updates `coverage` from 7.4.4 to 7.6.0 - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.4.4...7.6.0) Updates `pytest` from 8.2.2 to 8.3.1 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.2.2...8.3.1) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-major dependency-group: pip-all - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-minor dependency-group: pip-all - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-minor dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 881c39703..4fee55834 100644 --- a/setup.py +++ b/setup.py @@ -68,16 +68,16 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 70.2.0", + "setuptools == 71.1.0", "wheel == 0.43.0", ], extras_require={ "test": [ - "coverage == 7.4.4", + "coverage == 7.6.0", "coveralls == 4.0.1", "docker == 7.1.0", "pre-commit == 3.7.1", - "pytest == 8.2.2", + "pytest == 8.3.1", "pytest-cov == 5.0.0", ] }, From 2e2de17336b2e2acc5dc5317d468fe5646ec0529 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:19:12 +0000 Subject: [PATCH 096/139] Bump the github-actions-all group across 1 directory with 4 updates Bumps the github-actions-all group with 4 updates in the / directory: [step-security/harden-runner](https://github.com/step-security/harden-runner), [github/codeql-action](https://github.com/github/codeql-action), [actions/dependency-review-action](https://github.com/actions/dependency-review-action) and [actions/setup-python](https://github.com/actions/setup-python). Updates `step-security/harden-runner` from 2.8.1 to 2.9.0 - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6...0d381219ddf674d61a7572ddd19d7941e271515c) Updates `github/codeql-action` from 3.25.11 to 3.25.13 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/b611370bb5703a7efb587f9d136a52ea24c5c38c...2d790406f505036ef40ecba973cc774a50395aac) Updates `actions/dependency-review-action` from 4.3.3 to 4.3.4 - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/72eb03d02c7872a771aacd928f3123ac62ad6d3a...5a2ce3f5b92ee19cbb1541a4984c76d921601d7c) Updates `actions/setup-python` from 5.1.0 to 5.1.1 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/82c7e631bb3cdc910f68e0081d67478d79c6982d...39cd14951b08e74b54015e9e001cdefcf80e669f) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/dependency-review.yml | 4 ++-- .github/workflows/docker-pytest-image.yml | 4 ++-- .github/workflows/scorecards.yml | 2 +- .github/workflows/stale-issues.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2decba34b..55a4ef5db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: egress-policy: block @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: egress-policy: block @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: egress-policy: block diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1a8dfb5aa..408f984bb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 + uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 + uses: github/codeql-action/autobuild@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 + uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 5b5e110d1..2d5ccf8ab 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 - name: 'Dependency Review' - uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # tag=v4.3.3 + uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # tag=v4.3.4 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 61ee0a9dc..ad5b23c3a 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: egress-policy: audit # allowed-endpoints: > @@ -110,7 +110,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 - id: setup-python - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # tag=v5.1.0 + uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # tag=v5.1.1 with: python-version: ${{ inputs.python_version }} diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 0b84f21ed..7ea1a031f 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # tag=codeql-bundle-v3.25.11 + uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 with: sarif_file: results.sarif diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index f668ef3b3..543ee7335 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index b23954428..047b65ab6 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # tag=v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 From 7a335e2f02fba1155b2805af3efb7257f2e9f9c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:36:26 +0000 Subject: [PATCH 097/139] Bump the npm-all group with 2 updates Bumps the npm-all group with 2 updates: [winston](https://github.com/winstonjs/winston) and [typescript](https://github.com/Microsoft/TypeScript). Updates `winston` from 3.13.0 to 3.13.1 - [Release notes](https://github.com/winstonjs/winston/releases) - [Changelog](https://github.com/winstonjs/winston/blob/master/CHANGELOG.md) - [Commits](https://github.com/winstonjs/winston/compare/v3.13.0...v3.13.1) Updates `typescript` from 5.5.2 to 5.5.3 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.5.2...v5.5.3) --- updated-dependencies: - dependency-name: winston dependency-type: direct:production update-type: version-update:semver-patch dependency-group: npm-all - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-all ... Signed-off-by: dependabot[bot] --- package-lock.json | 32 ++++++++++++++++---------------- package.json | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 246951ab3..490692f94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,14 +14,14 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.13.0" + "winston": "^3.13.1" }, "devDependencies": { "@types/cheerio": "^0.22.35", "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.5.2" + "typescript": "^5.5.3" } }, "node_modules/@colors/colors": { @@ -603,9 +603,9 @@ } }, "node_modules/typescript": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", - "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", + "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -646,15 +646,15 @@ } }, "node_modules/winston": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz", - "integrity": "sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", + "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", "async": "^3.2.3", "is-stream": "^2.0.0", - "logform": "^2.4.0", + "logform": "^2.6.0", "one-time": "^1.0.0", "readable-stream": "^3.4.0", "safe-stable-stringify": "^2.3.1", @@ -1113,9 +1113,9 @@ "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==" }, "typescript": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", - "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", + "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", "dev": true }, "universalify": { @@ -1143,15 +1143,15 @@ "integrity": "sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA==" }, "winston": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz", - "integrity": "sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", + "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", "requires": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", "async": "^3.2.3", "is-stream": "^2.0.0", - "logform": "^2.4.0", + "logform": "^2.6.0", "one-time": "^1.0.0", "readable-stream": "^3.4.0", "safe-stable-stringify": "^2.3.1", diff --git a/package.json b/package.json index b2f507902..89ab4900c 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.13.0" + "winston": "^3.13.1" }, "description": "Utilities to help boot a FoundryVTT server.", "devDependencies": { @@ -17,7 +17,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.5.2" + "typescript": "^5.5.3" }, "homepage": "https://github.com/felddy/foundryvtt-docker#readme", "keywords": [ From 415287007cdbca62c9059e1e3cb567dedb896f9b Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 22 Jul 2024 11:50:27 -0400 Subject: [PATCH 098/139] Bump FoundryVTT version to 12.329 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 26 +++++++++++++------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index f9af91482..d570d5624 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 = "12.328" + com.foundryvtt.version = "12.329" 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 = "12.328.0" + org.opencontainers.image.version = "12.329.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 v12.328.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.329.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 209aa672f..78c872d32 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 = "12.328" + com.foundryvtt.version = "12.329" 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 = "12.328.0" + org.opencontainers.image.version = "12.329.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 v12.328.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.329.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 0d6989207..937689319 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.328 +ARG FOUNDRY_VERSION=12.329 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index f8cf0cba9..d390db913 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: v12.328](https://img.shields.io/badge/release-v12.328-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/12.328) +[![FoundryVTT Release Version: v12.329](https://img.shields.io/badge/release-v12.329-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/12.329) [![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) @@ -212,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:12.328.0`| An exact image version. | -|`felddy/foundryvtt:12.328`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12.329.0`| An exact image version. | +|`felddy/foundryvtt:12.329`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:12`| 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/) | @@ -267,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-12.328.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-12.329.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.328` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.329` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.328.0 \ - --tag felddy/foundryvtt:12.328.0 \ + --build-arg VERSION=12.329.0 \ + --tag felddy/foundryvtt:12.329.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.328.0 \ + --build-arg VERSION=12.329.0 \ --output type=docker \ - --tag felddy/foundryvtt:12.328.0 . + --tag felddy/foundryvtt:12.329.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.328.0 \ - --tag felddy/foundryvtt:12.328.0 \ + --build-arg VERSION=12.329.0 \ + --tag felddy/foundryvtt:12.329.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.328.0 \ - --tag felddy/foundryvtt:12.328.0 \ + --build-arg VERSION=12.329.0 \ + --tag felddy/foundryvtt:12.329.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index 60bedf976..8496d1938 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.328 + # - FOUNDRY_VERSION=12.329 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index a924a78fc..48ff754a6 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.328.0" +__version__ = "12.329.0" From 96519d098e6d0d9b1d65892fd386c4d2d07c85cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:21:28 +0000 Subject: [PATCH 099/139] Bump typescript from 5.5.3 to 5.5.4 in the npm-all group Bumps the npm-all group with 1 update: [typescript](https://github.com/Microsoft/TypeScript). Updates `typescript` from 5.5.3 to 5.5.4 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.5.3...v5.5.4) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-all ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 490692f94..7cf5910c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.5.3" + "typescript": "^5.5.4" } }, "node_modules/@colors/colors": { @@ -603,9 +603,9 @@ } }, "node_modules/typescript": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", - "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -1113,9 +1113,9 @@ "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==" }, "typescript": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", - "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true }, "universalify": { diff --git a/package.json b/package.json index 89ab4900c..8afef969a 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.5.3" + "typescript": "^5.5.4" }, "homepage": "https://github.com/felddy/foundryvtt-docker#readme", "keywords": [ From 1a2a378a96b7eb5c3d72c74daa5e1c01ceeb6af1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 08:52:47 +0000 Subject: [PATCH 100/139] Bump pytest from 8.3.1 to 8.3.2 in the pip-all group Bumps the pip-all group with 1 update: [pytest](https://github.com/pytest-dev/pytest). Updates `pytest` from 8.3.1 to 8.3.2 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.3.1...8.3.2) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4fee55834..8e5460704 100644 --- a/setup.py +++ b/setup.py @@ -77,7 +77,7 @@ def package_vars(version_file): "coveralls == 4.0.1", "docker == 7.1.0", "pre-commit == 3.7.1", - "pytest == 8.3.1", + "pytest == 8.3.2", "pytest-cov == 5.0.0", ] }, From cbbacda73b48249b73d8a512a91f6082600de771 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 20:12:14 +0000 Subject: [PATCH 101/139] Bump the github-actions-all group across 1 directory with 2 updates Bumps the github-actions-all group with 2 updates in the / directory: [github/codeql-action](https://github.com/github/codeql-action) and [ossf/scorecard-action](https://github.com/ossf/scorecard-action). Updates `github/codeql-action` from 3.25.13 to 3.25.15 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2d790406f505036ef40ecba973cc774a50395aac...afb54ba388a7dca6ecae48f608c4ff05ff4cc77a) Updates `ossf/scorecard-action` from 2.3.3 to 2.4.0 - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/dc50aa9510b46c811795eb24b2f1ba02a914e534...62b2cac7ed8198b15735ed49ab1e5cf35480ba46) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 408f984bb..b43128813 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 + uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 + uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 + uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 7ea1a031f..569aec8ce 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -33,7 +33,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # tag=v2.3.3 + uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # tag=v2.4.0 with: results_file: results.sarif results_format: sarif @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # tag=codeql-bundle-v3.25.13 + uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 with: sarif_file: results.sarif From 8ac8a5357493684070fa637305e14079c1c7f214 Mon Sep 17 00:00:00 2001 From: Felddy Date: Fri, 26 Jul 2024 16:26:25 -0400 Subject: [PATCH 102/139] Bump FoundryVTT version to 12.330 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 26 +++++++++++++------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index d570d5624..fdae016d9 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 = "12.329" + com.foundryvtt.version = "12.330" 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 = "12.329.0" + org.opencontainers.image.version = "12.330.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 v12.329.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.330.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 78c872d32..d301899a7 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 = "12.329" + com.foundryvtt.version = "12.330" 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 = "12.329.0" + org.opencontainers.image.version = "12.330.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 v12.329.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.330.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 937689319..52760fedb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.329 +ARG FOUNDRY_VERSION=12.330 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index d390db913..c8bf7c3d8 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: v12.329](https://img.shields.io/badge/release-v12.329-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/12.329) +[![FoundryVTT Release Version: v12.330](https://img.shields.io/badge/release-v12.330-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/12.330) [![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) @@ -212,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:12.329.0`| An exact image version. | -|`felddy/foundryvtt:12.329`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12.330.0`| An exact image version. | +|`felddy/foundryvtt:12.330`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:12`| 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/) | @@ -267,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-12.329.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-12.330.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.329` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.330` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.329.0 \ - --tag felddy/foundryvtt:12.329.0 \ + --build-arg VERSION=12.330.0 \ + --tag felddy/foundryvtt:12.330.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.329.0 \ + --build-arg VERSION=12.330.0 \ --output type=docker \ - --tag felddy/foundryvtt:12.329.0 . + --tag felddy/foundryvtt:12.330.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.329.0 \ - --tag felddy/foundryvtt:12.329.0 \ + --build-arg VERSION=12.330.0 \ + --tag felddy/foundryvtt:12.330.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.329.0 \ - --tag felddy/foundryvtt:12.329.0 \ + --build-arg VERSION=12.330.0 \ + --tag felddy/foundryvtt:12.330.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index 8496d1938..5235532f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.329 + # - FOUNDRY_VERSION=12.330 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index 48ff754a6..c5d1fd3c2 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.329.0" +__version__ = "12.330.0" From 3b84d6b01b4b0fa8df39559c77e1fa2d960779ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 08:33:39 +0000 Subject: [PATCH 103/139] Bump the pip-all group with 2 updates Bumps the pip-all group with 2 updates: [setuptools](https://github.com/pypa/setuptools) and [pre-commit](https://github.com/pre-commit/pre-commit). Updates `setuptools` from 71.1.0 to 72.0.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v71.1.0...v72.0.0) Updates `pre-commit` from 3.7.1 to 3.8.0 - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v3.7.1...v3.8.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-major dependency-group: pip-all - dependency-name: pre-commit dependency-type: direct:development update-type: version-update:semver-minor dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 8e5460704..83da53275 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 71.1.0", + "setuptools == 72.0.0", "wheel == 0.43.0", ], extras_require={ @@ -76,7 +76,7 @@ def package_vars(version_file): "coverage == 7.6.0", "coveralls == 4.0.1", "docker == 7.1.0", - "pre-commit == 3.7.1", + "pre-commit == 3.8.0", "pytest == 8.3.2", "pytest-cov == 5.0.0", ] From e9c0d071e348ca80d983846fd75b8d3ae2d528e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 08:36:49 +0000 Subject: [PATCH 104/139] Bump the github-actions-all group across 1 directory with 3 updates Bumps the github-actions-all group with 3 updates in the / directory: [step-security/harden-runner](https://github.com/step-security/harden-runner), [github/codeql-action](https://github.com/github/codeql-action) and [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `step-security/harden-runner` from 2.9.0 to 2.9.1 - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/0d381219ddf674d61a7572ddd19d7941e271515c...5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde) Updates `github/codeql-action` from 3.25.15 to 3.26.1 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/afb54ba388a7dca6ecae48f608c4ff05ff4cc77a...29d86d22a34ea372b1bbf3b2dced2e25ca6b3384) Updates `actions/upload-artifact` from 4.3.4 to 4.3.6 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/0b2256b8c012f0828dc542b3febcab082c67f72b...834a144ee995460fba8ed112a2fc961b36a5ec5a) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 6 +++--- .github/workflows/scorecards.yml | 4 ++-- .github/workflows/stale-issues.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55a4ef5db..208eea7b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: egress-policy: block @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: egress-policy: block @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: egress-policy: block diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b43128813..e2a3d2a2f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 + uses: github/codeql-action/init@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 + uses: github/codeql-action/autobuild@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 + uses: github/codeql-action/analyze@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 2d5ccf8ab..6ca956127 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@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index ad5b23c3a..93b8faf37 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: egress-policy: audit # allowed-endpoints: > @@ -183,7 +183,7 @@ jobs: - name: Upload unencrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'false' - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # tag=v4.3.4 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # tag=v4.3.6 with: name: ${{ inputs.data_artifact_name }} path: data.tar.gz @@ -191,7 +191,7 @@ jobs: - name: Upload encrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'true' - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # tag=v4.3.4 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # tag=v4.3.6 with: name: ${{ inputs.data_artifact_name }} path: data.tar.7z diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 569aec8ce..c67241dc8 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -52,7 +52,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # tag=v4.3.4 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # tag=v4.3.6 with: name: SARIF file path: results.sarif @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # tag=codeql-bundle-v3.25.15 + uses: github/codeql-action/upload-sarif@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 with: sarif_file: results.sarif diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index 543ee7335..3b8495b0e 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 047b65ab6..4f1444469 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # tag=v2.9.0 + uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 From 9616e4fca5724532b855067568618ed8b7435b73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 22:41:31 +0000 Subject: [PATCH 105/139] Bump the pip-all group across 1 directory with 3 updates Bumps the pip-all group with 3 updates in the / directory: [setuptools](https://github.com/pypa/setuptools), [wheel](https://github.com/pypa/wheel) and [coverage](https://github.com/nedbat/coveragepy). Updates `setuptools` from 72.0.0 to 72.2.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v72.0.0...v72.2.0) Updates `wheel` from 0.43.0 to 0.44.0 - [Release notes](https://github.com/pypa/wheel/releases) - [Changelog](https://github.com/pypa/wheel/blob/main/docs/news.rst) - [Commits](https://github.com/pypa/wheel/compare/0.43.0...0.44.0) Updates `coverage` from 7.6.0 to 7.6.1 - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.6.0...7.6.1) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-all - dependency-name: wheel dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-all - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-patch dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 83da53275..ae6ef4511 100644 --- a/setup.py +++ b/setup.py @@ -68,12 +68,12 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 72.0.0", - "wheel == 0.43.0", + "setuptools == 72.2.0", + "wheel == 0.44.0", ], extras_require={ "test": [ - "coverage == 7.6.0", + "coverage == 7.6.1", "coveralls == 4.0.1", "docker == 7.1.0", "pre-commit == 3.8.0", From f5b0098e09a7171aef1c297b59932a3b40fa8654 Mon Sep 17 00:00:00 2001 From: Felddy Date: Thu, 15 Aug 2024 18:45:53 -0400 Subject: [PATCH 106/139] Bump cheerio dependency to version 1.0.0 --- package-lock.json | 234 ++++++++++++++++++++++++++++++++++++---------- package.json | 2 +- 2 files changed, 185 insertions(+), 51 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7cf5910c0..870b6d49c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "MIT", "dependencies": { - "cheerio": "^1.0.0-rc.12", + "cheerio": "^1.0.0", "docopt": "^0.6.2", "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", @@ -94,20 +94,25 @@ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" }, "node_modules/cheerio": { - "version": "1.0.0-rc.12", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz", - "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz", + "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==", + "license": "MIT", "dependencies": { "cheerio-select": "^2.1.0", "dom-serializer": "^2.0.0", "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "htmlparser2": "^8.0.1", - "parse5": "^7.0.0", - "parse5-htmlparser2-tree-adapter": "^7.0.0" + "domutils": "^3.1.0", + "encoding-sniffer": "^0.2.0", + "htmlparser2": "^9.1.0", + "parse5": "^7.1.2", + "parse5-htmlparser2-tree-adapter": "^7.0.0", + "parse5-parser-stream": "^7.1.2", + "undici": "^6.19.5", + "whatwg-mimetype": "^4.0.0" }, "engines": { - "node": ">= 6" + "node": ">=18.17" }, "funding": { "url": "https://github.com/cheeriojs/cheerio?sponsor=1" @@ -250,13 +255,14 @@ } }, "node_modules/domutils": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz", - "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", - "domhandler": "^5.0.1" + "domhandler": "^5.0.3" }, "funding": { "url": "https://github.com/fb55/domutils?sponsor=1" @@ -267,10 +273,24 @@ "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" }, + "node_modules/encoding-sniffer": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz", + "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==", + "license": "MIT", + "dependencies": { + "iconv-lite": "^0.6.3", + "whatwg-encoding": "^3.1.1" + }, + "funding": { + "url": "https://github.com/fb55/encoding-sniffer?sponsor=1" + } + }, "node_modules/entities": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.3.1.tgz", - "integrity": "sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -331,9 +351,9 @@ } }, "node_modules/htmlparser2": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz", - "integrity": "sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", + "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", { @@ -341,11 +361,24 @@ "url": "https://github.com/sponsors/fb55" } ], + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", - "domhandler": "^5.0.2", - "domutils": "^3.0.1", - "entities": "^4.3.0" + "domhandler": "^5.0.3", + "domutils": "^3.1.0", + "entities": "^4.5.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" } }, "node_modules/inherits": { @@ -450,11 +483,12 @@ } }, "node_modules/parse5": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.0.0.tgz", - "integrity": "sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", + "license": "MIT", "dependencies": { - "entities": "^4.3.0" + "entities": "^4.4.0" }, "funding": { "url": "https://github.com/inikulin/parse5?sponsor=1" @@ -472,6 +506,18 @@ "url": "https://github.com/inikulin/parse5?sponsor=1" } }, + "node_modules/parse5-parser-stream": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz", + "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==", + "license": "MIT", + "dependencies": { + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", @@ -535,6 +581,12 @@ "node": ">=10" } }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, "node_modules/set-cookie-parser": { "version": "2.4.8", "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.4.8.tgz", @@ -615,6 +667,15 @@ "node": ">=14.17" } }, + "node_modules/undici": { + "version": "6.19.7", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.7.tgz", + "integrity": "sha512-HR3W/bMGPSr90i8AAp2C4DM3wChFdJPLrWYpIS++LxS8K+W535qftjt+4MyjNYHeWabMj1nvtmLIi7l++iq91A==", + "license": "MIT", + "engines": { + "node": ">=18.17" + } + }, "node_modules/universalify": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", @@ -645,6 +706,27 @@ "node": ">= 8" } }, + "node_modules/whatwg-encoding": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "license": "MIT", + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/winston": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", @@ -748,17 +830,21 @@ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" }, "cheerio": { - "version": "1.0.0-rc.12", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz", - "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz", + "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==", "requires": { "cheerio-select": "^2.1.0", "dom-serializer": "^2.0.0", "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "htmlparser2": "^8.0.1", - "parse5": "^7.0.0", - "parse5-htmlparser2-tree-adapter": "^7.0.0" + "domutils": "^3.1.0", + "encoding-sniffer": "^0.2.0", + "htmlparser2": "^9.1.0", + "parse5": "^7.1.2", + "parse5-htmlparser2-tree-adapter": "^7.0.0", + "parse5-parser-stream": "^7.1.2", + "undici": "^6.19.5", + "whatwg-mimetype": "^4.0.0" } }, "cheerio-select": { @@ -865,13 +951,13 @@ } }, "domutils": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz", - "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", "requires": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", - "domhandler": "^5.0.1" + "domhandler": "^5.0.3" } }, "enabled": { @@ -879,10 +965,19 @@ "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" }, + "encoding-sniffer": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz", + "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==", + "requires": { + "iconv-lite": "^0.6.3", + "whatwg-encoding": "^3.1.1" + } + }, "entities": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.3.1.tgz", - "integrity": "sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg==" + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==" }, "fecha": { "version": "4.2.3", @@ -921,14 +1016,22 @@ } }, "htmlparser2": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz", - "integrity": "sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", + "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", "requires": { "domelementtype": "^2.3.0", - "domhandler": "^5.0.2", - "domutils": "^3.0.1", - "entities": "^4.3.0" + "domhandler": "^5.0.3", + "domutils": "^3.1.0", + "entities": "^4.5.0" + } + }, + "iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "inherits": { @@ -1001,11 +1104,11 @@ } }, "parse5": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.0.0.tgz", - "integrity": "sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", "requires": { - "entities": "^4.3.0" + "entities": "^4.4.0" } }, "parse5-htmlparser2-tree-adapter": { @@ -1017,6 +1120,14 @@ "parse5": "^7.0.0" } }, + "parse5-parser-stream": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz", + "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==", + "requires": { + "parse5": "^7.0.0" + } + }, "psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", @@ -1057,6 +1168,11 @@ "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz", "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==" }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, "set-cookie-parser": { "version": "2.4.8", "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.4.8.tgz", @@ -1118,6 +1234,11 @@ "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true }, + "undici": { + "version": "6.19.7", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.7.tgz", + "integrity": "sha512-HR3W/bMGPSr90i8AAp2C4DM3wChFdJPLrWYpIS++LxS8K+W535qftjt+4MyjNYHeWabMj1nvtmLIi7l++iq91A==" + }, "universalify": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", @@ -1142,6 +1263,19 @@ "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz", "integrity": "sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA==" }, + "whatwg-encoding": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "requires": { + "iconv-lite": "0.6.3" + } + }, + "whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==" + }, "winston": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", diff --git a/package.json b/package.json index 8afef969a..f6954c306 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "url": "https://github.com/felddy/foundryvtt-docker/issues" }, "dependencies": { - "cheerio": "^1.0.0-rc.12", + "cheerio": "^1.0.0", "docopt": "^0.6.2", "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", From a6e53ec0a2c9600925e1e1bef6ab94a6d75fee00 Mon Sep 17 00:00:00 2001 From: Felddy Date: Thu, 15 Aug 2024 18:48:59 -0400 Subject: [PATCH 107/139] Fix breaking change caused by cheerio update See: https://github.com/cheeriojs/cheerio/pull/3974 --- src/authenticate.ts | 2 +- src/get_license.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/authenticate.ts b/src/authenticate.ts index 687a9bab1..35df2e2db 100755 --- a/src/authenticate.ts +++ b/src/authenticate.ts @@ -24,7 +24,7 @@ Options: // Imports import { CookieJar, Cookie } from "tough-cookie"; import { FileCookieStore } from "tough-cookie-file-store"; -import cheerio from "cheerio"; +import * as cheerio from "cheerio"; import createLogger from "./logging.js"; import winston from "winston"; import docopt from "docopt"; diff --git a/src/get_license.ts b/src/get_license.ts index b756793be..7bda46b1c 100755 --- a/src/get_license.ts +++ b/src/get_license.ts @@ -32,7 +32,7 @@ Options: // Imports import { CookieJar } from "tough-cookie"; import { FileCookieStore } from "tough-cookie-file-store"; -import cheerio from "cheerio"; +import * as cheerio from "cheerio"; import createLogger from "./logging.js"; import docopt from "docopt"; import fetchCookie from "fetch-cookie"; From 9596ef15973c9662f0122f6ff6f023c6509c303f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 23:00:02 +0000 Subject: [PATCH 108/139] Bump winston in the npm-all group across 1 directory Bumps the npm-all group with 1 update in the / directory: [winston](https://github.com/winstonjs/winston). Updates `winston` from 3.13.1 to 3.14.2 - [Release notes](https://github.com/winstonjs/winston/releases) - [Changelog](https://github.com/winstonjs/winston/blob/master/CHANGELOG.md) - [Commits](https://github.com/winstonjs/winston/compare/v3.13.1...v3.14.2) --- updated-dependencies: - dependency-name: winston dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm-all ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 870b6d49c..d93774f94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.13.1" + "winston": "^3.14.2" }, "devDependencies": { "@types/cheerio": "^0.22.35", @@ -728,9 +728,9 @@ } }, "node_modules/winston": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", - "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.2.tgz", + "integrity": "sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg==", "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", @@ -1277,9 +1277,9 @@ "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==" }, "winston": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", - "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.2.tgz", + "integrity": "sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg==", "requires": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", diff --git a/package.json b/package.json index f6954c306..d76117c03 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.13.1" + "winston": "^3.14.2" }, "description": "Utilities to help boot a FoundryVTT server.", "devDependencies": { From cfbc5534e2b0c947092e3468f06e1399a89831f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 01:18:51 +0000 Subject: [PATCH 109/139] Bump github/codeql-action in the github-actions-all group Bumps the github-actions-all group with 1 update: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.26.1 to 3.26.2 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/29d86d22a34ea372b1bbf3b2dced2e25ca6b3384...429e1977040da7a23b6822b13c129cd1ba93dbb2) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e2a3d2a2f..6367192fa 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 + uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 + uses: github/codeql-action/autobuild@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 + uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index c67241dc8..f6ed23e4e 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # tag=codeql-bundle-v3.26.1 + uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 with: sarif_file: results.sarif From 98cd5d16bec7c235f740d1c631e9dd5d0d893476 Mon Sep 17 00:00:00 2001 From: Felddy Date: Thu, 15 Aug 2024 21:29:16 -0400 Subject: [PATCH 110/139] Bump FoundryVTT version to 12.331 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 26 +++++++++++++------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index fdae016d9..be4aaf414 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 = "12.330" + com.foundryvtt.version = "12.331" 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 = "12.330.0" + org.opencontainers.image.version = "12.331.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 v12.330.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.331.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 d301899a7..674177fa6 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 = "12.330" + com.foundryvtt.version = "12.331" 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 = "12.330.0" + org.opencontainers.image.version = "12.331.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 v12.330.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v12.331.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 52760fedb..a38870c19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.330 +ARG FOUNDRY_VERSION=12.331 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index c8bf7c3d8..80b102857 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: v12.330](https://img.shields.io/badge/release-v12.330-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/12.330) +[![FoundryVTT Release Version: v12.331](https://img.shields.io/badge/release-v12.331-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/12.331) [![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) @@ -212,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:12.330.0`| An exact image version. | -|`felddy/foundryvtt:12.330`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:12.331.0`| An exact image version. | +|`felddy/foundryvtt:12.331`| The most recent image matching the major and minor version numbers. | |`felddy/foundryvtt:12`| 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/) | @@ -267,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-12.330.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-12.331.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.330` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `12.331` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.330.0 \ - --tag felddy/foundryvtt:12.330.0 \ + --build-arg VERSION=12.331.0 \ + --tag felddy/foundryvtt:12.331.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.330.0 \ + --build-arg VERSION=12.331.0 \ --output type=docker \ - --tag felddy/foundryvtt:12.330.0 . + --tag felddy/foundryvtt:12.331.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.330.0 \ - --tag felddy/foundryvtt:12.330.0 \ + --build-arg VERSION=12.331.0 \ + --tag felddy/foundryvtt:12.331.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.330.0 \ - --tag felddy/foundryvtt:12.330.0 \ + --build-arg VERSION=12.331.0 \ + --tag felddy/foundryvtt:12.331.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index 5235532f1..ec05904b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.330 + # - FOUNDRY_VERSION=12.331 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index c5d1fd3c2..fabeb204a 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.330.0" +__version__ = "12.331.0" From 9f97274fa2d403eb6ff24e6e4c33642b48b591e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 08:29:57 +0000 Subject: [PATCH 111/139] Bump github/codeql-action Bumps the github-actions-all group with 1 update in the / directory: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.26.2 to 3.26.5 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/429e1977040da7a23b6822b13c129cd1ba93dbb2...2c779ab0d087cd7fe7b826087247c2c81f27bfa6) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6367192fa..a5e4dd278 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 + uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 + uses: github/codeql-action/autobuild@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 + uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index f6ed23e4e..c875821a1 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # tag=codeql-bundle-v3.26.2 + uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 with: sarif_file: results.sarif From 69bcd01dbfa9b62104960310ce77f1bcb82a4ef2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:10:42 +0000 Subject: [PATCH 112/139] Bump setuptools in the pip-all group across 1 directory Bumps the pip-all group with 1 update in the / directory: [setuptools](https://github.com/pypa/setuptools). Updates `setuptools` from 72.2.0 to 74.0.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v72.2.0...v74.0.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-major dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ae6ef4511..f859baa08 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 72.2.0", + "setuptools == 74.0.0", "wheel == 0.44.0", ], extras_require={ From 494ba87f6b8a631693f05fbc1ba39d3a53806152 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 08:18:14 +0000 Subject: [PATCH 113/139] Bump setuptools in the pip-all group across 1 directory Bumps the pip-all group with 1 update in the / directory: [setuptools](https://github.com/pypa/setuptools). Updates `setuptools` from 74.0.0 to 74.1.2 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v74.0.0...v74.1.2) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f859baa08..437256327 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 74.0.0", + "setuptools == 74.1.2", "wheel == 0.44.0", ], extras_require={ From e83cd56e342d9c606e90047b105c380b703f431e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 08:51:33 +0000 Subject: [PATCH 114/139] Bump the github-actions-all group across 1 directory with 3 updates Bumps the github-actions-all group with 3 updates in the / directory: [github/codeql-action](https://github.com/github/codeql-action), [actions/setup-python](https://github.com/actions/setup-python) and [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `github/codeql-action` from 3.26.5 to 3.26.6 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2c779ab0d087cd7fe7b826087247c2c81f27bfa6...4dd16135b69a43b6c8efb853346f8437d92d3c93) Updates `actions/setup-python` from 5.1.1 to 5.2.0 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/39cd14951b08e74b54015e9e001cdefcf80e669f...f677139bbe7f9c59b41e40162b753c062f5d49a3) Updates `actions/upload-artifact` from 4.3.6 to 4.4.0 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/834a144ee995460fba8ed112a2fc961b36a5ec5a...50769540e7f4bd5e21e526ee35c689e35e0d6874) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/docker-pytest-image.yml | 6 +++--- .github/workflows/scorecards.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a5e4dd278..b6fb583e6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 + uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 + uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 + uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 93b8faf37..e3599fb46 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -110,7 +110,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 - id: setup-python - uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # tag=v5.1.1 + uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # tag=v5.2.0 with: python-version: ${{ inputs.python_version }} @@ -183,7 +183,7 @@ jobs: - name: Upload unencrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'false' - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # tag=v4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # tag=v4.4.0 with: name: ${{ inputs.data_artifact_name }} path: data.tar.gz @@ -191,7 +191,7 @@ jobs: - name: Upload encrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'true' - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # tag=v4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # tag=v4.4.0 with: name: ${{ inputs.data_artifact_name }} path: data.tar.7z diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index c875821a1..77d5f7368 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -52,7 +52,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # tag=v4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # tag=v4.4.0 with: name: SARIF file path: results.sarif @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # tag=codeql-bundle-v3.26.5 + uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 with: sarif_file: results.sarif From 46707b23e8a1b53e7daf7dae23af4acd9dabae06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 11:10:05 +0000 Subject: [PATCH 115/139] Bump typescript from 5.5.4 to 5.6.2 in the npm-all group Bumps the npm-all group with 1 update: [typescript](https://github.com/microsoft/TypeScript). Updates `typescript` from 5.5.4 to 5.6.2 - [Release notes](https://github.com/microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/microsoft/TypeScript/compare/v5.5.4...v5.6.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-all ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index d93774f94..16e5ea354 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.5.4" + "typescript": "^5.6.2" } }, "node_modules/@colors/colors": { @@ -655,9 +655,9 @@ } }, "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -1229,9 +1229,9 @@ "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==" }, "typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "dev": true }, "undici": { diff --git a/package.json b/package.json index d76117c03..bff450c42 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.5.4" + "typescript": "^5.6.2" }, "homepage": "https://github.com/felddy/foundryvtt-docker#readme", "keywords": [ From aff35faca5d514fb2ae576c13c4cd4ee7d7a4df9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 08:10:47 +0000 Subject: [PATCH 116/139] Bump step-security/harden-runner in the github-actions-all group Bumps the github-actions-all group with 1 update: [step-security/harden-runner](https://github.com/step-security/harden-runner). Updates `step-security/harden-runner` from 2.9.1 to 2.10.1 - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde...91182cccc01eb5e619899d80e4e971d6181294a7) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 2 +- .github/workflows/stale-issues.yml | 2 +- .github/workflows/sync-labels.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 208eea7b0..f6142cdd3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: block @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: block @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: block diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b6fb583e6..a7417f500 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 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 6ca956127..2fbafd5e6 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@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index e3599fb46..b45f6729a 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: audit # allowed-endpoints: > diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index 3b8495b0e..0170f2dc4 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 4f1444469..88f44cb74 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # tag=v2.9.1 + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 From dbf99abf52cfdd7caeaad12182477d2dc33742e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 08:22:30 +0000 Subject: [PATCH 117/139] Bump the pip-all group across 1 directory with 4 updates Bumps the pip-all group with 4 updates in the / directory: [setuptools](https://github.com/pypa/setuptools), [coverage](https://github.com/nedbat/coveragepy), [pre-commit](https://github.com/pre-commit/pre-commit) and [pytest](https://github.com/pytest-dev/pytest). Updates `setuptools` from 74.1.2 to 75.2.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v74.1.2...v75.2.0) Updates `coverage` from 7.6.1 to 7.6.4 - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.6.1...7.6.4) Updates `pre-commit` from 3.8.0 to 4.0.1 - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v3.8.0...v4.0.1) Updates `pytest` from 8.3.2 to 8.3.3 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.3.2...8.3.3) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-major dependency-group: pip-all - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-patch dependency-group: pip-all - dependency-name: pre-commit dependency-type: direct:development update-type: version-update:semver-major dependency-group: pip-all - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 437256327..8f13340f8 100644 --- a/setup.py +++ b/setup.py @@ -68,16 +68,16 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 74.1.2", + "setuptools == 75.2.0", "wheel == 0.44.0", ], extras_require={ "test": [ - "coverage == 7.6.1", + "coverage == 7.6.4", "coveralls == 4.0.1", "docker == 7.1.0", - "pre-commit == 3.8.0", - "pytest == 8.3.2", + "pre-commit == 4.0.1", + "pytest == 8.3.3", "pytest-cov == 5.0.0", ] }, From 115b81fdc413b87349c00d5e838aabf7aaf403b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 18:17:58 +0000 Subject: [PATCH 118/139] Bump the github-actions-all group across 1 directory with 4 updates Bumps the github-actions-all group with 4 updates in the / directory: [actions/checkout](https://github.com/actions/checkout), [github/codeql-action](https://github.com/github/codeql-action), [actions/cache](https://github.com/actions/cache) and [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/checkout` from 4.1.7 to 4.2.1 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871) Updates `github/codeql-action` from 3.26.6 to 3.26.13 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/4dd16135b69a43b6c8efb853346f8437d92d3c93...f779452ac5af1c261dce0346a8f964149f49322b) Updates `actions/cache` from 4.0.2 to 4.1.1 - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/0c45773b623bea8c8e75f6c82b208c3cf94ea4f9...3624ceb22c1c5a301c8db4169662070a689d9ea8) Updates `actions/upload-artifact` from 4.4.0 to 4.4.3 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/50769540e7f4bd5e21e526ee35c689e35e0d6874...b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/dependency-review.yml | 2 +- .github/workflows/docker-pytest-image.yml | 8 ++++---- .github/workflows/scorecards.yml | 6 +++--- .github/workflows/sync-labels.yml | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a7417f500..2bad79070 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,11 +50,11 @@ jobs: egress-policy: audit - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 + uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 + uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 + uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 2fbafd5e6..c21adc8a2 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -16,6 +16,6 @@ jobs: with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 - name: 'Dependency Review' uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # tag=v4.3.4 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index b45f6729a..721b68fbe 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -108,14 +108,14 @@ jobs: echo "do_decryption=false" >> $GITHUB_OUTPUT fi - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 - id: setup-python uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # tag=v5.2.0 with: python-version: ${{ inputs.python_version }} - name: Cache testing environments - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # tag=v4.0.2 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # tag=v4.1.1 env: BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\ py${{ steps.setup-python.outputs.python-version }}-" @@ -183,7 +183,7 @@ jobs: - name: Upload unencrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'false' - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # tag=v4.4.0 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # tag=v4.4.3 with: name: ${{ inputs.data_artifact_name }} path: data.tar.gz @@ -191,7 +191,7 @@ jobs: - name: Upload encrypted data artifacts if: ( success() || failure() ) && steps.check_data_archive_key.outputs.do_encryption == 'true' - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # tag=v4.4.0 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # tag=v4.4.3 with: name: ${{ inputs.data_artifact_name }} path: data.tar.7z diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 77d5f7368..c8f2ca7a7 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -28,7 +28,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 with: persist-credentials: false @@ -52,7 +52,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # tag=v4.4.0 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # tag=v4.4.3 with: name: SARIF file path: results.sarif @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=codeql-bundle-v3.26.6 + uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 with: sarif_file: results.sarif diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 88f44cb74..73264512c 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -23,7 +23,7 @@ jobs: uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 - name: Sync repository labels if: success() uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b # tag=v5.0.0 From acc32395289f01f6621fd5b5fe7904eaf721e940 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 18:27:23 +0000 Subject: [PATCH 119/139] Bump the npm-all group across 1 directory with 2 updates Bumps the npm-all group with 2 updates in the / directory: [winston](https://github.com/winstonjs/winston) and [typescript](https://github.com/microsoft/TypeScript). Updates `winston` from 3.14.2 to 3.15.0 - [Release notes](https://github.com/winstonjs/winston/releases) - [Changelog](https://github.com/winstonjs/winston/blob/master/CHANGELOG.md) - [Commits](https://github.com/winstonjs/winston/compare/v3.14.2...v3.15.0) Updates `typescript` from 5.6.2 to 5.6.3 - [Release notes](https://github.com/microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/microsoft/TypeScript/compare/v5.6.2...v5.6.3) --- updated-dependencies: - dependency-name: winston dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm-all - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-all ... Signed-off-by: dependabot[bot] --- package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 16e5ea354..61f07a3b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,14 +14,14 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.14.2" + "winston": "^3.15.0" }, "devDependencies": { "@types/cheerio": "^0.22.35", "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.6.2" + "typescript": "^5.6.3" } }, "node_modules/@colors/colors": { @@ -655,9 +655,9 @@ } }, "node_modules/typescript": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", - "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -728,9 +728,9 @@ } }, "node_modules/winston": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.2.tgz", - "integrity": "sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg==", + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.15.0.tgz", + "integrity": "sha512-RhruH2Cj0bV0WgNL+lOfoUBI4DVfdUNjVnJGVovWZmrcKtrFTTRzgXYK2O9cymSGjrERCtaAeHwMNnUWXlwZow==", "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", @@ -1229,9 +1229,9 @@ "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==" }, "typescript": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", - "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true }, "undici": { @@ -1277,9 +1277,9 @@ "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==" }, "winston": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.2.tgz", - "integrity": "sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg==", + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.15.0.tgz", + "integrity": "sha512-RhruH2Cj0bV0WgNL+lOfoUBI4DVfdUNjVnJGVovWZmrcKtrFTTRzgXYK2O9cymSGjrERCtaAeHwMNnUWXlwZow==", "requires": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", diff --git a/package.json b/package.json index bff450c42..d05380318 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "fetch-cookie": "^3.0.1", "node-fetch": "^3.3.2", "tough-cookie-file-store": "^2.0.3", - "winston": "^3.14.2" + "winston": "^3.15.0" }, "description": "Utilities to help boot a FoundryVTT server.", "devDependencies": { @@ -17,7 +17,7 @@ "@types/docopt": "^0.6.37", "@types/tough-cookie": "^4.0.5", "@types/tough-cookie-file-store": "^2.0.4", - "typescript": "^5.6.2" + "typescript": "^5.6.3" }, "homepage": "https://github.com/felddy/foundryvtt-docker#readme", "keywords": [ From d6756230fef3821f920ac8c5cb53457caa35f4e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 08:42:27 +0000 Subject: [PATCH 120/139] Bump the github-actions-all group across 1 directory with 6 updates Bumps the github-actions-all group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [actions/checkout](https://github.com/actions/checkout) | `4.2.1` | `4.2.2` | | [github/codeql-action](https://github.com/github/codeql-action) | `3.26.13` | `3.27.0` | | [actions/dependency-review-action](https://github.com/actions/dependency-review-action) | `4.3.4` | `4.4.0` | | [actions/setup-python](https://github.com/actions/setup-python) | `5.2.0` | `5.3.0` | | [actions/cache](https://github.com/actions/cache) | `4.1.1` | `4.1.2` | | [crazy-max/ghaction-github-labeler](https://github.com/crazy-max/ghaction-github-labeler) | `5.0.0` | `5.1.0` | Updates `actions/checkout` from 4.2.1 to 4.2.2 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871...11bd71901bbe5b1630ceea73d27597364c9af683) Updates `github/codeql-action` from 3.26.13 to 3.27.0 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/f779452ac5af1c261dce0346a8f964149f49322b...662472033e021d55d94146f66f6058822b0b39fd) Updates `actions/dependency-review-action` from 4.3.4 to 4.4.0 - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/5a2ce3f5b92ee19cbb1541a4984c76d921601d7c...4081bf99e2866ebe428fc0477b69eb4fcda7220a) Updates `actions/setup-python` from 5.2.0 to 5.3.0 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/f677139bbe7f9c59b41e40162b753c062f5d49a3...0b93645e9fea7318ecaed2b359559ac225c90a2b) Updates `actions/cache` from 4.1.1 to 4.1.2 - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/3624ceb22c1c5a301c8db4169662070a689d9ea8...6849a6489940f00c2f30c0fb92c6274307ccb58a) Updates `crazy-max/ghaction-github-labeler` from 5.0.0 to 5.1.0 - [Release notes](https://github.com/crazy-max/ghaction-github-labeler/releases) - [Commits](https://github.com/crazy-max/ghaction-github-labeler/compare/de749cf181958193cb7debf1a9c5bb28922f3e1b...b54af0c25861143e7c8813d7cbbf46d2c341680c) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-all - dependency-name: crazy-max/ghaction-github-labeler dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-all ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/dependency-review.yml | 4 ++-- .github/workflows/docker-pytest-image.yml | 6 +++--- .github/workflows/scorecards.yml | 4 ++-- .github/workflows/sync-labels.yml | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2bad79070..982a85655 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,11 +50,11 @@ jobs: egress-policy: audit - name: Checkout repository - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 + uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # tag=codeql-bundle-v3.27.0 with: languages: ${{ matrix.language }} @@ -62,7 +62,7 @@ jobs: # Java). If this step fails, then you should remove it and run the build # manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 + uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # tag=codeql-bundle-v3.27.0 # ℹī¸ Command-line programs to run using the OS shell. 📚 # https://git.io/JvXDl @@ -76,4 +76,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 + uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # tag=codeql-bundle-v3.27.0 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index c21adc8a2..1587b9454 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -16,6 +16,6 @@ jobs: with: # TODO: change to 'egress-policy: block' after couple of runs egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2 - name: 'Dependency Review' - uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # tag=v4.3.4 + uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # tag=v4.4.0 diff --git a/.github/workflows/docker-pytest-image.yml b/.github/workflows/docker-pytest-image.yml index 721b68fbe..4a9474a3a 100644 --- a/.github/workflows/docker-pytest-image.yml +++ b/.github/workflows/docker-pytest-image.yml @@ -108,14 +108,14 @@ jobs: echo "do_decryption=false" >> $GITHUB_OUTPUT fi - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2 - id: setup-python - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # tag=v5.2.0 + uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # tag=v5.3.0 with: python-version: ${{ inputs.python_version }} - name: Cache testing environments - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # tag=v4.1.1 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # tag=v4.1.2 env: BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\ py${{ steps.setup-python.outputs.python-version }}-" diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index c8f2ca7a7..29402f0be 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -28,7 +28,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2 with: persist-credentials: false @@ -60,6 +60,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # tag=codeql-bundle-v3.26.13 + uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # tag=codeql-bundle-v3.27.0 with: sarif_file: results.sarif diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 73264512c..f796b3da5 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -23,10 +23,10 @@ jobs: uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # tag=v2.10.1 with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4.2.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2 - name: Sync repository labels if: success() - uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b # tag=v5.0.0 + uses: crazy-max/ghaction-github-labeler@b54af0c25861143e7c8813d7cbbf46d2c341680c # tag=v5.1.0 with: # This is a hideous ternary equivalent so we only do a dry run unless # this workflow is triggered by the develop branch. From 3261498ddd119033a1dc271b2e8f196800e3185b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 17:20:25 +0000 Subject: [PATCH 121/139] Bump the pip-all group with 2 updates Bumps the pip-all group with 2 updates: [setuptools](https://github.com/pypa/setuptools) and [pytest-cov](https://github.com/pytest-dev/pytest-cov). Updates `setuptools` from 75.2.0 to 75.3.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v75.2.0...v75.3.0) Updates `pytest-cov` from 5.0.0 to 6.0.0 - [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-cov/compare/v5.0.0...v6.0.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pip-all - dependency-name: pytest-cov dependency-type: direct:development update-type: version-update:semver-major dependency-group: pip-all ... Signed-off-by: dependabot[bot] --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 8f13340f8..076bb59d9 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def package_vars(version_file): py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")], install_requires=[ "semver == 3.0.2", - "setuptools == 75.2.0", + "setuptools == 75.3.0", "wheel == 0.44.0", ], extras_require={ @@ -78,7 +78,7 @@ def package_vars(version_file): "docker == 7.1.0", "pre-commit == 4.0.1", "pytest == 8.3.3", - "pytest-cov == 5.0.0", + "pytest-cov == 6.0.0", ] }, ) From d7fe42d0fcfc2b1f81e148c11f90c1d3ae49776b Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 21 Oct 2024 16:07:35 -0400 Subject: [PATCH 122/139] Bump FoundryVTT version to 13.332 --- .github/ISSUE_TEMPLATE/bug.yml | 6 +++--- .github/ISSUE_TEMPLATE/regression.yml | 6 +++--- Dockerfile | 2 +- README.md | 28 +++++++++++++-------------- docker-compose.yml | 2 +- src/_version.py | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index be4aaf414..b86c2be84 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 = "12.331" + com.foundryvtt.version = "13.332" 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 = "12.331.0" + org.opencontainers.image.version = "13.332.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 v12.331.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v13.332.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 674177fa6..96d1e6641 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 = "12.331" + com.foundryvtt.version = "13.332" 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 = "12.331.0" + org.opencontainers.image.version = "13.332.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 v12.331.0 + foundry_1 | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v13.332.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 a38870c19..138dc6791 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME -ARG FOUNDRY_VERSION=12.331 +ARG FOUNDRY_VERSION=13.332 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION diff --git a/README.md b/README.md index 80b102857..a609eb107 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: v12.331](https://img.shields.io/badge/release-v12.331-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/12.331) +[![FoundryVTT Release Version: v13.332](https://img.shields.io/badge/release-v13.332-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/13.332) [![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) @@ -212,9 +212,9 @@ 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:12.331.0`| An exact image version. | -|`felddy/foundryvtt:12.331`| The most recent image matching the major and minor version numbers. | -|`felddy/foundryvtt:12`| The most recent image matching the major version number. | +|`felddy/foundryvtt:13.332.0`| An exact image version. | +|`felddy/foundryvtt:13.332`| The most recent image matching the major and minor version numbers. | +|`felddy/foundryvtt:13`| 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/) | See the [tags tab](https://hub.docker.com/r/felddy/foundryvtt/tags) on Docker @@ -267,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-12.331.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-13.332.zip`| `/data/container_cache` | | `CONTAINER_CACHE_SIZE` | Set the maximum number of distribution versions to keep in the cache. The minimum is `1`. When the limit is exceeded, the oldest versions (lowest version numbers) are removed first. Unset to disable cache size management and keep all versions. | | | `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!** | | @@ -299,7 +299,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. | `12.331` | +| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `13.332` | | `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` | @@ -334,8 +334,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=12.331.0 \ - --tag felddy/foundryvtt:12.331.0 \ + --build-arg VERSION=13.332.0 \ + --tag felddy/foundryvtt:13.332.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -358,9 +358,9 @@ Docker: ```console docker buildx build \ --platform linux/amd64 \ - --build-arg VERSION=12.331.0 \ + --build-arg VERSION=13.332.0 \ --output type=docker \ - --tag felddy/foundryvtt:12.331.0 . + --tag felddy/foundryvtt:13.332.0 . ``` ## Pre-installed distribution builds ## @@ -378,8 +378,8 @@ Build the image with credentials: docker build \ --build-arg FOUNDRY_USERNAME='' \ --build-arg FOUNDRY_PASSWORD='' \ - --build-arg VERSION=12.331.0 \ - --tag felddy/foundryvtt:12.331.0 \ + --build-arg VERSION=13.332.0 \ + --tag felddy/foundryvtt:13.332.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` @@ -388,8 +388,8 @@ Or build the image using a temporary URL: ```console docker build \ --build-arg FOUNDRY_RELEASE_URL='' \ - --build-arg VERSION=12.331.0 \ - --tag felddy/foundryvtt:12.331.0 \ + --build-arg VERSION=13.332.0 \ + --tag felddy/foundryvtt:13.332.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` diff --git a/docker-compose.yml b/docker-compose.yml index ec05904b7..0706dd9da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: # - FOUNDRY_UID=foundry # - FOUNDRY_UPNP=false # - FOUNDRY_UPNP_LEASE_DURATION= - # - FOUNDRY_VERSION=12.331 + # - FOUNDRY_VERSION=13.332 # - FOUNDRY_WORLD= # - TIMEZONE=US/Eastern ports: diff --git a/src/_version.py b/src/_version.py index fabeb204a..e32408143 100644 --- a/src/_version.py +++ b/src/_version.py @@ -1,3 +1,3 @@ """This file defines the version of this module.""" -__version__ = "12.331.0" +__version__ = "13.332.0" From 13cac7698184edeb737accf9b3d2065cd0f8f996 Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 21 Oct 2024 19:03:40 -0400 Subject: [PATCH 123/139] Fix linter warnings --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 138dc6791..2224ebc7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG FOUNDRY_VERSION=13.332 ARG NODE_IMAGE_VERSION=18-alpine3.18 ARG VERSION -FROM node:${NODE_IMAGE_VERSION} as compile-typescript-stage +FROM node:${NODE_IMAGE_VERSION} AS compile-typescript-stage WORKDIR /root @@ -19,9 +19,8 @@ COPY /src/*.ts src/ RUN tsc RUN grep -l "#!" dist/*.js | xargs chmod a+x -FROM node:${NODE_IMAGE_VERSION} as optional-release-stage +FROM node:${NODE_IMAGE_VERSION} AS optional-release-stage -ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_USERNAME ARG FOUNDRY_VERSION @@ -49,7 +48,7 @@ RUN \ unzip -d dist ${ARCHIVE} 'resources/*'; \ fi -FROM node:${NODE_IMAGE_VERSION} as final-stage +FROM node:${NODE_IMAGE_VERSION} AS final-stage ARG FOUNDRY_UID=421 ARG FOUNDRY_VERSION From 5c968cbbe8aa5c63b2893c590d413382d1163cc6 Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 21 Oct 2024 19:04:55 -0400 Subject: [PATCH 124/139] Convert to Debian and improve credentials - Convert the image to use a Debian base image. - Rework how credentials are passed into the build using new mounted secrets. --- Dockerfile | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2224ebc7c..e1fb0ad30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,6 @@ -ARG FOUNDRY_PASSWORD ARG FOUNDRY_RELEASE_URL -ARG FOUNDRY_USERNAME ARG FOUNDRY_VERSION=13.332 -ARG NODE_IMAGE_VERSION=18-alpine3.18 +ARG NODE_IMAGE_VERSION=20-bookworm-slim ARG VERSION FROM node:${NODE_IMAGE_VERSION} AS compile-typescript-stage @@ -22,7 +20,6 @@ RUN grep -l "#!" dist/*.js | xargs chmod a+x FROM node:${NODE_IMAGE_VERSION} AS optional-release-stage ARG FOUNDRY_RELEASE_URL -ARG FOUNDRY_USERNAME ARG FOUNDRY_VERSION ENV ARCHIVE="foundryvtt-${FOUNDRY_VERSION}.zip" @@ -36,15 +33,28 @@ COPY --from=compile-typescript-stage \ ./ # .placeholder file to mitigate https://github.com/moby/moby/issues/37965 RUN mkdir dist && touch dist/.placeholder -RUN \ +RUN --mount=type=secret,id=foundry_credentials,required=false \ + npm install classic-level && \ + if [ -f /run/secrets/foundry_credentials ]; then \ + # Extract credentials from JSON + apt-get update && apt-get install -y jq && \ + FOUNDRY_USERNAME=$(jq -r '.foundry_username // empty' /run/secrets/foundry_credentials) && \ + FOUNDRY_PASSWORD=$(jq -r '.foundry_password // empty' /run/secrets/foundry_credentials); \ + fi && \ if [ -n "${FOUNDRY_USERNAME}" ] && [ -n "${FOUNDRY_PASSWORD}" ]; then \ - npm install && \ + # Authenticate using credentials and get the pre-signed URL ./authenticate.js "${FOUNDRY_USERNAME}" "${FOUNDRY_PASSWORD}" cookiejar.json && \ presigned_url=$(./get_release_url.js --retry 5 cookiejar.json "${FOUNDRY_VERSION}") && \ - wget -O ${ARCHIVE} "${presigned_url}" && \ - unzip -d dist ${ARCHIVE} 'resources/*'; \ + DOWNLOAD_URL="${presigned_url}"; \ elif [ -n "${FOUNDRY_RELEASE_URL}" ]; then \ - wget -O ${ARCHIVE} "${FOUNDRY_RELEASE_URL}" && \ + # Use pre-signed URL + DOWNLOAD_URL="${FOUNDRY_RELEASE_URL}"; \ + else \ + echo "No valid credentials or pre-signed URL provided. Skipping pre-installation."; \ + fi && \ + if [ -n "${DOWNLOAD_URL}" ]; then \ + apt-get install -y unzip wget && \ + wget -O ${ARCHIVE} "${DOWNLOAD_URL}" && \ unzip -d dist ${ARCHIVE} 'resources/*'; \ fi @@ -76,13 +86,15 @@ COPY \ ./ RUN addgroup --system --gid ${FOUNDRY_UID} foundry \ && adduser --system --uid ${FOUNDRY_UID} --ingroup foundry foundry \ - && apk --update --no-cache add \ + && apt-get update && apt-get install -y \ curl \ file \ + gosu \ jq \ sed \ - su-exec \ tzdata \ + unzip \ + && rm -rf /var/lib/apt/lists/* \ && npm install && echo ${VERSION} > image_version.txt VOLUME ["/data"] From b8cf467631d90b953a227c729f1d199db57daaeb Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 21 Oct 2024 21:37:27 -0400 Subject: [PATCH 125/139] Move coveralls pin to PR sha temporarily This should be reverted once: https://github.com/TheKevJames/coveralls-python/pull/542 is merged. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 076bb59d9..54562a5f7 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,8 @@ def package_vars(version_file): extras_require={ "test": [ "coverage == 7.6.4", - "coveralls == 4.0.1", + # TODO: Revert to pinned once https://github.com/TheKevJames/coveralls-python/pull/542 is merged + "coveralls @ git+https://github.com/terop/coveralls-python.git@7fb2b536b04f61bb6a73ae5572a17e723459756d", "docker == 7.1.0", "pre-commit == 4.0.1", "pytest == 8.3.3", From b10eca8d10da94f1851c1c7203eb8afef9d6d216 Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 21 Oct 2024 21:40:30 -0400 Subject: [PATCH 126/139] Convert shell from dash to bash --- src/check_health.sh | 4 +--- src/entrypoint.sh | 17 +++++++---------- src/launcher.sh | 12 ++---------- src/logging.sh | 5 +---- 4 files changed, 11 insertions(+), 27 deletions(-) diff --git a/src/check_health.sh b/src/check_health.sh index 6ad5f44d0..f34217f46 100755 --- a/src/check_health.sh +++ b/src/check_health.sh @@ -1,6 +1,4 @@ -#!/bin/sh -# shellcheck disable=SC3010 -# SC3010 - busybox supports [[ ]] +#!/bin/bash if [[ "${FOUNDRY_SSL_CERT:-}" && "${FOUNDRY_SSL_KEY:-}" ]]; then protocol="https" diff --git a/src/entrypoint.sh b/src/entrypoint.sh index 5a4cae868..7c1a768af 100755 --- a/src/entrypoint.sh +++ b/src/entrypoint.sh @@ -1,13 +1,7 @@ -#!/bin/sh -# shellcheck disable=SC3010,SC3046,SC3051 -# SC3010 - busybox supports [[ ]] -# SC3046 - busybox supports source command -# SC3051 - busybox supports source command +#!/bin/bash set -o nounset set -o errexit -# shellcheck disable=SC3040 -# pipefail is supported by busybox set -o pipefail CONFIG_DIR="/data/Config" @@ -263,8 +257,11 @@ if [ $install_required = true ]; then log "Using CONTAINER_PATCHES: ${CONTAINER_PATCHES}" if [ -d "${CONTAINER_PATCHES}" ]; then log "Container patches directory detected. Starting patch application..." - for f in "${CONTAINER_PATCHES}"/*; do - [ -f "$f" ] || continue # we can't set nullglob in busybox + shopt -s nullglob # if the directory is empty we want an empty array + patch_files=("${CONTAINER_PATCHES}"/*) + shopt -u nullglob + for f in "${patch_files[@]}"; do + [ -f "$f" ] || continue # skip non-files log "Sourcing patch from file: $f" # shellcheck disable=SC1090 source "$f" @@ -343,7 +340,7 @@ export CONTAINER_PRESERVE_CONFIG FOUNDRY_ADMIN_KEY FOUNDRY_AWS_CONFIG \ FOUNDRY_UPNP_LEASE_DURATION FOUNDRY_WORLD # set the TERM signal handler trap handle_sigterm TERM -su-exec "${FOUNDRY_UID}:${FOUNDRY_GID}" ./launcher.sh "$@" & +gosu "${FOUNDRY_UID}:${FOUNDRY_GID}" ./launcher.sh "$@" & child_pid=$! log_debug "Waiting for child pid: ${child_pid} to exit." wait "$child_pid" diff --git a/src/launcher.sh b/src/launcher.sh index 6854360b5..f09187b30 100755 --- a/src/launcher.sh +++ b/src/launcher.sh @@ -1,15 +1,7 @@ -#!/bin/sh -# shellcheck disable=SC3001,SC3010,SC3021,SC3046,SC3051 -# SC3001 - busybox supports process substitution -# SC3010 - busybox supports [[ ]] -# SC3021 - busybox supports >& -# SC3046 - busybox supports source command -# SC3051 - busybox supports source command +#!/bin/bash set -o nounset set -o errexit -# shellcheck disable=SC3040 -# pipefail is supported by busybox set -o pipefail CONFIG_DIR="/data/Config" @@ -79,4 +71,4 @@ done < <(env -0) log "Starting Foundry Virtual Tabletop." # We want ENV_VAR_CARRY_LIST to word split # shellcheck disable=SC2086 -exec env -i $ENV_VAR_CARRY_LIST node "$@" || log_error "Exec failed with code $?" +exec env -i $ENV_VAR_CARRY_LIST /usr/local/bin/node "$@" || log_error "Exec failed with code $?" diff --git a/src/logging.sh b/src/logging.sh index b25ddf869..b00b73539 100644 --- a/src/logging.sh +++ b/src/logging.sh @@ -1,7 +1,4 @@ -#!/bin/sh -# shellcheck disable=SC3010,SC3037 -# SC3010 - busybox supports [[ ]] -# SC3037 - busybox echo supports flags +#!/bin/bash # Define terminal colors for use in logger functions BLUE="\e[34m" From b4a00376373ec6bba0b21429f7ca8114ccd8c62f Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 21 Oct 2024 22:25:52 -0400 Subject: [PATCH 127/139] Upgrade pre-commit hooks from cisagov --- .pre-commit-config.yaml | 125 ++++++++++++++++++++++++++++++---------- 1 file changed, 96 insertions(+), 29 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5828261c4..ea23554bf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ default_language_version: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.6.0 hooks: - id: check-case-conflict - id: check-executables-have-shebangs @@ -32,17 +32,24 @@ repos: # Text file hooks - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.33.0 + rev: v0.41.0 hooks: - id: markdownlint args: - --config=.mdl_config.yaml - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0-alpha.4 + # This is the last version of v3 available from the mirror. We should hold + # here until v4, which is currently in alpha, is more stable. + rev: v3.1.0 hooks: - id: prettier + # This is the latest version of v3 available from NPM. The pre-commit + # mirror does not pull tags for old major versions once a new major + # version tag is published. + additional_dependencies: + - prettier@3.3.1 - repo: https://github.com/adrienverge/yamllint - rev: v1.29.0 + rev: v1.35.1 hooks: - id: yamllint args: @@ -50,42 +57,75 @@ repos: # GitHub Actions hooks - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.21.0 + rev: 0.28.4 hooks: - id: check-github-actions - id: check-github-workflows # pre-commit hooks - repo: https://github.com/pre-commit/pre-commit - rev: v3.0.4 + rev: v3.7.1 hooks: - id: validate_manifest + # Go hooks + - repo: https://github.com/TekWizely/pre-commit-golang + rev: v1.0.0-rc.1 + hooks: + # Style Checkers + - id: go-critic + # StaticCheck + - id: go-staticcheck-repo-mod + # Go Build + - id: go-build-repo-mod + # Go Mod Tidy + - id: go-mod-tidy-repo + # Go Test + - id: go-test-repo-mod + # Go Vet + - id: go-vet-repo-mod + # GoSec + - id: go-sec-repo-mod + # goimports + - id: go-imports-repo + args: + # Write changes to files + - -w + # Nix hooks + - repo: https://github.com/nix-community/nixpkgs-fmt + rev: v1.3.0 + hooks: + - id: nixpkgs-fmt + # Shell script hooks - - repo: https://github.com/cisagov/pre-commit-shfmt - rev: v0.0.2 + - repo: https://github.com/scop/pre-commit-shfmt + rev: v3.8.0-1 hooks: - id: shfmt args: + # List files that will be formatted + - --list + # Write result to file instead of stdout + - --write # Indent by two spaces - - -i - - '2' + - --indent + - "2" # Binary operators may start a line - - -bn + - --binary-next-line # Switch cases are indented - - -ci + - --case-indent # Redirect operators are followed by a space - - -sr - - repo: https://github.com/detailyang/pre-commit-shell - rev: 1.0.5 + - --space-redirects + - repo: https://github.com/shellcheck-py/shellcheck-py + rev: v0.10.0.1 hooks: - - id: shell-lint + - id: shellcheck args: [-x] # Python hooks # Run bandit on the "tests" tree with a configuration - repo: https://github.com/PyCQA/bandit - rev: 1.7.4 + rev: 1.7.8 hooks: - id: bandit name: bandit (tests tree) @@ -94,50 +134,77 @@ repos: - --config=.bandit.yml # Run bandit on everything except the "tests" tree - repo: https://github.com/PyCQA/bandit - rev: 1.7.4 + rev: 1.7.8 hooks: - id: bandit name: bandit (everything else) exclude: tests - - repo: https://github.com/psf/black - rev: 23.1.0 + - repo: https://github.com/psf/black-pre-commit-mirror + rev: 24.4.2 hooks: - id: black - repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 + rev: 7.0.0 hooks: - id: flake8 additional_dependencies: - flake8-docstrings - repo: https://github.com/PyCQA/isort - rev: 5.12.0 + rev: 5.13.2 hooks: - id: isort - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.0.1 + rev: v1.10.0 hooks: - id: mypy + additional_dependencies: + - types-setuptools - repo: https://github.com/asottile/pyupgrade - rev: v3.3.1 + rev: v3.15.2 hooks: - id: pyupgrade # Ansible hooks - - repo: https://github.com/ansible-community/ansible-lint - rev: v6.14.0a0 + - repo: https://github.com/ansible/ansible-lint + rev: v24.6.0 hooks: - id: ansible-lint - # files: molecule/default/playbook.yml + additional_dependencies: + # On its own ansible-lint does not pull in ansible, only + # ansible-core. Therefore, if an Ansible module lives in + # ansible instead of ansible-core, the linter will complain + # that the module is unknown. In these cases it is + # necessary to add the ansible package itself as an + # additional dependency, with the same pinning as is done in + # requirements-test.txt of cisagov/skeleton-ansible-role. + # - ansible>=9,<10 + # ansible-core 2.16.3 through 2.16.6 suffer from the bug + # discussed in ansible/ansible#82702, which breaks any + # symlinked files in vars, tasks, etc. for any Ansible role + # installed via ansible-galaxy. Hence we never want to + # install those versions. + # + # Note that any changes made to this dependency must also be + # made in requirements.txt in cisagov/skeleton-packer and + # requirements-test.txt in cisagov/skeleton-ansible-role. + - ansible-core>=2.16.7 # Terraform hooks - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.77.1 + rev: v1.90.0 hooks: - id: terraform_fmt - id: terraform_validate # Docker hooks - repo: https://github.com/IamTheFij/docker-pre-commit - rev: v2.1.1 + rev: v3.0.1 hooks: - id: docker-compose-check + + # Packer hooks + - repo: https://github.com/cisagov/pre-commit-packer + rev: v0.0.2 + hooks: + - id: packer_validate + - id: packer_fmt From 596793f81b1178e7e2590a54193c053bf014e4b7 Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 21 Oct 2024 22:27:11 -0400 Subject: [PATCH 128/139] Implement "known-issue" workaround for v13 There is a "known issue" with classic-level. The release notes prescribe manually installing the package. See: - https://foundryvtt.com/releases/13.332 --- src/entrypoint.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/entrypoint.sh b/src/entrypoint.sh index 7c1a768af..01b7f4af8 100755 --- a/src/entrypoint.sh +++ b/src/entrypoint.sh @@ -198,6 +198,13 @@ if [ $install_required = true ]; then exit 1 fi + # TODO: This is a workaround for a "known issue" with FoundryVTT 13.332 + # Install classic-level module per release notes. + pushd resources/app > /dev/null + log "Installing classic-level module." + npm install classic-level --silent --no-audit --no-fund --no-progress + popd > /dev/null + if [[ "${CONTAINER_CACHE:-}" ]]; then log "Preserving release archive file in cache." # Check if CONTAINER_CACHE_SIZE is set and if so, ensure it's greater than 0 From 89797c903858271337a3a0b8f519a45bfa8e6a53 Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 21 Oct 2024 22:39:36 -0400 Subject: [PATCH 129/139] Document usage of secret mount during build --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a609eb107..b06485cca 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ docker run \ felddy/foundryvtt:release ``` -> [!NOTE] +> [!TIP] > 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: @@ -369,15 +369,17 @@ It is possible to install a Foundry Virtual Tabletop distribution into the Docker image at build-time. This results in a significantly larger Docker image, but removes the need to install a distribution at container startup, resulting in a faster startup. It also moves the user authentication to -build-time instead of start-time. **Note**: Credentials are only used to fetch -a distribution, and are not stored in the resulting image. +build-time instead of start-time. + +>[!NOTE]: Credentials are only used to fetch a distribution, and are not stored +> in the resulting image. See the [using secrets](#using-secrets) section above +> for an example of the json credentials file format. Build the image with credentials: ```console docker build \ - --build-arg FOUNDRY_USERNAME='' \ - --build-arg FOUNDRY_PASSWORD='' \ + --secret id=foundry_credentials,src=credentials.json --build-arg VERSION=13.332.0 \ --tag felddy/foundryvtt:13.332.0 \ https://github.com/felddy/foundryvtt-docker.git#develop From d622bd81747e26bb397560d3e143929275ea4171 Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 21 Oct 2024 22:41:53 -0400 Subject: [PATCH 130/139] Add alt text to project logo --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b06485cca..4aec0589b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@
- +Docker whale logo carrying the FoundryVTT icosahedron logo while floating + in water.
# foundryvtt-docker # From 568e5e1b90a2ee683df01cdeb8c62c6edcbb4062 Mon Sep 17 00:00:00 2001 From: Felddy Date: Tue, 22 Oct 2024 13:37:14 -0400 Subject: [PATCH 131/139] Fix bare URL linter violation --- CODE_OF_CONDUCT.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 318201b18..31bd69c8a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -55,11 +55,11 @@ further defined and clarified by project maintainers. ## Enforcement ## Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at abuse@geekpad.com. All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. +reported by contacting the project team at . All complaints +will be reviewed and investigated and will result in a response that is deemed +necessary and appropriate to the circumstances. The project team is obligated to +maintain confidentiality with regard to the reporter of an incident. Further +details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other From 408e0b724455a11e8d0f13a901c6eb00ea203c7e Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 4 Nov 2024 15:38:36 -0500 Subject: [PATCH 132/139] Add comments to clarify optional release stage in Dockerfile --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index e1fb0ad30..dd4b1b4c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,10 @@ RUN grep -l "#!" dist/*.js | xargs chmod a+x FROM node:${NODE_IMAGE_VERSION} AS optional-release-stage +# This stage is optional and will only be executed if the FOUNDRY_RELEASE_URL or +# FOUNDRY_USERNAME and FOUNDRY_PASSWORD secrets are provided. It will download +# and extract the Foundry VTT release for inclusion in the final stage. + ARG FOUNDRY_RELEASE_URL ARG FOUNDRY_VERSION ENV ARCHIVE="foundryvtt-${FOUNDRY_VERSION}.zip" From f189763ec7e711ef1b1803cb7a63c29e5c2af3b6 Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 4 Nov 2024 15:41:23 -0500 Subject: [PATCH 133/139] Refactor Dockerfile to separate secret mounts for credentials and improve authentication logic --- Dockerfile | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index dd4b1b4c2..32940b5f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,27 +37,22 @@ COPY --from=compile-typescript-stage \ ./ # .placeholder file to mitigate https://github.com/moby/moby/issues/37965 RUN mkdir dist && touch dist/.placeholder -RUN --mount=type=secret,id=foundry_credentials,required=false \ - npm install classic-level && \ - if [ -f /run/secrets/foundry_credentials ]; then \ - # Extract credentials from JSON - apt-get update && apt-get install -y jq && \ - FOUNDRY_USERNAME=$(jq -r '.foundry_username // empty' /run/secrets/foundry_credentials) && \ - FOUNDRY_PASSWORD=$(jq -r '.foundry_password // empty' /run/secrets/foundry_credentials); \ - fi && \ - if [ -n "${FOUNDRY_USERNAME}" ] && [ -n "${FOUNDRY_PASSWORD}" ]; then \ - # Authenticate using credentials and get the pre-signed URL - ./authenticate.js "${FOUNDRY_USERNAME}" "${FOUNDRY_PASSWORD}" cookiejar.json && \ + +RUN \ + --mount=type=secret,id=foundry_username,required=false \ + --mount=type=secret,id=foundry_password,required=false \ + npm install && \ + if [ -f /run/secrets/foundry_username ] && [ -f /run/secrets/foundry_password ]; then \ + ./authenticate.js "$(cat /run/secrets/foundry_username)" "$(cat /run/secrets/foundry_password)" cookiejar.json && \ presigned_url=$(./get_release_url.js --retry 5 cookiejar.json "${FOUNDRY_VERSION}") && \ DOWNLOAD_URL="${presigned_url}"; \ elif [ -n "${FOUNDRY_RELEASE_URL}" ]; then \ - # Use pre-signed URL DOWNLOAD_URL="${FOUNDRY_RELEASE_URL}"; \ else \ echo "No valid credentials or pre-signed URL provided. Skipping pre-installation."; \ fi && \ if [ -n "${DOWNLOAD_URL}" ]; then \ - apt-get install -y unzip wget && \ + apt-get update && apt-get install -y unzip wget && \ wget -O ${ARCHIVE} "${DOWNLOAD_URL}" && \ unzip -d dist ${ARCHIVE} 'resources/*'; \ fi From 2c39f9edf8b871e3c3b0ba997a18b37ddbbd43b6 Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 4 Nov 2024 15:42:32 -0500 Subject: [PATCH 134/139] Refactor workflow to use build secrets --- .github/workflows/build.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6142cdd3..329b31811 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -129,21 +129,22 @@ jobs: - foundry-secrets - lint - metadata - uses: felddy/reusable-workflows/.github/workflows/docker-build-image.yml@v2 + # TODO: unpin the version of the reusable workflow + uses: felddy/reusable-workflows/.github/workflows/docker-build-image.yml@improvement/build-secrets with: artifact_name: pre-installed-${{ needs.config.outputs.image_artifact_name_stem }}-${{ needs.config.outputs.test_platform }} - build_arg_1_name: FOUNDRY_PASSWORD - build_arg_2_name: FOUNDRY_USERNAME - build_arg_3_name: VERSION + build_arg_1_name: VERSION + build_secret_1_name: FOUNDRY_PASSWORD + build_secret_2_name: FOUNDRY_USERNAME cache_from_scopes: ${{ needs.config.outputs.test_platform }}-pre-installed cache_to_scope: ${{ needs.config.outputs.test_platform }}-pre-installed image_archive_name_stem: ${{ needs.config.outputs.test_platform }} image_labels: ${{ needs.metadata.outputs.image_labels }} platforms: ${{ needs.config.outputs.test_platform }} secrets: - build_arg_1_value: ${{ secrets.FOUNDRY_PASSWORD }} - build_arg_2_value: ${{ secrets.FOUNDRY_USERNAME }} - build_arg_3_value: ${{ needs.metadata.outputs.source_version }} + build_arg_1_value: ${{ needs.metadata.outputs.source_version }} + build_secret_1_value: ${{ secrets.FOUNDRY_PASSWORD }} + build_secret_2_value: ${{ secrets.FOUNDRY_USERNAME }} image_archive_key: ${{ secrets.ARTIFACT_KEY }} # Since we need to pass the foundryvtt.com credentials to the tests, we can't From a3b1ce6bfc8f0e75f3a8c380b9f6d03c5bf3802a Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 4 Nov 2024 15:44:12 -0500 Subject: [PATCH 135/139] Update documentation on using Docker build secrets --- README.md | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4aec0589b..7af7f407b 100644 --- a/README.md +++ b/README.md @@ -374,21 +374,39 @@ image, but removes the need to install a distribution at container startup, resulting in a faster startup. It also moves the user authentication to build-time instead of start-time. ->[!NOTE]: Credentials are only used to fetch a distribution, and are not stored -> in the resulting image. See the [using secrets](#using-secrets) section above -> for an example of the json credentials file format. +### Image build with credentials ### -Build the image with credentials: +> [!NOTE] +> Credentials are only used to fetch a distribution, and are not stored +> in the resulting image. ```console docker build \ - --secret id=foundry_credentials,src=credentials.json + --secret id=foundry_username,src=<(echo "") \ + --secret id=foundry_password,src=<(echo "") \ --build-arg VERSION=13.332.0 \ --tag felddy/foundryvtt:13.332.0 \ https://github.com/felddy/foundryvtt-docker.git#develop ``` -Or build the image using a temporary URL: +> [!TIP] +> If you have stored your credentials in a json file, as documented in the +> [using secrets](#using-secrets) section above, you can extract the username +> and password and pass them as build secrets using the following syntax: +> +> ```console +> docker build \ +> --secret id=foundry_username,src=<(jq -r '.foundry_username' path/to/credentials.json) \ +> --secret id=foundry_password,src=<(jq -r '.foundry_password' path/to/credentials.json) \ +> --build-arg VERSION=13.332.0 \ +> --tag felddy/foundryvtt:13.332.0 \ +> https://github.com/felddy/foundryvtt-docker.git#develop +> ``` + +More information about Docker build secrets can be found in the [Docker +documentation](https://docs.docker.com/build/building/secrets/). + +### Image build with a temporary URL ### ```console docker build \ From 6c2c63462733ec8ba4a211a87b6e33901fffea60 Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 4 Nov 2024 15:55:00 -0500 Subject: [PATCH 136/139] Normalize secret names in build workflow to lowercase --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 329b31811..417b71747 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -134,8 +134,8 @@ jobs: with: artifact_name: pre-installed-${{ needs.config.outputs.image_artifact_name_stem }}-${{ needs.config.outputs.test_platform }} build_arg_1_name: VERSION - build_secret_1_name: FOUNDRY_PASSWORD - build_secret_2_name: FOUNDRY_USERNAME + build_secret_1_name: foundry_password + build_secret_2_name: foundry_username cache_from_scopes: ${{ needs.config.outputs.test_platform }}-pre-installed cache_to_scope: ${{ needs.config.outputs.test_platform }}-pre-installed image_archive_name_stem: ${{ needs.config.outputs.test_platform }} From 46cd5c6138f02747fc01c1c63f108f3e542514ed Mon Sep 17 00:00:00 2001 From: Felddy Date: Mon, 4 Nov 2024 16:57:40 -0500 Subject: [PATCH 137/139] Add debug output for foundry username and password in Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 32940b5f9..4d9e54d32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,6 +41,8 @@ RUN mkdir dist && touch dist/.placeholder RUN \ --mount=type=secret,id=foundry_username,required=false \ --mount=type=secret,id=foundry_password,required=false \ + echo ">>> username: $(cat /run/secrets/foundry_username)" && \ + echo ">>> password: $(cat /run/secrets/foundry_password)" && \ npm install && \ if [ -f /run/secrets/foundry_username ] && [ -f /run/secrets/foundry_password ]; then \ ./authenticate.js "$(cat /run/secrets/foundry_username)" "$(cat /run/secrets/foundry_password)" cookiejar.json && \ From cedeb515d2bb74fb4419ca715407be766fb7613f Mon Sep 17 00:00:00 2001 From: Felddy Date: Fri, 8 Nov 2024 11:34:56 -0500 Subject: [PATCH 138/139] Align platform support with debian base image --- .github/workflows/_config.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_config.yml b/.github/workflows/_config.yml index e7493ce17..728aa1ca4 100644 --- a/.github/workflows/_config.yml +++ b/.github/workflows/_config.yml @@ -7,7 +7,7 @@ on: inputs: platforms: description: "The platforms to build (CSV)" - default: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le + default: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x required: false type: string outputs: diff --git a/README.md b/README.md index 7af7f407b..33936d2ba 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ [![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) -[![Platforms](https://img.shields.io/badge/platforms-amd64%20%7C%20arm%2Fv6%20%7C%20arm%2Fv7%20%7C%20arm64%20%7C%20ppc64le-blue)](https://hub.docker.com/r/felddy/foundryvtt/tags) +[![Platforms](https://img.shields.io/badge/platforms-amd64%20%7C%20arm%2Fv7%20%7C%20arm64%20%7C%20ppc64le%20%7C%20s390x-blue)](https://hub.docker.com/r/felddy/foundryvtt/tags) You can get a [Foundry Virtual Tabletop](https://foundryvtt.com) instance up and running in minutes using this container. This Docker container is designed to From 36b1efed36ffea0330130d6f337bed17df071fae Mon Sep 17 00:00:00 2001 From: Felddy Date: Fri, 8 Nov 2024 16:38:54 -0500 Subject: [PATCH 139/139] Revert pin from workflow branch to tag --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 417b71747..4e3d8b173 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -129,8 +129,7 @@ jobs: - foundry-secrets - lint - metadata - # TODO: unpin the version of the reusable workflow - uses: felddy/reusable-workflows/.github/workflows/docker-build-image.yml@improvement/build-secrets + uses: felddy/reusable-workflows/.github/workflows/docker-build-image.yml@v2 with: artifact_name: pre-installed-${{ needs.config.outputs.image_artifact_name_stem }}-${{ needs.config.outputs.test_platform }} build_arg_1_name: VERSION