From 52c2bc2ded912e78cbcf0183c3f4101f7c360da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alo=C3=AFs=20Micard?= <alois@micard.lu>
Date: Wed, 12 Aug 2020 12:00:22 +0200
Subject: [PATCH] Create docker subfolder in build/ & deployments/

---
 README.md                                   | 6 ++++--
 build/{ => docker}/Dockerfile-api           | 0
 build/{ => docker}/Dockerfile-crawler       | 0
 build/{ => docker}/Dockerfile-feeder        | 0
 build/{ => docker}/Dockerfile-persister     | 0
 build/{ => docker}/Dockerfile-scheduler     | 0
 deployments/{ => docker}/docker-compose.yml | 0
 scripts/build.sh                            | 4 ++--
 scripts/delete.sh                           | 2 +-
 scripts/exec.sh                             | 2 +-
 scripts/log.sh                              | 2 +-
 scripts/ps.sh                               | 2 +-
 scripts/start.sh                            | 2 +-
 13 files changed, 11 insertions(+), 9 deletions(-)
 rename build/{ => docker}/Dockerfile-api (100%)
 rename build/{ => docker}/Dockerfile-crawler (100%)
 rename build/{ => docker}/Dockerfile-feeder (100%)
 rename build/{ => docker}/Dockerfile-persister (100%)
 rename build/{ => docker}/Dockerfile-scheduler (100%)
 rename deployments/{ => docker}/docker-compose.yml (100%)

diff --git a/README.md b/README.md
index 11f074b..582ae65 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ Since the docker image are not available yet, one must run the following script
 # How to start the crawler
 
 Execute the ``/scripts/start.sh`` and wait for all containers to start.
+You can start the crawler in detached mode by passing --detach to start.sh
 
 ## Note
 
@@ -37,8 +38,9 @@ feeder --api-uri http://localhost:15005 --url https://www.facebookcorewwwi.onion
 
 this will 'force' the API to publish given URL in crawling queue.
 
-## How to access the Kibana UI
+## How to view results
 
-Now head out to http://localhost:15004
+At the moment there is no Trandoshan dashboard.
+You can use the Kibana dashboard available at http://localhost:15004.
 
 You will need to create an index pattern named 'resources', and when it asks for the time field, choose 'time'.
diff --git a/build/Dockerfile-api b/build/docker/Dockerfile-api
similarity index 100%
rename from build/Dockerfile-api
rename to build/docker/Dockerfile-api
diff --git a/build/Dockerfile-crawler b/build/docker/Dockerfile-crawler
similarity index 100%
rename from build/Dockerfile-crawler
rename to build/docker/Dockerfile-crawler
diff --git a/build/Dockerfile-feeder b/build/docker/Dockerfile-feeder
similarity index 100%
rename from build/Dockerfile-feeder
rename to build/docker/Dockerfile-feeder
diff --git a/build/Dockerfile-persister b/build/docker/Dockerfile-persister
similarity index 100%
rename from build/Dockerfile-persister
rename to build/docker/Dockerfile-persister
diff --git a/build/Dockerfile-scheduler b/build/docker/Dockerfile-scheduler
similarity index 100%
rename from build/Dockerfile-scheduler
rename to build/docker/Dockerfile-scheduler
diff --git a/deployments/docker-compose.yml b/deployments/docker/docker-compose.yml
similarity index 100%
rename from deployments/docker-compose.yml
rename to deployments/docker/docker-compose.yml
diff --git a/scripts/build.sh b/scripts/build.sh
index 6430e5d..7128913 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# build processes
-for path in build/Dockerfile-*; do
+# build docker images
+for path in build/docker/Dockerfile-*; do
   name=$(echo "$path" | cut -d'-' -f2)
   docker build . -f "$path" -t "trandoshan.io/$name"
 done
diff --git a/scripts/delete.sh b/scripts/delete.sh
index 498c336..a78440b 100755
--- a/scripts/delete.sh
+++ b/scripts/delete.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./scripts/exec.sh down
+./scripts/exec.sh down "$@"
diff --git a/scripts/exec.sh b/scripts/exec.sh
index bb74598..f75c5fa 100755
--- a/scripts/exec.sh
+++ b/scripts/exec.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose -f deployments/docker-compose.yml $@
+docker-compose -f deployments/docker/docker-compose.yml "$@"
diff --git a/scripts/log.sh b/scripts/log.sh
index edb3967..b8f1761 100755
--- a/scripts/log.sh
+++ b/scripts/log.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./scripts/exec.sh logs $@
+./scripts/exec.sh logs "$@"
diff --git a/scripts/ps.sh b/scripts/ps.sh
index 77b0cc7..25420b9 100755
--- a/scripts/ps.sh
+++ b/scripts/ps.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./scripts/exec.sh ps
+./scripts/exec.sh ps "$@"
diff --git a/scripts/start.sh b/scripts/start.sh
index 9476c8a..22d0d15 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./scripts/exec.sh up
+./scripts/exec.sh up "$@"