- Updating all dependencies to their latest non-beta versions (except for junit, as junit 5 is significantly different from junit4) - Converted the log4j configuration as the XML format changed. Switched the rolling appenders to random access rolling appenders and turned on asynchronous logging, as this is supposed to be dramatically faster in all cases. - Altered some DB POJO classes whose field names did not match exactly, as fastjson is now more strict about capitalization - Altered JSON deserialization of arrays to use modern APIs which are much more readable - Minor improvements to the Docker setup, including automatic working directory movement
78 lines
1.8 KiB
YAML
78 lines
1.8 KiB
YAML
version: "3.4"
|
|
|
|
services:
|
|
|
|
build:
|
|
env_file:
|
|
- .env
|
|
container_name: ${APP_CONTAINER_NAME}
|
|
build:
|
|
context: .
|
|
dockerfile: gemp_app.Dockerfile
|
|
image: gemp_app
|
|
expose:
|
|
- "80"
|
|
- "8080"
|
|
restart: always
|
|
ports:
|
|
# target means in the container
|
|
- target: 80
|
|
# published is what's on the host machine
|
|
published: "${APP_PORT}"
|
|
#These are the ports used for remote debugging the JRE
|
|
- target: 8000
|
|
published: 8052
|
|
volumes:
|
|
- type: bind
|
|
source: ../gemp-lotr-async/src/main/web
|
|
target: /etc/gemp-lotr/web
|
|
- type: bind
|
|
source: ../../gemp-lotr
|
|
target: /etc/gemp-lotr
|
|
- type: bind
|
|
source: ../../logs
|
|
target: /logs
|
|
- type: bind
|
|
source: ../../replay
|
|
target: /replay
|
|
- type: bind
|
|
source: ../../logs/nohup.out
|
|
target: /etc/gemp-lotr/nohup.out
|
|
networks:
|
|
gemp_net_1:
|
|
ipv4_address: ${APP_IP}
|
|
tty: true
|
|
command: nohup java -jar -Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector /etc/gemp-lotr/gemp-lotr-async/target/web.jar &> /logs/nohup.out &
|
|
|
|
|
|
db:
|
|
env_file:
|
|
- .env
|
|
container_name: ${DB_CONTAINER_NAME}
|
|
build:
|
|
context: ..
|
|
dockerfile: docker/gemp_db.Dockerfile
|
|
image: gemp_db
|
|
ports:
|
|
# target means in the container
|
|
- target: 3306
|
|
# published is what's on the host machine
|
|
published: "${DB_PORT}"
|
|
restart: always
|
|
volumes:
|
|
- type: bind
|
|
source: ../../database
|
|
target: /var/lib/mysql
|
|
networks:
|
|
gemp_net_1:
|
|
ipv4_address: ${DB_IP}
|
|
|
|
|
|
networks:
|
|
gemp_net_1:
|
|
ipam:
|
|
driver: default
|
|
config:
|
|
- subnet: 172.28.${SERVID}.0/24
|
|
attachable: true
|