merge upstream

felddy · Sep 29, 2023 · d1ea1a3 · d1ea1a3
2 parents e6783ee + 2fac62d
commit d1ea1a3
Show file tree

Hide file tree

Showing 14 changed files with 83 additions and 79 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -57,7 +57,7 @@ body:
       description: Paste the output from the command above. This will be automatically formatted, so no need for backticks.
       render: shell
       placeholder: |
-        com.foundryvtt.version = "11.308"
+        com.foundryvtt.version = "11.311"
         org.opencontainers.image.authors = "[email protected]"
         org.opencontainers.image.created = "2022-09-01T23:22:04.337Z"
         org.opencontainers.image.description = "An easy-to-deploy Dockerized Foundry Virtual Tabletop server."
@@ -67,7 +67,7 @@ body:
         org.opencontainers.image.title = "foundryvtt-docker"
         org.opencontainers.image.url = "https://github.com/felddy/foundryvtt-docker"
         org.opencontainers.image.vendor = "Geekpad"
-        org.opencontainers.image.version = "11.308.0"
+        org.opencontainers.image.version = "11.311.0"
     validations:
       required: true
   - type: textarea
@@ -78,7 +78,7 @@ body:
       render: console
       placeholder: |
         foundry_1   | Entrypoint | 2022-02-23 14:14:53 | [debug] Timezone set to: US/Eastern
-        foundry_1   | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v11.308.0
+        foundry_1   | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v11.311.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
@@ -72,7 +72,7 @@ body:
       description: Paste the output from the command above. This will be automatically formatted, so no need for backticks.
       render: shell
       placeholder: |
-        com.foundryvtt.version = "11.308"
+        com.foundryvtt.version = "11.311"
         org.opencontainers.image.authors = "[email protected]"
         org.opencontainers.image.created = "2022-09-01T23:22:04.337Z"
         org.opencontainers.image.description = "An easy-to-deploy Dockerized Foundry Virtual Tabletop server."
@@ -82,7 +82,7 @@ body:
         org.opencontainers.image.title = "foundryvtt-docker"
         org.opencontainers.image.url = "https://github.com/felddy/foundryvtt-docker"
         org.opencontainers.image.vendor = "Geekpad"
-        org.opencontainers.image.version = "11.308.0"
+        org.opencontainers.image.version = "11.311.0"
     validations:
       required: true
   - type: textarea
@@ -93,7 +93,7 @@ body:
       render: console
       placeholder: |
         foundry_1   | Entrypoint | 2022-02-23 14:14:53 | [debug] Timezone set to: US/Eastern
-        foundry_1   | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v11.308.0
+        foundry_1   | Entrypoint | 2022-02-23 14:14:53 | [info] Starting felddy/foundryvtt container v11.311.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/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,linux/s390x
+        default: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le
         required: false
         type: string
     outputs:

diff --git 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@3df4ab11eba7bda6032a0b82a6bb43b11571feac  # tag=v4.0.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608  # tag=v4.1.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git 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@3df4ab11eba7bda6032a0b82a6bb43b11571feac  # tag=v4.0.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608  # tag=v4.1.0
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034  # tag=v3.1.0
diff --git 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@3df4ab11eba7bda6032a0b82a6bb43b11571feac  # tag=v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608  # tag=v4.1.0
       - id: setup-python
         uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1  # tag=v4.7.0
         with:

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac  # tag=v4.0.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608  # tag=v4.1.0
         with:
           persist-credentials: false
 

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
@@ -23,7 +23,7 @@ jobs:
         uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09  # tag=v2.5.1
         with:
           egress-policy: audit  # TODO: change to 'egress-policy: block' after couple of runs
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac  # tag=v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608  # tag=v4.1.0
       - name: Sync repository labels
         if: success()
         uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b  # tag=v5.0.0

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 ARG FOUNDRY_PASSWORD
 ARG FOUNDRY_RELEASE_URL
 ARG FOUNDRY_USERNAME
-ARG FOUNDRY_VERSION=11.308
+ARG FOUNDRY_VERSION=11.311
 ARG NODE_IMAGE_VERSION=18-alpine3.18
 ARG VERSION