diff --git a/.travis.yml b/.travis.yml index 7c48ac7..c826d34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,5 @@ sudo: required -language: java -jdk: - - oraclejdk8 - - oraclejdk9 - - oraclejdk10 - - openjdk8 - - openjdk9 - - openjdk10 - - openjdk11 + env: DOCKER_COMPOSE_VERSION: 1.22.0 @@ -15,30 +7,12 @@ services: - docker before_install: - - sudo make clone-game - - sudo chmod -R 777 Game - - sudo make clone-website - - sudo make clone-website - - sudo chmod -R 777 Website - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin - docker-compose -v - docker -v - - sudo service mysql stop script: - sudo make start - docker-compose -f docker-compose.yml ps - - cd Game - - cd Databases - - docker exec -i $(docker-compose ps -q mysqldb) mysql -u"root" -p"root" < openrsc_config.sql 2>/dev/null - - docker exec -i $(docker-compose ps -q mysqldb) mysql -u"root" -p"root" < openrsc_logs.sql 2>/dev/null - - docker exec -i $(docker-compose ps -q mysqldb) mysql -u"root" -p"root" < openrsc.sql 2>/dev/null - - docker exec -i $(docker-compose ps -q mysqldb) mysql -u"root" -p"root" < openrsc_tools.sql 2>/dev/null - - cd .. - - cd .. - - cd Website - - docker exec -i $(docker-compose ps -q mysqldb) mysql -u"root" -p"root" < openrsc_forum.sql 2>/dev/null - - cd .. - - sudo ant -f Game/server/build.xml compile diff --git a/README.md b/README.md index f05aab0..fc5c65b 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,10 @@ -# Open RSC Docker Home +# Open RSC Docker Home [![Build Status](https://travis-ci.org/Open-RSC/Docker-Home.svg?branch=master)](https://travis-ci.org/Open-RSC/Docker-Home) An easy to run RSC private server environment using Docker that works in Windows, Mac, and Linux. Choices: 1. Single player RSC game + basic database editing (PHPMyAdmin) 2. Game + Website + PHPMyAdmin - 3. Game + Website + PHPMyAdmin + RSC Preservation Wiki ___ @@ -61,7 +60,6 @@ ___ * [http://localhost](http://localhost/) (username: Marwolf, password: malware) * [http://localhost:8080](http://localhost:8080/) PHPMyAdmin (username: root, password: root) - * [http://localhost/wiki](http://localhost/wiki) (username: Marwolf, password: openrscpassword) 3. Start the game's Docker containers, then run the game server and client: