mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-09-03 12:47:14 +00:00
Compare commits
5
Commits
2026.6.1
...
8b076e4868
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8b076e4868 | ||
|
|
4c534490f2 | ||
|
|
314beec407 | ||
|
|
2ecf6776e2 | ||
|
|
dadecdac28 |
@@ -104,7 +104,7 @@ jobs:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6.0.3
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
# for build-files step
|
||||
fetch-depth: 0
|
||||
@@ -141,13 +141,13 @@ jobs:
|
||||
org.opencontainers.image.authors=Geoff Bourne <itzgeoff@gmail.com>
|
||||
|
||||
- name: Setup Docker Buildx
|
||||
uses: docker/setup-buildx-action@v4.1.0
|
||||
uses: docker/setup-buildx-action@v4
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v4.1.0
|
||||
|
||||
- name: Build for test
|
||||
uses: docker/build-push-action@v7.2.0
|
||||
uses: docker/build-push-action@v7
|
||||
with:
|
||||
platforms: linux/amd64
|
||||
tags: ${{ env.IMAGE_TO_TEST }}
|
||||
@@ -187,7 +187,7 @@ jobs:
|
||||
password: ${{ github.token }}
|
||||
|
||||
- name: Build and push
|
||||
uses: docker/build-push-action@v7.2.0
|
||||
uses: docker/build-push-action@v7
|
||||
if: github.actor == github.repository_owner
|
||||
with:
|
||||
platforms: ${{ matrix.platforms }}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
name: Label Sponsor Contributions
|
||||
name: Sponsor Labeler
|
||||
|
||||
on:
|
||||
issues:
|
||||
types:
|
||||
@@ -9,15 +10,7 @@ on:
|
||||
|
||||
jobs:
|
||||
label-sponsor:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
pull-requests: write
|
||||
issues: write
|
||||
|
||||
steps:
|
||||
- name: Check if sponsor
|
||||
uses: JasonEtco/is-sponsor-label-action@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
label: sponsor
|
||||
uses: itzg/github-workflows/.github/workflows/sponsor-labeler.yml@main
|
||||
with:
|
||||
author: ${{ github.event.issue.user.login || github.event.pull_request.user.login }}
|
||||
number: ${{ github.event.issue.number || github.event.pull_request.number }}
|
||||
@@ -13,13 +13,13 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v7
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
uses: docker/setup-buildx-action@v4
|
||||
|
||||
- name: Build docs image
|
||||
uses: docker/build-push-action@v6
|
||||
uses: docker/build-push-action@v7
|
||||
with:
|
||||
context: .
|
||||
file: docs/Dockerfile
|
||||
|
||||
@@ -53,16 +53,16 @@ jobs:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6.0.3
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
# for build-files step
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Setup Docker Buildx
|
||||
uses: docker/setup-buildx-action@v4.1.0
|
||||
uses: docker/setup-buildx-action@v4
|
||||
|
||||
- name: Confirm multi-arch build
|
||||
uses: docker/build-push-action@v7.2.0
|
||||
uses: docker/build-push-action@v7
|
||||
with:
|
||||
platforms: ${{ matrix.platforms }}
|
||||
# ensure latest base image is used
|
||||
@@ -73,7 +73,7 @@ jobs:
|
||||
cache-from: type=gha,scope=${{ matrix.variant }}
|
||||
|
||||
- name: Build for test
|
||||
uses: docker/build-push-action@v7.2.0
|
||||
uses: docker/build-push-action@v7
|
||||
with:
|
||||
# Only build single platform since loading multi-arch image into daemon fails with
|
||||
# "docker exporter does not currently support exporting manifest lists"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
click==8.4.1
|
||||
colorama==0.4.6
|
||||
deepmerge==2.0
|
||||
deepmerge==2.1.0
|
||||
ghp-import==2.1.0
|
||||
griffe==2.0.2
|
||||
griffe==2.1.0
|
||||
Jinja2==3.1.6
|
||||
Markdown==3.10.2
|
||||
MarkupSafe==3.0.3
|
||||
@@ -11,15 +11,15 @@ mkdocs==1.6.1
|
||||
mkdocs-autorefs==1.4.4
|
||||
mkdocs-get-deps==0.2.2
|
||||
mkdocstrings==1.0.4
|
||||
mkdocstrings-python==2.0.4
|
||||
mkdocstrings-python==2.0.5
|
||||
packaging==26.2
|
||||
pathspec==1.1.1
|
||||
platformdirs==4.10.0
|
||||
Pygments==2.20.0
|
||||
pymdown-extensions==10.21.3
|
||||
pymdown-extensions==11.0
|
||||
python-dateutil==2.9.0.post0
|
||||
PyYAML==6.0.3
|
||||
pyyaml_env_tag==1.1
|
||||
six==1.17.0
|
||||
watchdog==6.0.0
|
||||
zensical==0.0.45
|
||||
zensical==0.0.46
|
||||
|
||||
@@ -560,6 +560,17 @@ function extract() {
|
||||
# remaining args are paths within the archive to extract; if none, extract everything
|
||||
|
||||
type=$(file -b --mime-type "${src}")
|
||||
if [[ "$type" == application/octet-stream ]]; then
|
||||
logWarning "Detected non-specific file type $type for $src"
|
||||
case "$src" in
|
||||
*.zip)
|
||||
log "Assuming zip from extension"
|
||||
type=application/zip
|
||||
;;
|
||||
# otherwise fall through to
|
||||
esac
|
||||
fi
|
||||
|
||||
case "${type}" in
|
||||
application/zip)
|
||||
unzip -o -q -d "${destDir}" "${src}" "$@"
|
||||
|
||||
Reference in New Issue
Block a user