Skip to content

Commit

Permalink
Merge pull request #403 from felddy/prerelease/10.278.0
Browse files Browse the repository at this point in the history
Prerelease/10.278.0
  • Loading branch information
felddy authored Aug 16, 2022
2 parents 7ab1fcc + 291e188 commit e702d4c
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 33 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/_build-push-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504
uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
with:
# TODO: change to 'egress-policy: block' after couple of runs
egress-policy: audit
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
${{ env.DOCKERFILE_X }}
- name: Build and push platform images to registries
id: docker_build
uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0
uses: docker/build-push-action@c84f38281176d4c9cdb1626ffafcd6b3911b5d94
with:
build-args: ${{ inputs.build_args }}
cache-from: type=local,src=${{ inputs.buildx_cache_dir }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/_build-test-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504
uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
with:
# TODO: change to 'egress-policy: block' after couple of runs
egress-policy: audit
Expand All @@ -71,7 +71,7 @@ jobs:
run: mkdir -p ${{ env.ARTIFACT_WORK_DIR }}
- name: Build image
id: docker_build
uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0
uses: docker/build-push-action@c84f38281176d4c9cdb1626ffafcd6b3911b5d94
with:
build-args: ${{ secrets.build_args }}
cache-from: type=local,src=${{ inputs.buildx_cache_dir }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504
uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
with: # TODO: change to 'egress-policy: block' after couple of runs
egress-policy: audit

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504
uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
with:
# TODO: change to 'egress-policy: block' after couple of runs
egress-policy: audit
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
tags: ${{ steps.prep.outputs.tags }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504
uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
with:
# TODO: change to 'egress-policy: block' after couple of runs
egress-policy: audit
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_test-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504
uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
with:
# TODO: change to 'egress-policy: block' after couple of runs
egress-policy: audit
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504
uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
with:
# TODO: change to 'egress-policy: block' after couple of runs
egress-policy: audit
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504
uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
with: # TODO: change to 'egress-policy: block' after couple of runs
egress-policy: audit
- name: 'Checkout Repository'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@74b568e8591fbb3115c70f3436a0c6b0909a8504
uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG FOUNDRY_PASSWORD
ARG FOUNDRY_RELEASE_URL
ARG FOUNDRY_USERNAME
ARG FOUNDRY_VERSION=10.277
ARG FOUNDRY_VERSION=10.278
ARG NODE_IMAGE_VERSION=16-alpine3.15
ARG VERSION

Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[![GitHub Build Status](https://github.com/felddy/foundryvtt-docker/workflows/build/badge.svg)](https://github.com/felddy/foundryvtt-docker/actions/workflows/build.yml)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5966/badge)](https://bestpractices.coreinfrastructure.org/projects/5966)
[![CodeQL](https://github.com/felddy/foundryvtt-docker/workflows/CodeQL/badge.svg)](https://github.com/felddy/foundryvtt-docker/actions/workflows/codeql-analysis.yml)
[![FoundryVTT Release Version: v10.277](https://img.shields.io/badge/prerelease-v10.277-red?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAIRlWElmTU0AKgAAAAgABQESAAMAAAABAAEAAAEaAAUAAAABAAAASgEbAAUAAAABAAAAUgEoAAMAAAABAAIAAIdpAAQAAAABAAAAWgAAAAAAAABIAAAAAQAAAEgAAAABAAOgAQADAAAAAQABAACgAgAEAAAAAQAAAA6gAwAEAAAAAQAAAA4AAAAATspU+QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAAAiFJREFUKBVVks1rE1EUxc+d5tO0prZVSZsUhSBIPyC02ooWurJ0I7rQlRvdC/4N4h9gt7pyoRTswpWgILgQBIOIiC340VhbpC0Ek85MGmPmXc+baWpNGJg77/7uOffeB+z9FHB0FrH9eLwwqpOF0f34KrpsTicW+6L8KE8QhO/n8n1IOgtQHYZA+a/Ai9+Wd6v1g7liq5A2OjKSQNa9hkO4hAzOIylf6CHALk6hoWXsylPkfjyyApaJhVCxmERy5zLSuI7D8h1H5BWht1aBhS6wdI3pN7GabyuyS4JPrchzujmNjDxAVrrRL2PoxRSGxOfjssgEjkkJvVJBWu6h5M7YenvDoOO0OgicD4TPIKWbBG6xvwTaKCMwSU7hKxK6gt8mbsFIMaF5iDyjUg6iPnqc58higCr9fD4iTvWMziAmK2g73f/AADVWX0YXrlChirgOcqL3WXYBYpTfUuxzjkW30dI1C0ZW1RnjMopo4C56MIs6CgQrMER2cJoz9zjdO2iz17g2yZUjqzHWbuA4/ugiEz7DVRe/aLxmcvDQ5Cq+oWGWeDbAgiETXgArrVOFGzR0EkclxrVMcpfLgFThY5roe2yz95ZZkzcbj22+w2VG8Pz6Q/b5Gr6uM9mw04uo6ll4tOlhE8a8xNzGYihCJoT+u3I4kUIp6OM0X9CHHds8frbqsrXlh9CB62nj8L5a9Y4DHR/K68TgcHhoz607Qp34L72X0rdSdM+vAAAAAElFTkSuQmCC)](https://foundryvtt.com/releases/10.277)
[![FoundryVTT Release Version: v10.278](https://img.shields.io/badge/prerelease-v10.278-red?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAIRlWElmTU0AKgAAAAgABQESAAMAAAABAAEAAAEaAAUAAAABAAAASgEbAAUAAAABAAAAUgEoAAMAAAABAAIAAIdpAAQAAAABAAAAWgAAAAAAAABIAAAAAQAAAEgAAAABAAOgAQADAAAAAQABAACgAgAEAAAAAQAAAA6gAwAEAAAAAQAAAA4AAAAATspU+QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAAAiFJREFUKBVVks1rE1EUxc+d5tO0prZVSZsUhSBIPyC02ooWurJ0I7rQlRvdC/4N4h9gt7pyoRTswpWgILgQBIOIiC340VhbpC0Ek85MGmPmXc+baWpNGJg77/7uOffeB+z9FHB0FrH9eLwwqpOF0f34KrpsTicW+6L8KE8QhO/n8n1IOgtQHYZA+a/Ai9+Wd6v1g7liq5A2OjKSQNa9hkO4hAzOIylf6CHALk6hoWXsylPkfjyyApaJhVCxmERy5zLSuI7D8h1H5BWht1aBhS6wdI3pN7GabyuyS4JPrchzujmNjDxAVrrRL2PoxRSGxOfjssgEjkkJvVJBWu6h5M7YenvDoOO0OgicD4TPIKWbBG6xvwTaKCMwSU7hKxK6gt8mbsFIMaF5iDyjUg6iPnqc58higCr9fD4iTvWMziAmK2g73f/AADVWX0YXrlChirgOcqL3WXYBYpTfUuxzjkW30dI1C0ZW1RnjMopo4C56MIs6CgQrMER2cJoz9zjdO2iz17g2yZUjqzHWbuA4/ugiEz7DVRe/aLxmcvDQ5Cq+oWGWeDbAgiETXgArrVOFGzR0EkclxrVMcpfLgFThY5roe2yz95ZZkzcbj22+w2VG8Pz6Q/b5Gr6uM9mw04uo6ll4tOlhE8a8xNzGYihCJoT+u3I4kUIp6OM0X9CHHds8frbqsrXlh9CB62nj8L5a9Y4DHR/K68TgcHhoz607Qp34L72X0rdSdM+vAAAAAElFTkSuQmCC)](https://foundryvtt.com/releases/10.278)

[![Docker Pulls](https://img.shields.io/docker/pulls/felddy/foundryvtt)](https://hub.docker.com/r/felddy/foundryvtt)
[![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/felddy/foundryvtt)](https://hub.docker.com/r/felddy/foundryvtt)
Expand Down Expand Up @@ -210,8 +210,8 @@ It is recommended that most users use the `:release` tag.
|-----------|-------------|
|`felddy/foundryvtt:release` | The most recent image from the `stable` channel. These images are **considered stable**, and well-tested. Most users will use this tag. The `latest` tag always points to the same version as `release`.|
|`felddy/foundryvtt:prerelease` | The most recent image from the `testing`, `development`, or `prototype` channels. Pre-releases are **VERY LIKELY to introduce breaking bugs** that will be disruptive to play. Do not install this version unless you are using for the specific purposes of testing. The intention of pre-release builds are to allow for previewing new features and to help developers to begin updating modules which are impacted by the changes. If you choose to update to this version for a live game you do so entirely at your own risk of having a bad experience. *Please back up your critical user data before installing this version.* |
|`felddy/foundryvtt:10.277.0`| An exact image version. |
|`felddy/foundryvtt:10.277`| The most recent image matching the major and minor version numbers. |
|`felddy/foundryvtt:10.278.0`| An exact image version. |
|`felddy/foundryvtt:10.278`| The most recent image matching the major and minor version numbers. |
|`felddy/foundryvtt:10`| The most recent image matching the major version number. |
|`felddy/foundryvtt:latest`| See the `release` tag. [Why does `latest` == `release`?](https://vsupalov.com/docker-latest-tag/) |

Expand Down Expand Up @@ -265,7 +265,7 @@ secrets](#using-secrets) instead of environment variables.

| Name | Purpose | Default |
|-------|---------|---------|
| `CONTAINER_CACHE` | Set a path to cache downloads of the Foundry distribution archive and speed up subsequent container startups. The path should be in `/data` or another persistent mount point in the container. Set to `""` to disable. ***Note***: When the cache is disabled the container may sleep instead of exiting, in certain circumstances, to prevent a download loop. A distribution can be pre-downloaded and placed into a cache directory. The distribution's name must be of the form: `foundryvtt-10.277.zip`| `/data/container_cache` |
| `CONTAINER_CACHE` | Set a path to cache downloads of the Foundry distribution archive and speed up subsequent container startups. The path should be in `/data` or another persistent mount point in the container. Set to `""` to disable. ***Note***: When the cache is disabled the container may sleep instead of exiting, in certain circumstances, to prevent a download loop. A distribution can be pre-downloaded and placed into a cache directory. The distribution's name must be of the form: `foundryvtt-10.278.zip`| `/data/container_cache` |
| `CONTAINER_PATCHES` | Set a path to a directory of shell scripts to be sourced after Foundry is installed but before it is started. The path should be in `/data` or another persistent mount point in the container. e.g.; `/data/container_patches` Patch files are sourced in lexicographic order. `CONTAINER_PATCHES` are processed after `CONTAINER_PATCH_URLS`.| |
| `CONTAINER_PATCH_URLS` | Set to a space-delimited list of URLs to be sourced after Foundry is installed but before it is started. Patch URLs are sourced in the order specified. `CONTAINER_PATCH_URLS` are processed before `CONTAINER_PATCHES`. ⚠️ **Only use patch URLs from trusted sources!** | |
| `CONTAINER_PRESERVE_CONFIG` | Normally new `options.json` and `admin.txt` files are generated by the container at each startup. Setting this to `true` prevents the container from modifying these files when they exist. If they do not exist, they will be created as normal. | `false` |
Expand All @@ -291,7 +291,7 @@ secrets](#using-secrets) instead of environment variables.
| `FOUNDRY_UID` | `uid` the daemon will be run under. | `foundry` |
| `FOUNDRY_UPNP` | Allow Universal Plug and Play to automatically request port forwarding for the Foundry server port to your local network address. | `false` |
| `FOUNDRY_UPNP_LEASE_DURATION` | Sets the Universal Plug and Play lease duration, allowing for the possibility of permanent leases for routers which do not support temporary leases. To define an indefinite lease duration set the value to `0`. | `null` |
| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `10.277` |
| `FOUNDRY_VERSION` | Version of Foundry Virtual Tabletop to install. | `10.278` |
| `FOUNDRY_WORLD` | The world to startup at system start. | `null` |
| `TIMEZONE` | Container [TZ database name](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List) | `UTC` |

Expand Down Expand Up @@ -326,8 +326,8 @@ Build the image locally using this git repository as the [build context](https:/

```console
docker build \
--build-arg VERSION=10.277.0 \
--tag felddy/foundryvtt:10.277.0 \
--build-arg VERSION=10.278.0 \
--tag felddy/foundryvtt:10.278.0 \
https://github.com/felddy/foundryvtt-docker.git#develop
```

Expand Down Expand Up @@ -357,9 +357,9 @@ Docker:
docker buildx build \
--file Dockerfile-x \
--platform linux/amd64 \
--build-arg VERSION=10.277.0 \
--build-arg VERSION=10.278.0 \
--output type=docker \
--tag felddy/foundryvtt:10.277.0 .
--tag felddy/foundryvtt:10.278.0 .
```

## Pre-installed distribution builds ##
Expand All @@ -377,8 +377,8 @@ Build the image with credentials:
docker build \
--build-arg FOUNDRY_USERNAME='<your_username>' \
--build-arg FOUNDRY_PASSWORD='<your_password>' \
--build-arg VERSION=10.277.0 \
--tag felddy/foundryvtt:10.277.0 \
--build-arg VERSION=10.278.0 \
--tag felddy/foundryvtt:10.278.0 \
https://github.com/felddy/foundryvtt-docker.git#develop
```

Expand All @@ -387,8 +387,8 @@ Or build the image using a temporary URL:
```console
docker build \
--build-arg FOUNDRY_RELEASE_URL='<temporary_url>' \
--build-arg VERSION=10.277.0 \
--tag felddy/foundryvtt:10.277.0 \
--build-arg VERSION=10.278.0 \
--tag felddy/foundryvtt:10.278.0 \
https://github.com/felddy/foundryvtt-docker.git#develop
```

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ services:
# - FOUNDRY_UID=foundry
# - FOUNDRY_UPNP=false
# - FOUNDRY_UPNP_LEASE_DURATION=
# - FOUNDRY_VERSION=10.277
# - FOUNDRY_VERSION=10.278
# - FOUNDRY_WORLD=
# - TIMEZONE=US/Eastern
ports:
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
"url": "https://github.com/felddy/foundryvtt-docker/issues"
},
"dependencies": {
"cheerio": "^1.0.0-rc.10",
"cheerio": "^1.0.0-rc.12",
"docopt": "^0.6.2",
"fetch-cookie": "^2.0.3",
"node-fetch": "^3.2.3",
"fetch-cookie": "^2.1.0",
"node-fetch": "^3.2.10",
"tough-cookie-file-store": "^2.0.3",
"winston": "^3.6.0"
"winston": "^3.8.1"
},
"description": "Utilities to help boot a FoundryVTT server.",
"devDependencies": {
"@types/cheerio": "^0.22.31",
"@types/docopt": "^0.6.33",
"@types/tough-cookie": "^4.0.1",
"@types/tough-cookie": "^4.0.2",
"@types/tough-cookie-file-store": "^2.0.1",
"typescript": "^4.6.2"
"typescript": "^4.7.4"
},
"homepage": "https://github.com/felddy/foundryvtt-docker#readme",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion src/_version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""This file defines the version of this module."""

__version__ = "10.277.0"
__version__ = "10.278.0"

0 comments on commit e702d4c

Please sign in to comment.