SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to docker-compose and consul UI

Browse Source 
The UI got hosed by a grep/replace so mainly this reverts that change.
Plus describe getting started experience in terms of docker-compose.
This commit is contained in:
Dave Syer
2016-02-05 11:14:27 +00:00
parent 8e4d101b16
commit 3912743d77
4 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
README.adoc
View File

@@ -33,14 +33,13 @@ See the https://consul.io/intro/index.html[intro] for more information.
== Running the sample
1. https://consul.io/downloads.html[Install consul]
2. Run `./src/main/bash/local_run_consul.sh`
3. Verify consul is running by visiting http://localhost:8500
4. Run `mvn --settings .settings.xml package` this will bring in the required spring cloud maven repositories and build
5. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar`
6. visit http://localhost:8080, verify that `{"serviceId":"<yourhost>:8080","host":"<yourhost>","port":8080}` results
7. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar --server.port=8081`
8. visit http://localhost:8080 again, verify that `{"serviceId":"<yourhost>:8081","host":"<yourhost>","port":8081}` eventually shows up in the results in a round robbin fashion (may take a minute or so).
1. Run `docker-compose up`
2. Verify consul is running by visiting http://localhost:8500
3. Run `mvn package` this will bring in the required spring cloud maven repositories and build
4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar`
5. visit http://localhost:8080, verify that `{"serviceId":"<yourhost>:8080","host":"<yourhost>","port":8080}` results
6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar --server.port=8081`
7. visit http://localhost:8080 again, verify that `{"serviceId":"<yourhost>:8081","host":"<yourhost>","port":8081}` eventually shows up in the results in a round robbin fashion (may take a minute or so).
== Building

4
docker-compose.yml
View File

@@ -8,5 +8,5 @@ consul:
ports:
- "8400:8400"
- "8500:8500"
- "8600:53/udp"
command: -server -bootstrap -data-dir /data -ui-dir /ui
- "8600:8600"
command: -server -bootstrap -data-dir /data -ui-dir /ui

15
docs/src/main/asciidoc/README.adoc
View File

@@ -24,14 +24,13 @@ See the https://consul.io/intro/index.html[intro] for more information.
== Running the sample
1. https://consul.io/downloads.html[Install consul]
2. Run `./src/main/bash/local_run_consul.sh`
3. Verify consul is running by visiting http://localhost:8500
4. Run `mvn --settings .settings.xml package` this will bring in the required spring cloud maven repositories and build
5. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar`
6. visit http://localhost:8080, verify that `{"serviceId":"<yourhost>:8080","host":"<yourhost>","port":8080}` results
7. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar --server.port=8081`
8. visit http://localhost:8080 again, verify that `{"serviceId":"<yourhost>:8081","host":"<yourhost>","port":8081}` eventually shows up in the results in a round robbin fashion (may take a minute or so).
1. Run `docker-compose up`
2. Verify consul is running by visiting http://localhost:8500
3. Run `mvn package` this will bring in the required spring cloud maven repositories and build
4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar`
5. visit http://localhost:8080, verify that `{"serviceId":"<yourhost>:8080","host":"<yourhost>","port":8080}` results
6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar --server.port=8081`
7. visit http://localhost:8080 again, verify that `{"serviceId":"<yourhost>:8081","host":"<yourhost>","port":8081}` eventually shows up in the results in a round robbin fashion (may take a minute or so).
== Building

4
src/test/resources/consul_ui/static/application.min.js vendored
View File

File diff suppressed because one or more lines are too long