Skip to content

Commit 47514a4

Browse files
committed
Merge remote-tracking branch 'origin/main' into main
2 parents 2e71755 + 8f8dd27 commit 47514a4

File tree

5 files changed

+31
-7
lines changed

5 files changed

+31
-7
lines changed

.github/workflows/docker-publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
matrix: ${{ steps.set-matrix.outputs.matrix }}
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Generate python
2525
uses: actions/setup-python@v4
@@ -31,7 +31,7 @@ jobs:
3131
run: ./generate-dockerfiles.sh
3232

3333
- name: Upload a Build Artifact
34-
uses: actions/[email protected].2
34+
uses: actions/[email protected].3
3535
with:
3636
# Artifact name
3737
name: Dockerfiles
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
steps:
5757
- name: Checkout
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959

6060
- name: Setup python
6161
uses: actions/setup-python@v4
@@ -86,7 +86,7 @@ jobs:
8686
max-wait-time: 30
8787

8888
- name: Checkout
89-
uses: actions/checkout@v3
89+
uses: actions/checkout@v4
9090

9191
- name: Remove old Dockerfiles
9292
run: rm -rf dockerfiles
@@ -118,7 +118,7 @@ jobs:
118118
username: ${{ github.actor }}
119119
password: ${{ secrets.GITHUB_TOKEN }}
120120
- name: Build and push
121-
uses: docker/build-push-action@v4.1.1
121+
uses: docker/build-push-action@v4.2.1
122122
with:
123123
context: .
124124
file: dockerfiles/Dockerfile.${{ matrix.shortname }}

.github/workflows/dockerhub-description.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616

1717
- name: Docker Hub Description
1818
uses: peter-evans/dockerhub-description@v3

.github/workflows/update-copyright-years-in-license-file.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
with:
1414
fetch-depth: 0
1515
- name: Action Update License Year

docker-compose/docker-compose-ps.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
version: "3.8"
2+
services:
3+
# bind mount example
4+
linuxgsm-ps-bind:
5+
image: gameservermanagers/gameserver:ps
6+
# image: ghcr.io/gameservermanagers/gameserver:ps
7+
container_name: psserver
8+
restart: unless-stopped
9+
volumes:
10+
- /path/to/linuxgsm/psserver:/data
11+
ports:
12+
13+
# volume example
14+
linuxgsm-ps-volume:
15+
image: gameservermanagers/gameserver:ps
16+
# image: ghcr.io/gameservermanagers/gameserver:ps
17+
container_name: psserver
18+
restart: unless-stopped
19+
volumes:
20+
- linuxgsm-ps:/data
21+
ports:
22+
23+
volumes:
24+
linuxgsm-ps:

dockerfiles/Dockerfile.ps

950 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)