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

Corrections for Wiki path

Browse Source
This commit is contained in:
Marwolf
2018-07-12 15:50:34 -04:00
parent 2e9c422888
commit 0da22ddd1a
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@@ -14,7 +14,7 @@ restart: init
clone: clone:
@$(shell git clone https://github.com/Open-RSC/Website.git) @$(shell git clone https://github.com/Open-RSC/Website.git)
@$(shell git clone https://github.com/Open-RSC/Game.git) @$(shell git clone https://github.com/Open-RSC/Game.git)
@$(shell git clone https://github.com/Open-RSC/Wiki.git) @$(shell cd Website && git clone https://github.com/Open-RSC/Wiki.git)
#@$(shell sudo chmod -R 777 Website && sudo chmod -R 777 Game && sudo chmod 644 Website/board/config.php) #@$(shell sudo chmod -R 777 Website && sudo chmod -R 777 Game && sudo chmod 644 Website/board/config.php)
clone-windows-website: clone-windows-website:
@@ -26,17 +26,17 @@ clone-windows-game:
#icacls Game /grant Everyone:F /t #icacls Game /grant Everyone:F /t
clone-windows-wiki: clone-windows-wiki:
@git clone https://github.com/Open-RSC/Wiki.git @git clone https://github.com/Open-RSC/Wiki.git Website/Wiki
pull: pull:
@$(shell cd Website && git pull) @$(shell cd Website && git pull)
@$(shell cd Game && git pull) @$(shell cd Game && git pull)
@$(shell cd Wiki && git pull) @$(shell cd Website/Wiki && git pull)
pull-windows: pull-windows:
@cd Website && git pull @cd Website && git pull
@cd Game && git pull @cd Game && git pull
@cd Wiki && git pull @cd Website/Wiki && git pull
logs: logs:
@docker-compose logs -f @docker-compose logs -f
@@ -60,21 +60,20 @@ import:
@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_logs.sql 2>/dev/null @docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_logs.sql 2>/dev/null
@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc.sql 2>/dev/null @docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc.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 @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)" < 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: import-windows:
@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_logs.sql @docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < 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"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < 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"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc.sql
@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
@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < 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 && rm -rf Wiki) @$(shell rm -rf Website && rm -rf Game)
flush-windows: flush-windows:
@rmdir "Website" /s /Q @rmdir "Website" /s /Q
@rmdir "Game" /s /Q @rmdir "Game" /s /Q
@rmdir "Wiki" /s /Q
.PHONY: clean test code-sniff init .PHONY: clean test code-sniff init

2
docker-compose.yml
View File

@@ -6,7 +6,6 @@ services:
- "./etc/nginx/default.conf:/etc/nginx/conf.d/default.conf" - "./etc/nginx/default.conf:/etc/nginx/conf.d/default.conf"
- "./etc/ssl:/etc/ssl" - "./etc/ssl:/etc/ssl"
- "./Website:/var/www/html/public" - "./Website:/var/www/html/public"
- "./Wiki:/var/www/html/public/wiki"
- "./etc/nginx/default.template.conf:/etc/nginx/conf.d/default.template" - "./etc/nginx/default.template.conf:/etc/nginx/conf.d/default.template"
ports: ports:
- "80:80" - "80:80"
@@ -24,7 +23,6 @@ services:
volumes: volumes:
- "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini" - "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini"
- "./Website:/var/www/html/public" - "./Website:/var/www/html/public"
- "./Wiki:/var/www/html/public/wiki"
myadmin: myadmin:
image: phpmyadmin/phpmyadmin image: phpmyadmin/phpmyadmin
container_name: phpmyadmin container_name: phpmyadmin