cleanup repo

sthwaites · Mar 5, 2015 · b034621 · b034621
1 parent ac3ae17
commit b034621
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 1,565 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-demo/demo
+demo_pq/demo
 *.swp
diff --git a/demo/Dockerfile b/demo/Dockerfile
diff --git a/demo/main.go b/demo/main.go
diff --git a/demo/static/css/base.css b/demo/static/css/base.css
diff --git a/demo/static/font/LigatureSymbols-2.11.eot b/demo/static/font/LigatureSymbols-2.11.eot
diff --git a/demo/static/font/LigatureSymbols-2.11.otf b/demo/static/font/LigatureSymbols-2.11.otf
diff --git a/demo/static/font/LigatureSymbols-2.11.svg b/demo/static/font/LigatureSymbols-2.11.svg
diff --git a/demo/static/font/LigatureSymbols-2.11.ttf b/demo/static/font/LigatureSymbols-2.11.ttf
diff --git a/demo/static/font/LigatureSymbols-2.11.woff b/demo/static/font/LigatureSymbols-2.11.woff
diff --git a/demo/static/font/readme.md b/demo/static/font/readme.md
diff --git a/demo/static/font/style.css b/demo/static/font/style.css
diff --git a/demo/static/img/docker.png b/demo/static/img/docker.png
diff --git a/demo/static/img/docker_large.png b/demo/static/img/docker_large.png
diff --git a/demo/static/img/docker_small.png b/demo/static/img/docker_small.png
diff --git a/demo/templates/db.html.tmpl b/demo/templates/db.html.tmpl
diff --git a/demo/templates/index.html.tmpl b/demo/templates/index.html.tmpl
diff --git a/demo_pq/demo b/demo_pq/demo
diff --git a/demo_pq/fig.yml b/demo_pq/fig.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,24 @@
+app:
+  build: demo_pq
+  entrypoint: /bin/bash
+  command: -c "sleep 5 && go-wrapper run" # sleep because the postgres container isn't ready on first start
+  environment:
+    - "TITLE=Docker Demo"
+    - "DB_USER=demo"
+    - "DB_PASS=demo"
+    - "DB_NAME=demo"
+    - "DB_SSL_MODE=disable"
+  links:
+    - "db:db"
+  ports:
+    - 8080:8080
+  expose:
+    - 8080
+
+db:
+  image: postgres:latest
+  environment:
+    - "POSTGRES_USER=demo"
+    - "POSTGRES_PASSWORD=demo"
+  expose:
+    - 5432
diff --git a/readme.md b/readme.md
@@ -1,17 +1,21 @@
 # Docker Demo Application
+Original Author:  Evan Hazlett (https://github.com/ehazlett/docker-demo)
+
 This is a Go demo application used for demonstrating Docker.
 
 # Demo
-The `demo` directory contains the demo application.
+The `demo_pq` directory contains the demo application.
+
+## Requirements
 
-## Environment Variables
+- Install Docker (https://docs.docker.com/installation/)
 
-* `TITLE`: sets title in demo app
+- Install Docker Compose (https://docs.docker.com/compose/)
 
 ## Build
 
-`docker build -t docker-demo .`
+- `docker-compose build`
 
 ## Run
 
-`docker run -P --rm docker-demo`
+- `docker-compose up`