diff --git a/Makefile b/Makefile index 4737eb9..08295a7 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,10 @@ MYSQL_DUMPS_DIR=./data/db -start: init - docker-compose up -d --remove-orphans +start: + docker-compose -f docker-compose.yml up --force-recreate --remove-orphans --detach + +start-single-player: + docker-compose -f docker-compose-single-player.yml up --force-recreate --remove-orphans --detach stop: @docker-compose down -v diff --git a/Setup_Linux_Mac.sh b/Setup_Linux_Mac.sh index 36d3460..26a23ed 100755 --- a/Setup_Linux_Mac.sh +++ b/Setup_Linux_Mac.sh @@ -459,7 +459,7 @@ if [ "$choice" == "1" ]; then echo "" sudo make stop echo "" - sudo make start + sudo make start-single-player echo "" echo "" echo "Fetching the Game from the Open RSC git repo." diff --git a/Setup_Windows.cmd b/Setup_Windows.cmd index 9f2c956..0b90b99 100644 --- a/Setup_Windows.cmd +++ b/Setup_Windows.cmd @@ -185,11 +185,6 @@ echo: make stop echo: echo: -echo Starting Docker containers and downloading what is needed. This may take a while the first time. -echo: -make start -echo: -echo: :edition echo: @@ -213,6 +208,12 @@ goto edition :game echo: +echo Starting Docker containers and downloading what is needed. This may take a while the first time. +echo: +make stop +make start-single-player +echo: +echo: echo Downloading a copy of the Game repository echo: make clone-windows-game @@ -229,6 +230,12 @@ goto final :gameweb echo: +echo Starting Docker containers and downloading what is needed. This may take a while the first time. +echo: +make stop +make start +echo: +echo: echo Downloading a copy of the Website repository echo: make clone-windows-website diff --git a/docker-compose-single-player.yml b/docker-compose-single-player.yml new file mode 100644 index 0000000..987fb27 --- /dev/null +++ b/docker-compose-single-player.yml @@ -0,0 +1,29 @@ +version: '3.1' +services: + + myadmin: + image: phpmyadmin/phpmyadmin + container_name: phpmyadmin + ports: + - "9000:80" + environment: + - PMA_ARBITRARY=1 + - PMA_HOST=mysql + restart: always + depends_on: + - mysqldb + + mysqldb: + image: mariadb:10.3.8 + container_name: mysql + restart: always + environment: + - MYSQL_DATABASE=test + - MYSQL_ROOT_PASSWORD=root + - MYSQL_USER=dev + - MYSQL_PASSWORD=dev + ports: + - "127.0.0.1:3306:3306" + volumes: + - "./data/db/mysql:/var/lib/mysql" + - "./etc/mariadb/innodb-fix.cnf:/etc/mysql/conf.d/innodb-fix.cnf"