Merge branch 'master' into cuttingedge

# Conflicts:
#	.github/workflows/docker-image-vite-react-ts.yml
This commit is contained in:
2025-06-18 19:20:20 +02:00
4 changed files with 16 additions and 25 deletions

View File

@ -19,12 +19,12 @@ jobs:
# https://github.com/docker/setup-qemu-action#usage
- name: Set up QEMU
uses: docker/setup-qemu-action@v3.2.0
uses: docker/setup-qemu-action@v3.6.0
# https://github.com/marketplace/actions/docker-setup-buildx
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.6.1
uses: docker/setup-buildx-action@v3.11.0
# https://github.com/docker/login-action#docker-hub
- name: Login to Docker Hub
@ -35,7 +35,7 @@ jobs:
# https://github.com/docker/build-push-action#multi-platform-image
- name: Build and push Website
uses: docker/build-push-action@v6.7.0
uses: docker/build-push-action@v6.18.0
with:
context: .
file: ./Dockerfile