Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cf3783f2c6 | |||
| 8c462db8b4 | |||
| d734294058 | |||
| 6179b33497 | |||
| ebbec2d238 | |||
| 4f3fe4ed5a | |||
| 155b623901 | |||
| f704208500 | |||
| ec45109bf0 | |||
| 5f3f59b7ae | |||
| 6233dfd73f | |||
| 2fd88169dc | |||
| 67a4e4568d | |||
| 3784a205a1 | |||
| bea7edb0d3 | |||
| 6abee7cb51 | |||
| b80687f67d | |||
| 8c3c1c4096 | |||
| 81bcc049e0 |
@@ -11,36 +11,23 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
ref: main
|
|
||||||
path: .
|
|
||||||
|
|
||||||
- name: Transfer files
|
- name: Copy files to server
|
||||||
uses: burnett01/rsync-deployments@8.0.4
|
uses: appleboy/scp-action@v0.1.7
|
||||||
with:
|
with:
|
||||||
switches: -azvr --delete --exclude=".gitignore" --exclude=".git" --exclude=".gitea" --exclude="data" --exclude=".env"
|
host: ${{ secrets.HOST }}
|
||||||
path: .
|
username: ${{ secrets.USERNAME }}
|
||||||
remote_path: /home/${{ secrets.USERNAME }}/minecraft-server-ironveil
|
key: ${{ secrets.KEY }}
|
||||||
remote_host: ${{ secrets.HOST }}
|
source: "configuration,docker-compose.yml,Dockerfile"
|
||||||
remote_user: ${{ secrets.USERNAME }}
|
target: "/home/${{ secrets.USERNAME }}/minecraft-server-ironveil"
|
||||||
remote_key: ${{ secrets.KEY }}
|
|
||||||
|
|
||||||
- name: Stop container
|
- name: Deploy and restart container
|
||||||
uses: appleboy/ssh-action@v1.2.5
|
uses: appleboy/ssh-action@v1.2.5
|
||||||
with:
|
with:
|
||||||
host: ${{ secrets.host }}
|
host: ${{ secrets.HOST }}
|
||||||
username: ${{ secrets.USERNAME }}
|
username: ${{ secrets.USERNAME }}
|
||||||
key: ${{ secrets.KEY }}
|
key: ${{ secrets.KEY }}
|
||||||
script: |
|
script: |
|
||||||
cd minecraft-server-ironveil
|
cd minecraft-server-ironveil
|
||||||
docker compose down
|
docker compose pull
|
||||||
|
docker compose up -d --force-recreate --build
|
||||||
- name: Start container
|
|
||||||
uses: appleboy/ssh-action@v1.2.5
|
|
||||||
with:
|
|
||||||
host: ${{ secrets.host }}
|
|
||||||
username: ${{ secrets.USERNAME }}
|
|
||||||
key: ${{ secrets.KEY }}
|
|
||||||
script: |
|
|
||||||
cd minecraft-server-ironveil
|
|
||||||
docker compose up -d
|
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
name: Build and Publish Docker Image
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- v[0-9]+.[0-9]+.[0-9]+
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-and-push:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
|
|
||||||
- name: Log in to Docker Hub
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
|
||||||
|
|
||||||
- name: Build and push image
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
push: true
|
|
||||||
tags: ${{ secrets.DOCKER_USERNAME }}/ironveil:${{ github.ref_name }}
|
|
||||||
+2
-1
@@ -1,3 +1,4 @@
|
|||||||
.env
|
.env
|
||||||
world
|
world
|
||||||
modpack
|
modpack*
|
||||||
|
Dockerfile
|
||||||
+11
-8
@@ -1,17 +1,17 @@
|
|||||||
# Use an official OpenJDK 17 image
|
# Use an official OpenJDK 21 image
|
||||||
FROM eclipse-temurin:17-jdk
|
FROM eclipse-temurin:21-jdk
|
||||||
|
|
||||||
# Set working directory
|
# Set working directory
|
||||||
WORKDIR /server
|
WORKDIR /server
|
||||||
|
|
||||||
# Copy server configuration files
|
# Copy modpack files
|
||||||
COPY configuration/. .
|
|
||||||
|
|
||||||
# Copy all modpack related files
|
|
||||||
COPY modpack/. .
|
COPY modpack/. .
|
||||||
|
|
||||||
# Make run.sh executable
|
# Copy configuration files
|
||||||
RUN chmod +x run.sh
|
COPY configuration/. .
|
||||||
|
|
||||||
|
# Make run.sh executable (check if it exists first)
|
||||||
|
RUN chmod +x /server/run.sh
|
||||||
|
|
||||||
# Expose the default Minecraft port (25565)
|
# Expose the default Minecraft port (25565)
|
||||||
EXPOSE 25565
|
EXPOSE 25565
|
||||||
@@ -19,5 +19,8 @@ EXPOSE 25565
|
|||||||
# Expose the default Minecraft RCON port (25575)
|
# Expose the default Minecraft RCON port (25575)
|
||||||
EXPOSE 25575
|
EXPOSE 25575
|
||||||
|
|
||||||
|
# Expose dynmap port
|
||||||
|
EXPOSE 8123
|
||||||
|
|
||||||
# Start the server using run.sh
|
# Start the server using run.sh
|
||||||
ENTRYPOINT ["/server/run.sh"]
|
ENTRYPOINT ["/server/run.sh"]
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"name":"zardzul",
|
||||||
|
"uuid":"9f0f315c-880d-48aa-a786-66ba83dcfb28"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 8.9 KiB |
@@ -1,5 +1,5 @@
|
|||||||
#Minecraft server properties
|
#Minecraft server properties
|
||||||
allow-flight=false
|
allow-flight=true
|
||||||
allow-nether=true
|
allow-nether=true
|
||||||
broadcast-console-to-ops=true
|
broadcast-console-to-ops=true
|
||||||
broadcast-rcon-to-ops=true
|
broadcast-rcon-to-ops=true
|
||||||
@@ -37,7 +37,7 @@ prevent-proxy-connections=false
|
|||||||
pvp=true
|
pvp=true
|
||||||
query.port=25565
|
query.port=25565
|
||||||
rate-limit=0
|
rate-limit=0
|
||||||
rcon.password=
|
rcon.password=vhVesayNmDs3hDy8R9Gdgo3s
|
||||||
rcon.port=25575
|
rcon.port=25575
|
||||||
require-resource-pack=false
|
require-resource-pack=false
|
||||||
resource-pack=
|
resource-pack=
|
||||||
|
|||||||
@@ -1,4 +1,38 @@
|
|||||||
[
|
[
|
||||||
"player1",
|
{
|
||||||
"player2"
|
"name":"zardzul",
|
||||||
|
"uuid":"9f0f315c-880d-48aa-a786-66ba83dcfb28"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name":"CreativeClaws",
|
||||||
|
"uuid":"173c71f5-8de7-4161-bedf-18350b9a7306"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name":"Mango_Rain",
|
||||||
|
"uuid":"917a3cfd-4470-452b-82da-6af9c35832ff"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name":"CerberusGK",
|
||||||
|
"uuid":"92676552-9c9c-4996-ab8f-d2344ec2068a"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name":"c_thijsen",
|
||||||
|
"uuid":"6123dc36-9374-4111-b021-8c04507d380a"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name":"Bongo_catto",
|
||||||
|
"uuid":"549e6c7b-8cfc-4a59-ad9d-6bff338932a9"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name":"Underkun",
|
||||||
|
"uuid":"69132e65-7ffc-4fa2-b8c2-0610eacf36ad"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name":"PenguinLotje",
|
||||||
|
"uuid":"ac06c59b-9f89-4870-889a-3c183b9e6a11"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name":"B4nanaJuice",
|
||||||
|
"uuid":"340a9ec8-fe7a-4209-a9e4-cd5d5ddbf128"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
@@ -1 +0,0 @@
|
|||||||
{"operations":{"getModFileInfo":{"1250591,7575878":{"filename":"14ef06dc-1a65-4611-87d6-c61eea6c8b00.json","expiresAt":"2026-02-12T19:47:13.246183510Z"}},"searchModWithGameIdSlugClassId":{"432,over-stars,4471":{"filename":"3fa6caf4-40e9-4b41-91b0-6d44997753b0.json","expiresAt":"2026-02-10T20:47:13.225100126Z"}}}}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{"gameId":432,"fileName":"OS Serverpack v5.5.zip","gameVersions":["1.20.1","Forge"],"displayName":"OS Serverpack v5.5","sortableGameVersions":[{"gameVersionPadded":"0000000001.0000000020.0000000001","gameVersion":"1.20.1","gameVersionReleaseDate":"2023-06-12T14:26:38.477Z","gameVersionName":"1.20.1","gameVersionTypeId":75125},{"gameVersionPadded":"0","gameVersion":"","gameVersionReleaseDate":"2022-10-01T00:00:00Z","gameVersionName":"Forge","gameVersionTypeId":68441}],"downloadUrl":"https://edge.forgecdn.net/files/7575/878/OS%20Serverpack%20v5.5.zip","fileDate":"2026-02-04T16:40:45.800Z","exposeAsAlternative":null,"modId":1250591,"modules":[{"name":"mods","fingerprint":491038856},{"name":"scripts","fingerprint":2316932191},{"name":"run.bat","fingerprint":4191847801},{"name":"run.sh","fingerprint":3076618596},{"name":"user_jvm_args.txt","fingerprint":1298710358},{"name":"config","fingerprint":733434366},{"name":"global_packs","fingerprint":738911182},{"name":"kubejs","fingerprint":2552288896},{"name":"libraries","fingerprint":2766827340}],"dependencies":[],"fileFingerprint":2501413001,"releaseType":1,"hashes":[{"value":"718e65a9d3e5c2388ca899589f9b857537c68f3a","algo":1},{"value":"11e309d6a626309c3b5f279bc2f987f8","algo":2}],"parentProjectFileId":7566405,"alternateFileId":0,"id":7575878,"fileLength":792979618,"downloadCount":1,"serverPackFileId":null,"serverPack":false,"available":false}
|
|
||||||
-1
File diff suppressed because one or more lines are too long
@@ -1,10 +1,12 @@
|
|||||||
services:
|
services:
|
||||||
ironveil:
|
ironveil:
|
||||||
image: ironveil:latest
|
build: .
|
||||||
container_name: ironveil
|
container_name: ironveil
|
||||||
volumes:
|
volumes:
|
||||||
- ./world:/server/world
|
- ./world:/server/world
|
||||||
|
- ./dynmap:/server/dynmap
|
||||||
ports:
|
ports:
|
||||||
- "25565:25565"
|
- "5101:25565"
|
||||||
- "25575:25575"
|
- "5201:25575"
|
||||||
|
- "5301:8123" # dynmap
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
Reference in New Issue
Block a user