diff --git a/.gitignore b/.gitignore index fb73635..fd58cd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /proxy/* /server1/* /server2/* +/mysql/* docker-compose.override.yml diff --git a/docker-compose.yml b/docker-compose.yml index 442e841..377ef9f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,4 +19,13 @@ services: ports: - 25577:25577 stdin_open: true # docker run -i - tty: true # docker run -t \ No newline at end of file + tty: true # docker run -t + mysql: + image: mysql + volumes: + - $PWD/mysql:/var/lib/mysql + environment: + - MYSQL_ROOT_PASSWORD=TRUSTNO1 + - MYSQL_DATABASE=minecraft + - MYSQL_USER=minecraft + - MYSQL_PASSWORD=trustno1 diff --git a/mysql/.keep b/mysql/.keep new file mode 100644 index 0000000..e69de29 diff --git a/papermc/Dockerfile b/papermc/Dockerfile index 46a81e3..6425ee4 100644 --- a/papermc/Dockerfile +++ b/papermc/Dockerfile @@ -1,11 +1,12 @@ ARG JAVA_VERSION=17 FROM openjdk:${JAVA_VERSION} ARG JAVA_VERSION -ARG VERSION=1.18.2 -ARG BUILD=379 +ARG VERSION=1.19 +ARG BUILD=experimental-4 ARG PROJECT_URL=https://api.papermc.io/v2/projects/paper ARG JAR=paper-${VERSION}-${BUILD}.jar -ARG DOWNLOAD_URL=${PROJECT_URL}/versions/${VERSION}/builds/${BUILD}/downloads/${JAR} +#ARG DOWNLOAD_URL=${PROJECT_URL}/versions/${VERSION}/builds/${BUILD}/downloads/${JAR} +ARG DOWNLOAD_URL=https://files.eim.one/${JAR} RUN mkdir -p /srv/paper/data WORKDIR /srv/paper ADD start.sh start.sh diff --git a/reset.sh b/reset.sh index 9e69aef..976b520 100755 --- a/reset.sh +++ b/reset.sh @@ -1,4 +1,4 @@ #! /bin/bash -rm -rf server1 server2 proxy -mkdir server1 server2 proxy -touch server1/.keep server2/.keep proxy/.keep \ No newline at end of file +rm -rf server1 server2 proxy mysql +mkdir server1 server2 proxy mysql +touch server1/.keep server2/.keep proxy/.keep mysql/.keep \ No newline at end of file