Move everything into the root directory

The separate vote-apps directory was because networking didn't used to support aliases to remove the project name. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-01-25 18:23:19 +00:00 · 2016-01-25 18:23:19 +00:00 · 878cdeb583
commit 878cdeb583
parent 94c0d7b507
18 changed files with 1 additions and 2 deletions
--- a/README.md
+++ b/README.md
@ -17,9 +17,8 @@ Architecture
 Running
 -------
-Since this app makes use of Compose's experimental networking support, it must be started with:
+Run in this directory:
    $ cd vote-apps/
    $ docker-compose up -d
 The app will be running on port 5000 on your Docker host, and the results will be on port 5001.
--- a/vote-apps/docker-compose.yml
+++ b/vote-apps/docker-compose.yml
--- a/vote-apps/result-app/Dockerfile
+++ b/vote-apps/result-app/Dockerfile
--- a/vote-apps/result-app/package.json
+++ b/vote-apps/result-app/package.json
--- a/vote-apps/result-app/server.js
+++ b/vote-apps/result-app/server.js
--- a/vote-apps/result-app/views/app.js
+++ b/vote-apps/result-app/views/app.js
--- a/vote-apps/result-app/views/index.html
+++ b/vote-apps/result-app/views/index.html
--- a/vote-apps/result-app/views/socket.io.js
+++ b/vote-apps/result-app/views/socket.io.js
--- a/vote-apps/result-app/views/stylesheets/style.css
+++ b/vote-apps/result-app/views/stylesheets/style.css
--- a/vote-apps/voting-app/Dockerfile
+++ b/vote-apps/voting-app/Dockerfile
--- a/vote-apps/voting-app/app.py
+++ b/vote-apps/voting-app/app.py
--- a/vote-apps/voting-app/requirements.txt
+++ b/vote-apps/voting-app/requirements.txt
--- a/vote-apps/voting-app/static/stylesheets/style.css
+++ b/vote-apps/voting-app/static/stylesheets/style.css
--- a/vote-apps/voting-app/templates/index.html
+++ b/vote-apps/voting-app/templates/index.html
--- a/vote-apps/voting-app/utils/init.py
+++ b/vote-apps/voting-app/utils/init.py
--- a/vote-apps/worker/Dockerfile
+++ b/vote-apps/worker/Dockerfile
--- a/vote-apps/worker/pom.xml
+++ b/vote-apps/worker/pom.xml
--- a/vote-apps/worker/src/main/java/worker/Worker.java
+++ b/vote-apps/worker/src/main/java/worker/Worker.java