Inline IDs and ports in compose.yml

This commit is contained in:
2026-01-15 20:05:40 +00:00
parent f140fb67a5
commit db31a6d35e
2 changed files with 9 additions and 15 deletions

View File

@@ -1,9 +1,3 @@
PUID=1000
PGID=1000
VELOCITY_PORT=25565
MAP_PORT=8100
RCON_PASSWORD=ChangeMe RCON_PASSWORD=ChangeMe
FORWARDING_SECRET=ChangeMe FORWARDING_SECRET=ChangeMe

View File

@@ -2,7 +2,7 @@ services:
velocity: velocity:
image: itzg/mc-proxy:java21-2025.1.0 image: itzg/mc-proxy:java21-2025.1.0
container_name: illegal_crime_velocity container_name: illegal_crime_velocity
user: "${PUID}:${PGID}" user: 2015:2015 # minecraft_server:minecraft_server
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
fabric: fabric:
@@ -26,7 +26,7 @@ services:
illegal_crime_mc_network: illegal_crime_mc_network:
ipv4_address: "10.100.1.3" ipv4_address: "10.100.1.3"
ports: ports:
- "${VELOCITY_PORT}:25565/tcp" - 25000:25565
volumes: volumes:
- ./velocity/data:/server:rw - ./velocity/data:/server:rw
- ./velocity/config:/config:ro - ./velocity/config:/config:ro
@@ -64,7 +64,7 @@ services:
bluemap: bluemap:
image: ghcr.io/bluemap-minecraft/bluemap:v5.7 image: ghcr.io/bluemap-minecraft/bluemap:v5.7
container_name: illegal_crime_bluemap container_name: illegal_crime_bluemap
user: "${PUID}:${PGID}" user: 2015:2015 # minecraft_server:minecraft_server
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
fabric: fabric:
@@ -78,7 +78,7 @@ services:
illegal_crime_mc_network: illegal_crime_mc_network:
ipv4_address: "10.100.1.6" ipv4_address: "10.100.1.6"
ports: ports:
- "${MAP_PORT}:8100/tcp" - 8100:8100
volumes: volumes:
- ./bluemap/data:/app/data:rw - ./bluemap/data:/app/data:rw
- ./bluemap/web:/app/web:rw - ./bluemap/web:/app/web:rw
@@ -112,8 +112,8 @@ services:
- ./schematics:/data/plugins/WorldEdit/schematics:rw - ./schematics:/data/plugins/WorldEdit/schematics:rw
- ./bluemap/maps:/data/bluemap/web/maps:rw - ./bluemap/maps:/data/bluemap/web/maps:rw
environment: environment:
UID: "${PUID}" UID: 2015 # minecraft_server
GID: "${PGID}" GID: 2015 # minecraft_server
EULA: true EULA: true
TYPE: PAPER TYPE: PAPER
@@ -205,8 +205,8 @@ services:
- ./schematics:/data/config/worldedit/schematics:rw - ./schematics:/data/config/worldedit/schematics:rw
- ./bluemap/maps:/data/bluemap/web/maps:rw - ./bluemap/maps:/data/bluemap/web/maps:rw
environment: environment:
UID: "${PUID}" UID: 2015 # minecraft_server
GID: "${PGID}" GID: 2015 # minecraft_server
EULA: true EULA: true
TYPE: FABRIC TYPE: FABRIC
@@ -294,7 +294,7 @@ services:
luckperms_db: luckperms_db:
image: postgres:17.4 image: postgres:17.4
container_name: illegal_crime_luckperms_db container_name: illegal_crime_luckperms_db
user: "${PUID}:${PGID}" user: 2015:2015 # minecraft_server:minecraft_server
restart: unless-stopped restart: unless-stopped
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U luckperms -d luckperms"] test: ["CMD-SHELL", "pg_isready -U luckperms -d luckperms"]