glax/tranga-website
1
0
Fork 0
mirror of https://github.com/C9Glax/tranga-website.git synced 2025-06-20 02:27:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cuttingedge

Browse Source 
# Conflicts:
#	.github/workflows/docker-image-vite-react-ts.yml
This commit is contained in:
glax
2025-06-18 19:20:20 +02:00
parent 74b71d57b7 49fe38962d
commit 7ec740da82
4 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/docker-image-cuttingedge.yml vendored
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

8
.github/workflows/docker-image-master.yml vendored
View File

@ -3,8 +3,6 @@ name: Docker Image CI
on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]
workflow_dispatch:
jobs:
@ -19,12 +17,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 +33,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

16
.github/workflows/docker-image-dev.yml → .github/workflows/docker-image-vite-react-ts.yml vendored
View File

@ -2,9 +2,7 @@ name: Docker Image CI
on:
push:
branches: [ "dev" ]
pull_request:
branches: [ "dev" ]
branches: [ "vite-react-ts" ]
workflow_dispatch:
jobs:
@ -19,12 +17,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,13 +33,13 @@ 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: ./
context: .
file: ./Dockerfile
#platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
platforms: linux/amd64,linux/arm64
platforms: linux/amd64
pull: true
push: true
tags: |
glax/tranga-website:dev
glax/tranga-website:Server-V2