reorg to pull out common revproxy container

6 files changed, 9 insertions, 17 deletions

diff --git a/docker-pull-images b/docker-pull-images
index 13b8019..5b2c8d0 100755
--- a/docker-pull-images
+++ b/docker-pull-images
@@ -1,4 +1,3 @@
 #!/bin/bash
 docker pull clarktlaugh/neo4j-docker-community
-docker pull jwilder/nginx-proxy
 
diff --git a/docker-start-containers b/docker-start-containers
index 98cc444..03f24ca 100755
--- a/docker-start-containers
+++ b/docker-start-containers
@@ -6,7 +6,7 @@ DATA_DIR=/srv/tempest/data
 LOGS_DIR=/srv/tempest/logs/logs
 
 # start the neo4j container
-docker run -d --name neo4j  \
+docker run -d --name tempest-neo4j  \
      --privileged  \
      -p 127.0.0.1:7474:7474  \
      -p 127.0.0.1:1337:1337  \
@@ -14,26 +14,19 @@ docker run -d --name neo4j  \
      -v ${DATA_DIR}:/var/lib/neo4j/data  \
      clarktlaugh/neo4j-docker-community
 
-# start the reverse proxy
-docker run -d --name reverse-proxy \
-     -p 80:80  \
-     --restart=always  \
-     -v /var/run/docker.sock:/tmp/docker.sock  \
-     jwilder/nginx-proxy
-
 # start the static log web server container
-docker run -d --name static-log-server  \
+docker run -d --name tempest-static-log-server  \
      --privileged  \
      -p 127.0.0.1:8081:8080  \
      --restart=always  \
      -e VIRTUAL_HOST=${STATIC_LOGS_VIRTUAL_HOST}  \
      -v ${LOGS_DIR}:/var/www  \
-     lighttpd-static
+     tempest-lighttpd-static
 
 # start the web-app container, linked to the neo4j container
 docker run -d --name tempest-ci-webapp  \
-     --link neo4j:neo4j  \
-     --link static-log-server:logs  \
+     --link tempest-neo4j:neo4j  \
+     --link tempest-static-log-server:logs  \
      -e VIRTUAL_HOST=${WEBAPP_VIRTUAL_HOST}  \
      -p 127.0.0.1:8080:8080  \
      --restart=always  \
diff --git a/lighttpd-static/docker-build-image b/lighttpd-static/docker-build-image
deleted file mode 100755
index 32b9fd4..0000000
--- a/lighttpd-static/docker-build-image
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-docker rmi lighttpd-static
-docker build -t lighttpd-static .
-
diff --git a/lighttpd-static/Dockerfile b/tempest-lighttpd-static/Dockerfile
index 3a1c084..3a1c084 100644
--- a/lighttpd-static/Dockerfile
+++ b/tempest-lighttpd-static/Dockerfile
diff --git a/tempest-lighttpd-static/docker-build-image b/tempest-lighttpd-static/docker-build-image
new file mode 100755
index 0000000..92cd825
--- /dev/null
+++ b/tempest-lighttpd-static/docker-build-image
@@ -0,0 +1,4 @@
+#!/bin/bash
+docker rmi tempest-lighttpd-static
+docker build -t tempest-lighttpd-static .
+
diff --git a/lighttpd-static/lighttpd.conf b/tempest-lighttpd-static/lighttpd.conf
index 3fe4b48..3fe4b48 100644
--- a/lighttpd-static/lighttpd.conf
+++ b/tempest-lighttpd-static/lighttpd.conf