Skip to content

Commit

Permalink
Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into Server-V2
Browse files Browse the repository at this point in the history
  • Loading branch information
C9Glax committed Jul 31, 2024
2 parents d73bf70 + 1991862 commit 6b9ddca
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/docker-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:

# https://github.com/docker/setup-qemu-action#usage
- name: Set up QEMU
uses: docker/setup-qemu-action@v3.1.0
uses: docker/setup-qemu-action@v3.2.0

# https://github.com/marketplace/actions/docker-setup-buildx
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.4.0
uses: docker/setup-buildx-action@v3.6.1

# https://github.com/docker/login-action#docker-hub
- name: Login to Docker Hub
Expand All @@ -31,7 +31,7 @@ jobs:

# https://github.com/docker/build-push-action#multi-platform-image
- name: Build and push base
uses: docker/build-push-action@v6.3.0
uses: docker/build-push-action@v6.5.0
with:
context: ./
file: ./Dockerfile-base
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-image-cuttingedge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:

# https://github.com/docker/setup-qemu-action#usage
- name: Set up QEMU
uses: docker/setup-qemu-action@v3.1.0
uses: docker/setup-qemu-action@v3.2.0

# https://github.com/marketplace/actions/docker-setup-buildx
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.4.0
uses: docker/setup-buildx-action@v3.6.1

# https://github.com/docker/login-action#docker-hub
- name: Login to Docker Hub
Expand All @@ -33,7 +33,7 @@ jobs:

# https://github.com/docker/build-push-action#multi-platform-image
- name: Build and push API
uses: docker/build-push-action@v6.3.0
uses: docker/build-push-action@v6.5.0
with:
context: ./
file: ./Dockerfile
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-image-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:

# https://github.com/docker/setup-qemu-action#usage
- name: Set up QEMU
uses: docker/setup-qemu-action@v3.1.0
uses: docker/setup-qemu-action@v3.2.0

# https://github.com/marketplace/actions/docker-setup-buildx
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.4.0
uses: docker/setup-buildx-action@v3.6.1

# https://github.com/docker/login-action#docker-hub
- name: Login to Docker Hub
Expand All @@ -33,7 +33,7 @@ jobs:

# https://github.com/docker/build-push-action#multi-platform-image
- name: Build and push API
uses: docker/build-push-action@v6.3.0
uses: docker/build-push-action@v6.5.0
with:
context: ./
file: ./Dockerfile
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-image-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:

# https://github.com/docker/setup-qemu-action#usage
- name: Set up QEMU
uses: docker/setup-qemu-action@v3.1.0
uses: docker/setup-qemu-action@v3.2.0

# https://github.com/marketplace/actions/docker-setup-buildx
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.4.0
uses: docker/setup-buildx-action@v3.6.1

# https://github.com/docker/login-action#docker-hub
- name: Login to Docker Hub
Expand All @@ -33,7 +33,7 @@ jobs:

# https://github.com/docker/build-push-action#multi-platform-image
- name: Build and push API
uses: docker/build-push-action@v6.3.0
uses: docker/build-push-action@v6.5.0
with:
context: ./
file: ./Dockerfile
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-image-serverv2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:

# https://github.com/docker/setup-qemu-action#usage
- name: Set up QEMU
uses: docker/setup-qemu-action@v3.1.0
uses: docker/setup-qemu-action@v3.2.0

# https://github.com/marketplace/actions/docker-setup-buildx
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.4.0
uses: docker/setup-buildx-action@v3.6.1

# https://github.com/docker/login-action#docker-hub
- name: Login to Docker Hub
Expand All @@ -33,7 +33,7 @@ jobs:

# https://github.com/docker/build-push-action#multi-platform-image
- name: Build and push API
uses: docker/build-push-action@v6.3.0
uses: docker/build-push-action@v6.5.0
with:
context: ./
file: ./Dockerfile
Expand Down

0 comments on commit 6b9ddca

Please sign in to comment.