Skip to content

Commit 02cfc11

Browse files
dgibbs64dgibbs64
committed
Merge remote-tracking branch 'origin/main'
2 parents b73a6d7 + 3653836 commit 02cfc11

File tree

149 files changed

+695
-271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+695
-271
lines changed

‎.github/workflows/docker-publish.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v4
2323

2424
- name: Generate python
25-
uses: actions/setup-python@v4
25+
uses: actions/setup-python@v5
2626
with:
2727
cache: "pip"
2828
- run: pip3 install -r requirements.txt
@@ -31,7 +31,7 @@ jobs:
3131
run: ./generate-dockerfiles.sh
3232

3333
- name: Upload a Build Artifact
34-
uses: actions/upload-artifact@v3.1.3
34+
uses: actions/upload-artifact@v4.5.0
3535
with:
3636
# Artifact name
3737
name: Dockerfiles
@@ -58,7 +58,7 @@ jobs:
5858
uses: actions/checkout@v4
5959

6060
- name: Setup python
61-
uses: actions/setup-python@v4
61+
uses: actions/setup-python@v5
6262
with:
6363
cache: "pip"
6464
- run: pip3 install -r requirements.txt
@@ -92,7 +92,7 @@ jobs:
9292
run: rm -rf dockerfiles
9393

9494
- name: Download a Build Artifact
95-
uses: actions/download-artifact@v3.0.2
95+
uses: actions/download-artifact@v4.1.8
9696
with:
9797
# Artifact name
9898
name: Dockerfiles
@@ -103,22 +103,22 @@ jobs:
103103
uses: docker/setup-qemu-action@v3
104104

105105
- name: Set up Docker Buildx
106-
uses: docker/setup-buildx-action@v3.0.0
106+
uses: docker/setup-buildx-action@v3.8.0
107107

108108
- name: Login to DockerHub
109-
uses: docker/login-action@v3.0.0
109+
uses: docker/login-action@v3.3.0
110110
with:
111111
username: ${{ secrets.DOCKER_HUB_USERNAME }}
112112
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
113113

114114
- name: Login to GitHub Container Registry
115-
uses: docker/login-action@v3.0.0
115+
uses: docker/login-action@v3.3.0
116116
with:
117117
registry: ghcr.io
118118
username: ${{ github.actor }}
119119
password: ${{ secrets.GITHUB_TOKEN }}
120120
- name: Build and push
121-
uses: docker/build-push-action@v5.0.0
121+
uses: docker/build-push-action@v6.10.0
122122
with:
123123
context: .
124124
file: dockerfiles/Dockerfile.${{ matrix.shortname }}
@@ -135,7 +135,7 @@ jobs:
135135
runs-on: ubuntu-latest
136136
steps:
137137
- name: Delete Package Versions
138-
uses: actions/delete-package-versions@v4
138+
uses: actions/delete-package-versions@v5
139139
with:
140140
package-name: gameserver
141141
package-type: container
@@ -148,7 +148,7 @@ jobs:
148148
runs-on: ubuntu-latest
149149
steps:
150150
- name: Delete Package Versions
151-
uses: actions/delete-package-versions@v4
151+
uses: actions/delete-package-versions@v5
152152
with:
153153
package-name: gameserver
154154
package-type: container
@@ -161,7 +161,7 @@ jobs:
161161
runs-on: ubuntu-latest
162162
steps:
163163
- name: Delete Package Versions
164-
uses: actions/delete-package-versions@v4
164+
uses: actions/delete-package-versions@v5
165165
with:
166166
package-name: gameserver
167167
package-type: container

‎.github/workflows/dockerhub-description.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@v4
1616

1717
- name: Docker Hub Description
18-
uses: peter-evans/dockerhub-description@v3
18+
uses: peter-evans/dockerhub-description@v4
1919
with:
2020
username: ${{ secrets.DOCKER_HUB_USERNAME }}
2121
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

‎.github/workflows/package-cleanup.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Delete Package Versions
13-
uses: actions/delete-package-versions@v4
13+
uses: actions/delete-package-versions@v5
1414
with:
1515
package-name: gameserver
1616
package-type: container
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- name: Delete Package Versions
26-
uses: actions/delete-package-versions@v4
26+
uses: actions/delete-package-versions@v5
2727
with:
2828
package-name: gameserver
2929
package-type: container
@@ -36,7 +36,7 @@ jobs:
3636
runs-on: ubuntu-latest
3737
steps:
3838
- name: Delete Package Versions
39-
uses: actions/delete-package-versions@v4
39+
uses: actions/delete-package-versions@v5
4040
with:
4141
package-name: gameserver
4242
package-type: container

‎LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# The MIT License (MIT)
22

3-
Copyright (c) 2022-2023 Daniel Gibbs
3+
Copyright (c) 2022-2025 Daniel Gibbs
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎docker-compose/docker-compose-cs2.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-cs2-bind:
5+
image: gameservermanagers/gameserver:cs2
6+
# image: ghcr.io/gameservermanagers/gameserver:cs2
7+
container_name: cs2server
8+
restart: unless-stopped
9+
volumes:
10+
- /path/to/linuxgsm/cs2server:/data
11+
network_mode: host
12+
13+
# volume example
14+
linuxgsm-cs2-volume:
15+
image: gameservermanagers/gameserver:cs2
16+
# image: ghcr.io/gameservermanagers/gameserver:cs2
17+
container_name: cs2server
18+
restart: unless-stopped
19+
volumes:
20+
- linuxgsm-cs2:/data
21+
network_mode: host
22+
23+
volumes:
24+
linuxgsm-cs2:

‎docker-compose/docker-compose-hz.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-hz-bind:
5+
image: gameservermanagers/gameserver:hz
6+
# image: ghcr.io/gameservermanagers/gameserver:hz
7+
container_name: hzserver
8+
restart: unless-stopped
9+
volumes:
10+
- /path/to/linuxgsm/hzserver:/data
11+
network_mode: host
12+
13+
# volume example
14+
linuxgsm-hz-volume:
15+
image: gameservermanagers/gameserver:hz
16+
# image: ghcr.io/gameservermanagers/gameserver:hz
17+
container_name: hzserver
18+
restart: unless-stopped
19+
volumes:
20+
- linuxgsm-hz:/data
21+
network_mode: host
22+
23+
volumes:
24+
linuxgsm-hz:

‎docker-compose/docker-compose-pw.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-pw-bind:
5+
image: gameservermanagers/gameserver:pw
6+
# image: ghcr.io/gameservermanagers/gameserver:pw
7+
container_name: pwserver
8+
restart: unless-stopped
9+
volumes:
10+
- /path/to/linuxgsm/pwserver:/data
11+
network_mode: host
12+
13+
# volume example
14+
linuxgsm-pw-volume:
15+
image: gameservermanagers/gameserver:pw
16+
# image: ghcr.io/gameservermanagers/gameserver:pw
17+
container_name: pwserver
18+
restart: unless-stopped
19+
volumes:
20+
- linuxgsm-pw:/data
21+
network_mode: host
22+
23+
volumes:
24+
linuxgsm-pw:

‎docker-compose/docker-compose-q4.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-q4-bind:
5+
image: gameservermanagers/gameserver:q4
6+
# image: ghcr.io/gameservermanagers/gameserver:q4
7+
container_name: q4server
8+
restart: unless-stopped
9+
volumes:
10+
- /path/to/linuxgsm/q4server:/data
11+
network_mode: host
12+
13+
# volume example
14+
linuxgsm-q4-volume:
15+
image: gameservermanagers/gameserver:q4
16+
# image: ghcr.io/gameservermanagers/gameserver:q4
17+
container_name: q4server
18+
restart: unless-stopped
19+
volumes:
20+
- linuxgsm-q4:/data
21+
network_mode: host
22+
23+
volumes:
24+
linuxgsm-q4:

‎docker-compose/docker-compose-sm.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-sm-bind:
5+
image: gameservermanagers/gameserver:sm
6+
# image: ghcr.io/gameservermanagers/gameserver:sm
7+
container_name: smserver
8+
restart: unless-stopped
9+
volumes:
10+
- /path/to/linuxgsm/smserver:/data
11+
network_mode: host
12+
13+
# volume example
14+
linuxgsm-sm-volume:
15+
image: gameservermanagers/gameserver:sm
16+
# image: ghcr.io/gameservermanagers/gameserver:sm
17+
container_name: smserver
18+
restart: unless-stopped
19+
volumes:
20+
- linuxgsm-sm:/data
21+
network_mode: host
22+
23+
volumes:
24+
linuxgsm-sm:

‎docker-compose/docker-compose-squad44.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-squad44-bind:
5+
image: gameservermanagers/gameserver:squad44
6+
# image: ghcr.io/gameservermanagers/gameserver:squad44
7+
container_name: squad44server
8+
restart: unless-stopped
9+
volumes:
10+
- /path/to/linuxgsm/squad44server:/data
11+
network_mode: host
12+
13+
# volume example
14+
linuxgsm-squad44-volume:
15+
image: gameservermanagers/gameserver:squad44
16+
# image: ghcr.io/gameservermanagers/gameserver:squad44
17+
container_name: squad44server
18+
restart: unless-stopped
19+
volumes:
20+
- linuxgsm-squad44:/data
21+
network_mode: host
22+
23+
volumes:
24+
linuxgsm-squad44:

0 commit comments

Comments
 (0)