浏览代码

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>
Ben Firshman 10 年之前
父节点
当前提交
878cdeb583

+ 1 - 2
README.md

@@ -17,9 +17,8 @@ Architecture
 Running
 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
     $ docker-compose up -d
 
 
 The app will be running on port 5000 on your Docker host, and the results will be on port 5001.
 The app will be running on port 5000 on your Docker host, and the results will be on port 5001.

+ 0 - 0
vote-apps/docker-compose.yml → docker-compose.yml


+ 0 - 0
vote-apps/result-app/Dockerfile → result-app/Dockerfile


+ 0 - 0
vote-apps/result-app/package.json → result-app/package.json


+ 0 - 0
vote-apps/result-app/server.js → result-app/server.js


+ 0 - 0
vote-apps/result-app/views/app.js → result-app/views/app.js


+ 0 - 0
vote-apps/result-app/views/index.html → result-app/views/index.html


+ 0 - 0
vote-apps/result-app/views/socket.io.js → result-app/views/socket.io.js


+ 0 - 0
vote-apps/result-app/views/stylesheets/style.css → result-app/views/stylesheets/style.css


+ 0 - 0
vote-apps/voting-app/Dockerfile → voting-app/Dockerfile


+ 0 - 0
vote-apps/voting-app/app.py → voting-app/app.py


+ 0 - 0
vote-apps/voting-app/requirements.txt → voting-app/requirements.txt


+ 0 - 0
vote-apps/voting-app/static/stylesheets/style.css → voting-app/static/stylesheets/style.css


+ 0 - 0
vote-apps/voting-app/templates/index.html → voting-app/templates/index.html


+ 0 - 0
vote-apps/voting-app/utils/__init__.py → voting-app/utils/__init__.py


+ 0 - 0
vote-apps/worker/Dockerfile → worker/Dockerfile


+ 0 - 0
vote-apps/worker/pom.xml → worker/pom.xml


+ 0 - 0
vote-apps/worker/src/main/java/worker/Worker.java → worker/src/main/java/worker/Worker.java