From 878cdeb583b4bead0504b0bacb6bd4cf1e2abc4b Mon Sep 17 00:00:00 2001 From: Ben Firshman Date: Mon, 25 Jan 2016 18:23:19 +0000 Subject: [PATCH] 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 --- README.md | 3 +-- vote-apps/docker-compose.yml => docker-compose.yml | 0 {vote-apps/result-app => result-app}/Dockerfile | 0 {vote-apps/result-app => result-app}/package.json | 0 {vote-apps/result-app => result-app}/server.js | 0 {vote-apps/result-app => result-app}/views/app.js | 0 {vote-apps/result-app => result-app}/views/index.html | 0 {vote-apps/result-app => result-app}/views/socket.io.js | 0 .../result-app => result-app}/views/stylesheets/style.css | 0 {vote-apps/voting-app => voting-app}/Dockerfile | 0 {vote-apps/voting-app => voting-app}/app.py | 0 {vote-apps/voting-app => voting-app}/requirements.txt | 0 .../voting-app => voting-app}/static/stylesheets/style.css | 0 {vote-apps/voting-app => voting-app}/templates/index.html | 0 {vote-apps/voting-app => voting-app}/utils/__init__.py | 0 {vote-apps/worker => worker}/Dockerfile | 0 {vote-apps/worker => worker}/pom.xml | 0 {vote-apps/worker => worker}/src/main/java/worker/Worker.java | 0 18 files changed, 1 insertion(+), 2 deletions(-) rename vote-apps/docker-compose.yml => docker-compose.yml (100%) rename {vote-apps/result-app => result-app}/Dockerfile (100%) rename {vote-apps/result-app => result-app}/package.json (100%) rename {vote-apps/result-app => result-app}/server.js (100%) rename {vote-apps/result-app => result-app}/views/app.js (100%) rename {vote-apps/result-app => result-app}/views/index.html (100%) rename {vote-apps/result-app => result-app}/views/socket.io.js (100%) rename {vote-apps/result-app => result-app}/views/stylesheets/style.css (100%) rename {vote-apps/voting-app => voting-app}/Dockerfile (100%) rename {vote-apps/voting-app => voting-app}/app.py (100%) rename {vote-apps/voting-app => voting-app}/requirements.txt (100%) rename {vote-apps/voting-app => voting-app}/static/stylesheets/style.css (100%) rename {vote-apps/voting-app => voting-app}/templates/index.html (100%) rename {vote-apps/voting-app => voting-app}/utils/__init__.py (100%) rename {vote-apps/worker => worker}/Dockerfile (100%) rename {vote-apps/worker => worker}/pom.xml (100%) rename {vote-apps/worker => worker}/src/main/java/worker/Worker.java (100%) diff --git a/README.md b/README.md index daf2763..20dce92 100644 --- 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. diff --git a/vote-apps/docker-compose.yml b/docker-compose.yml similarity index 100% rename from vote-apps/docker-compose.yml rename to docker-compose.yml diff --git a/vote-apps/result-app/Dockerfile b/result-app/Dockerfile similarity index 100% rename from vote-apps/result-app/Dockerfile rename to result-app/Dockerfile diff --git a/vote-apps/result-app/package.json b/result-app/package.json similarity index 100% rename from vote-apps/result-app/package.json rename to result-app/package.json diff --git a/vote-apps/result-app/server.js b/result-app/server.js similarity index 100% rename from vote-apps/result-app/server.js rename to result-app/server.js diff --git a/vote-apps/result-app/views/app.js b/result-app/views/app.js similarity index 100% rename from vote-apps/result-app/views/app.js rename to result-app/views/app.js diff --git a/vote-apps/result-app/views/index.html b/result-app/views/index.html similarity index 100% rename from vote-apps/result-app/views/index.html rename to result-app/views/index.html diff --git a/vote-apps/result-app/views/socket.io.js b/result-app/views/socket.io.js similarity index 100% rename from vote-apps/result-app/views/socket.io.js rename to result-app/views/socket.io.js diff --git a/vote-apps/result-app/views/stylesheets/style.css b/result-app/views/stylesheets/style.css similarity index 100% rename from vote-apps/result-app/views/stylesheets/style.css rename to result-app/views/stylesheets/style.css diff --git a/vote-apps/voting-app/Dockerfile b/voting-app/Dockerfile similarity index 100% rename from vote-apps/voting-app/Dockerfile rename to voting-app/Dockerfile diff --git a/vote-apps/voting-app/app.py b/voting-app/app.py similarity index 100% rename from vote-apps/voting-app/app.py rename to voting-app/app.py diff --git a/vote-apps/voting-app/requirements.txt b/voting-app/requirements.txt similarity index 100% rename from vote-apps/voting-app/requirements.txt rename to voting-app/requirements.txt diff --git a/vote-apps/voting-app/static/stylesheets/style.css b/voting-app/static/stylesheets/style.css similarity index 100% rename from vote-apps/voting-app/static/stylesheets/style.css rename to voting-app/static/stylesheets/style.css diff --git a/vote-apps/voting-app/templates/index.html b/voting-app/templates/index.html similarity index 100% rename from vote-apps/voting-app/templates/index.html rename to voting-app/templates/index.html diff --git a/vote-apps/voting-app/utils/__init__.py b/voting-app/utils/__init__.py similarity index 100% rename from vote-apps/voting-app/utils/__init__.py rename to voting-app/utils/__init__.py diff --git a/vote-apps/worker/Dockerfile b/worker/Dockerfile similarity index 100% rename from vote-apps/worker/Dockerfile rename to worker/Dockerfile diff --git a/vote-apps/worker/pom.xml b/worker/pom.xml similarity index 100% rename from vote-apps/worker/pom.xml rename to worker/pom.xml diff --git a/vote-apps/worker/src/main/java/worker/Worker.java b/worker/src/main/java/worker/Worker.java similarity index 100% rename from vote-apps/worker/src/main/java/worker/Worker.java rename to worker/src/main/java/worker/Worker.java