From cc84e835f9604551e598ff00cd7b3b45a4290aaa Mon Sep 17 00:00:00 2001 From: Kjell Winblad Date: Mon, 20 May 2019 14:41:04 +0200 Subject: [PATCH] Refactoring: Update example lists and remove example list duplicates This commit updates the example lists and removes duplicates of the example list. Examples that referred to different branches are also modified. --- advanced_examples/README.md | 14 ++++++++------ advanced_examples/minikube-dist/README.md | 13 +------------ advanced_examples/minikube-prom-graf/README.md | 16 +++------------- advanced_examples/minikube-simple/README.md | 16 +++------------- 4 files changed, 15 insertions(+), 44 deletions(-) diff --git a/advanced_examples/README.md b/advanced_examples/README.md index 14b8a35..a31399c 100644 --- a/advanced_examples/README.md +++ b/advanced_examples/README.md @@ -1,7 +1,9 @@ -# Examples +* [Default Example](../README.md) -* [Using Docker](http://github.com/erlang/docker-erlang-example/) -* [Using Docker: Logstash](http://github.com/erlang/docker-erlang-example/tree/logstash) -* [Using Docker Compose: Logstash/ElasticSearch/Kibana](http://github.com/erlang/docker-erlang-example/tree/elk) -* [Using Minikube: Simple](http://github.com/erlang/docker-erlang-example/tree/minikube-simple) -* [Using Minikube: Prometheus/Grafana](http://github.com/erlang/docker-erlang-example/tree/minikube-prom-graf) +# Advanced Examples + +* [Using Docker: Logstash](logstash/README.md) +* [Using Docker Compose: Logstash/ElasticSearch/Kibana](elk/README.md) +* [Using Minikube: Simple](minikube-simple/README.md) +* [Using Minikube: Prometheus/Grafana](minikube-prom-graf/README.md) +* [Using Minikube: Distributed Erlang](minikube-dist/README.md) \ No newline at end of file diff --git a/advanced_examples/minikube-dist/README.md b/advanced_examples/minikube-dist/README.md index c4b0ae5..076971c 100644 --- a/advanced_examples/minikube-dist/README.md +++ b/advanced_examples/minikube-dist/README.md @@ -8,16 +8,6 @@ node as a base. This is only meant to be an example of how to get started. It is not the only, nor neccesarily the best way to setup minikube with distributed Erlang. -# Other Demos - -* [Using Docker](http://github.com/erlang/docker-erlang-example/) -* [Using Docker: Logstash](http://github.com/erlang/docker-erlang-example/tree/logstash) -* [Using Docker Compose: Logstash/ElasticSearch/Kibana](http://github.com/erlang/docker-erlang-example/tree/elk) -* [Using Minikube: Simple](http://github.com/erlang/docker-erlang-example/tree/minikube-simple) -* [Using Minikube: Prometheus/Grafana](http://github.com/erlang/docker-erlang-example/tree/minikube-prom-graf) -* [Using Minikube: Distributed Erlang](http://github.com/erlang/docker-erlang-example/tree/minikube-dist) -* [Using Minikube: Encrypted Distributed Erlang](http://github.com/erlang/docker-erlang-example/tree/minikube-tls-dist) - # Prerequisites To start with you should familiarize yourself with minikube through this guide: @@ -58,8 +48,7 @@ First however, make sure that the minikube cluster is started: and that you have cloned this repo and checked out this branch: > git clone https://github.com/erlang/docker-erlang-example - > cd docker-erlang-example - > git checkout minikube-dist + > cd docker-erlang-example/advanced_examples/minikube-dist ## Create backend diff --git a/advanced_examples/minikube-prom-graf/README.md b/advanced_examples/minikube-prom-graf/README.md index 380572d..9b6926a 100644 --- a/advanced_examples/minikube-prom-graf/README.md +++ b/advanced_examples/minikube-prom-graf/README.md @@ -9,16 +9,6 @@ This demo assumes that you have done the This is only meant to be an example of how to get started. It is not the only, nor neccesarily the best way to setup minikube with Erlang. -# Other Demos - -* [Using Docker](http://github.com/erlang/docker-erlang-example/) -* [Using Docker: Logstash](http://github.com/erlang/docker-erlang-example/tree/logstash) -* [Using Docker Compose: Logstash/ElasticSearch/Kibana](http://github.com/erlang/docker-erlang-example/tree/elk) -* [Using Minikube: Simple](http://github.com/erlang/docker-erlang-example/tree/minikube-simple) -* [Using Minikube: Prometheus/Grafana](http://github.com/erlang/docker-erlang-example/tree/minikube-prom-graf) -* [Using Minikube: Distributed Erlang](http://github.com/erlang/docker-erlang-example/tree/minikube-dist) -* [Using Minikube: Encrypted Distributed Erlang](http://github.com/erlang/docker-erlang-example/tree/minikube-tls-dist) - # Prerequisites To start with you should familiarize yourself with minikube through this guide: @@ -57,11 +47,11 @@ First however, make sure that the minikube cluster is started: > minikube start -and that you have cloned this repo and checked out this branch: +and that you have cloned this repo and changed to the correct +directory: > git clone https://github.com/erlang/docker-erlang-example - > cd docker-erlang-example - > git checkout minikube-simple + > cd docker-erlang-example/advanced_examples/minikube-simple ## Extend dockerwatch diff --git a/advanced_examples/minikube-simple/README.md b/advanced_examples/minikube-simple/README.md index b06b957..383a06a 100644 --- a/advanced_examples/minikube-simple/README.md +++ b/advanced_examples/minikube-simple/README.md @@ -7,16 +7,6 @@ node. This is only meant to be an example of how to get started. It is not the only, nor neccesarily the best way to setup minikube with Erlang. -# Other Demos - -* [Using Docker](http://github.com/erlang/docker-erlang-example/) -* [Using Docker: Logstash](http://github.com/erlang/docker-erlang-example/tree/logstash) -* [Using Docker Compose: Logstash/ElasticSearch/Kibana](http://github.com/erlang/docker-erlang-example/tree/elk) -* [Using Minikube: Simple](http://github.com/erlang/docker-erlang-example/tree/minikube-simple) -* [Using Minikube: Prometheus/Grafana](http://github.com/erlang/docker-erlang-example/tree/minikube-prom-graf) -* [Using Minikube: Distributed Erlang](http://github.com/erlang/docker-erlang-example/tree/minikube-dist) -* [Using Minikube: Encrypted Distributed Erlang](http://github.com/erlang/docker-erlang-example/tree/minikube-tls-dist) - # Prerequisites To start with you should familiarize yourself with minikube through this guide: @@ -53,11 +43,11 @@ First however, make sure that the minikube cluster is started: > minikube start -and that you have cloned this repo and checked out this branch: +and that you have cloned this repo and changed to the correct +directory: > git clone https://github.com/erlang/docker-erlang-example - > cd docker-erlang-example - > git checkout minikube-simple + > cd docker-erlang-example/advanced_examples/minikube-simple ## Create a Service