diff --git a/README.md b/README.md index 4f0fca18a1..3ebee246aa 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Execute the [DDL files][DDL] to create the required repository tables in **where 2. Put a few 3rd-party jar files to **wherehows-etl/extralibs** directory. Some of these jar files may not be available in Maven Central or Artifactory. See [the download instrucitons][EXJAR] for more detail. ```cd WhereHows/wherehows-etl/extralibs``` 3. From the **WhereHows** root directory and build all the modules: ```./gradlew build``` 4. Start the metadata ETL and API service: ```./gradlew wherehows-backend:runPlayBinary``` -5. In a new terminal, start the web front-end: ```./gradlew wherehows-frontend:runPlayBinary```. The WhereHows UI is available at http://localhost:9000 by default. You can change the port number by editing the value of ```project.ext.httpPort``` in ```wherehows-frontend/build.gradle```. +5. In a new terminal, start the web front-end: ```./gradlew wherehows-frontend:runPlayBinary```. The WhereHows UI is available at http://localhost:9001 by default. You can change the port number by editing the value of ```project.ext.httpPort``` in ```wherehows-frontend/build.gradle```. ## Roadmap diff --git a/wherehows-backend/build.gradle b/wherehows-backend/build.gradle index 929b4dfd48..1ae10a5795 100644 --- a/wherehows-backend/build.gradle +++ b/wherehows-backend/build.gradle @@ -1,7 +1,7 @@ apply from: '../gradle/scripts/play.gradle' // Change this to listen on a different port -project.ext.httpPort = 19000 +project.ext.httpPort = 19001 project.ext.playBinaryBaseName = "wherehows-backend" dependencies { diff --git a/wherehows-docker/README.md b/wherehows-docker/README.md index a9e4d5ee43..11dfa7f915 100644 --- a/wherehows-docker/README.md +++ b/wherehows-docker/README.md @@ -9,8 +9,8 @@ Through the docker build provides a whole server instance running in docker cont 1. From the wherehows-docker, run ```build.sh 1``` 1. Edit .env to match your environment 1. From the docker directory: ```$ docker-compose up``` -1. In your local browser, open http://localhost:9000 -1. The backend app is hosted on http://localhost:9001 +1. In your local browser, open http://localhost:9001 +1. The backend app is hosted on http://localhost:19001 1. The Elasticsearch server is hosted on http://localhost:9200 If any step fails in the script, you can run individual steps in it, the script is pretty intuitive and has comments. @@ -78,7 +78,7 @@ Successfully tagged linkedin/wherehows-elasticsearch:latest now run this to start the application: docker-compose up ``` - + ## Run Docker Container ``` @@ -98,16 +98,16 @@ Attaching to wherehowsdocker_wherehows-elasticsearch_1, wherehowsdocker_wherehow wherehows-backend_1 | 2017-08-01 16:57:16 INFO application:146 - Terminating KafkaConsumerMaster... wherehows-backend_1 | 2017-08-01 16:57:16 INFO application:65 - Enabled jobs: [] wherehows-backend_1 | 2017-08-01 16:57:16 INFO p.a.Play:97 - Application started (Prod) -wherehows-backend_1 | 2017-08-01 16:57:17 INFO p.c.s.NettyServer:165 - Listening for HTTP on /0.0.0.0:9000 +wherehows-backend_1 | 2017-08-01 16:57:17 INFO p.c.s.NettyServer:165 - Listening for HTTP on /0.0.0.0:19001 ``` ## Running Servers Ensure all docker container instances are up and running - Frontend app: - ```http://localhost:9000``` -- Backend app: ```http://localhost:9001``` +- Backend app: + ```http://localhost:19001``` - Elasticsearch server: ```http://localhost:9200``` - MySQL server: diff --git a/wherehows-docker/docker-compose.yml b/wherehows-docker/docker-compose.yml index 4f1ef0e137..08fb86ee22 100644 --- a/wherehows-docker/docker-compose.yml +++ b/wherehows-docker/docker-compose.yml @@ -21,7 +21,7 @@ services: wherehows-backend: image: "linkedin/wherehows-backend:latest" ports: - - 9001:9000 + - 19001:19001 environment: WHZ_SECRET: ${WHZ_SECRET} WHZ_DB_USERNAME: ${WHZ_DB_USERNAME} @@ -33,7 +33,7 @@ services: wherehows-frontend: image: "linkedin/wherehows-frontend:latest" ports: - - 9000:9000 + - 9001:9001 environment: WHZ_SECRET: ${WHZ_SECRET} WHZ_DB_USERNAME: ${WHZ_DB_USERNAME} diff --git a/wherehows-frontend/README.md b/wherehows-frontend/README.md index e0b9de0e1d..749f0ff72a 100644 --- a/wherehows-frontend/README.md +++ b/wherehows-frontend/README.md @@ -94,7 +94,7 @@ NettyServer.main is deprecated. Please start your Play server with the ``` -Open browser to ```http://:9000/``` +Open browser to ```http://:9001/``` This will show WhereHows login page. ## Troubleshooting diff --git a/wherehows-frontend/build.gradle b/wherehows-frontend/build.gradle index 7314a55231..36e68d7870 100644 --- a/wherehows-frontend/build.gradle +++ b/wherehows-frontend/build.gradle @@ -1,7 +1,7 @@ apply from: '../gradle/scripts/play.gradle' // Change this to listen on a different port -project.ext.httpPort = 9000 +project.ext.httpPort = 9001 project.ext.playBinaryBaseName = "wherehows-frontend" configurations {