diff --git a/Makefile b/Makefile index 85ec42b..70a370c 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ help: @echo "usage: make COMMAND" @echo "" @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 " pull Get the latest git repository updates" @echo " start Create and start containers" @@ -23,18 +23,6 @@ help: @echo " flush Delete local git repository folders" @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 docker-compose up -d diff --git a/README.md b/README.md index a8a3869..5c10621 100644 --- a/README.md +++ b/README.md @@ -59,10 +59,10 @@ ___ ## Run the application -1. Perform first time setup and start the Docker application: +1. Start the Docker application: ```sh - sudo make first + sudo make start ``` **Please wait this might take a several minutes...** @@ -71,6 +71,18 @@ ___ 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: * [http://localhost](http://localhost/) @@ -118,7 +130,7 @@ ___ | Name | Description | |---------------|-----------------------------------------------| -| first | Perform first time setup and start containers | +| first | Perform first time setup | | clone | Clone the git repository folders | | pull | Get the latest git repository updates | | start | Create and start containers |