H-O-O-T-S/Open-RSC-Docker-Home
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12 from Marwolf/master

Browse Source 
Corrections needed for single player on Windows
This commit is contained in:
Marwolf
2018-08-15 08:26:45 -04:00
committed by GitHub
parent 7281e89a7f b3f5247a55
commit fb8a0fc73e
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -78,19 +78,19 @@ import-website:
#@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/openrsc_forum.sql 2>/dev/null #@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/openrsc_forum.sql 2>/dev/null
import-wiki: import-wiki:
@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/Wiki/openrsc_wiki.sql 2>/dev/null #@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/Wiki/openrsc_wiki.sql 2>/dev/null
import-windows-game: import-windows-game:
@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_logs.sql @docker exec -i mysql mysql -u"root" -p"root" < Game/Databases/openrsc_logs.sql
@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_config.sql @docker exec -i mysql mysql -u"root" -p"root" < Game/Databases/openrsc_config.sql
@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc.sql @docker exec -i mysql mysql -u"root" -p"root" < Game/Databases/openrsc.sql
@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_tools.sql @docker exec -i mysql mysql -u"root" -p"root" < Game/Databases/openrsc_tools.sql
import-windows-website: import-windows-website:
#@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/openrsc_forum.sql #@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/openrsc_forum.sql
import-windows-wiki: import-windows-wiki:
@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/Wiki/openrsc_wiki.sql #@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/Wiki/openrsc_wiki.sql
flush: flush:
@$(shell rm -rf Website && rm -rf Game) @$(shell rm -rf Website && rm -rf Game)

5
Windows_Installer.cmd
View File

@@ -259,6 +259,7 @@ md "%HOMEPATH%/OpenRSC"
7z x "Game/client/cache.zip" -o"%HOMEPATH%/OpenRSC" 7z x "Game/client/cache.zip" -o"%HOMEPATH%/OpenRSC"
echo: echo:
echo: echo:
echo First time setup is now complete. Go ahead and open "Start_Single_Player_Game_Windows.cmd" now. SET /P singleplayer=Ready to launch "Windows_Single_Player.cmd" - Press enter when ready.
echo: echo:
pause echo:
Windows_Single_Player.cmd

2
docker-compose-single-player.yml
View File

@@ -26,4 +26,4 @@ services:
- "127.0.0.1:3306:3306" - "127.0.0.1:3306:3306"
volumes: volumes:
- "./data/db/mysql:/var/lib/mysql" - "./data/db/mysql:/var/lib/mysql"
- "./etc/mariadb/innodb-fix.cnf:/etc/mysql/conf.d/innodb-fix.cnf" - "./etc/mariadb/innodb-fix.cnf:/etc/mysql/conf.d/innodb.cnf"

2
docker-compose.yml
View File

@@ -67,7 +67,7 @@ services:
- "127.0.0.1:3306:3306" - "127.0.0.1:3306:3306"
volumes: volumes:
- "./data/db/mysql:/var/lib/mysql" - "./data/db/mysql:/var/lib/mysql"
- "./etc/mariadb/innodb-fix.cnf:/etc/mysql/conf.d/innodb-fix.cnf" - "./etc/mariadb/innodb-fix.cnf:/etc/mysql/conf.d/innodb.cnf"
# logging: # logging:
# driver: splunk # driver: splunk
# options: # options:

0
etc/mariadb/innodb-fix.cnf → etc/mariadb/innodb.cnf
View File