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

Tweaks and readme update

Browse Source
This commit is contained in:
Marwolf
2018-07-06 20:08:04 -04:00
parent 73d2fbc50a
commit cb31138f1c
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@@ -10,7 +10,7 @@ help:
@echo "usage: make COMMAND" @echo "usage: make COMMAND"
@echo "" @echo ""
@echo "Commands:" @echo "Commands:"
@echo " first Perform first time setup and start containers" @echo " first Perform first time setup"
@echo " clone Clone the git repository folders" @echo " clone Clone the git repository folders"
@echo " pull Get the latest git repository updates" @echo " pull Get the latest git repository updates"
@echo " start Create and start containers" @echo " start Create and start containers"
@@ -23,18 +23,6 @@ help:
@echo " flush Delete local git repository folders" @echo " flush Delete local git repository folders"
@echo "" @echo ""
first: init
docker-compose up -d
@$(shell cd Website && git clone https://github.com/Marwolf/Open-RSC-Website.git)
@$(shell mkdir Game && cd Game && git clone https://github.com/Marwolf/Open-RSC-Game.git)
@$(shell sudo chmod -R 777 Website/Open-RSC-Website && sudo chmod -R 777 Game/Open-RSC-Game && sudo chmod 644 Website/Open-RSC-Website/board/config.php)
@$(shell cd Website/Open-RSC-Website && git pull)
@$(shell cd Game/Open-RSC-Game && git pull)
@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Open-RSC-Game/Databases/openrsc_config.sql 2>/dev/null
@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Open-RSC-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/Open-RSC-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/Open-RSC-Website/openrsc_forum.sql 2>/dev/null
start: init start: init
docker-compose up -d docker-compose up -d

18
README.md
View File

@@ -59,10 +59,10 @@ ___
## Run the application ## Run the application
1. Perform first time setup and start the Docker application: 1. Start the Docker application:
```sh ```sh
sudo make first sudo make start
``` ```
**Please wait this might take a several minutes...** **Please wait this might take a several minutes...**
@@ -71,6 +71,18 @@ ___
sudo make logs # Follow log output sudo make logs # Follow log output
``` ```
2. Clone the git repository:
```sh
sudo make clone
```
3. Import the databases:
```sh
sudo make import
```
2. Open your favorite browser: 2. Open your favorite browser:
* [http://localhost](http://localhost/) * [http://localhost](http://localhost/)
@@ -118,7 +130,7 @@ ___
| Name | Description | | Name | Description |
|---------------|-----------------------------------------------| |---------------|-----------------------------------------------|
| first | Perform first time setup and start containers | | first | Perform first time setup |
| clone | Clone the git repository folders | | clone | Clone the git repository folders |
| pull | Get the latest git repository updates | | pull | Get the latest git repository updates |
| start | Create and start containers | | start | Create and start containers |