Merge pull request mbentley#3 from mbentley/demo-updates

Demo updates to work with new v2 compose format
sthwaites · Mar 17, 2016 · 64dd7ee · 64dd7ee
2 parents 0dcdbce + 4bfd6c9
commit 64dd7ee
Show file tree

Hide file tree

Showing 20 changed files with 115 additions and 23 deletions.
diff --git a/demo_pq/Dockerfile → Dockerfile b/demo_pq/Dockerfile → Dockerfile
diff --git a/readme.md → README.md b/readme.md → README.md
diff --git a/demo_pq/datastore.go → datastore.go b/demo_pq/datastore.go → datastore.go
diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml
@@ -0,0 +1,48 @@
+version: "2"
+
+services:
+  app:
+    image: ${DTR_URL}/demo/docker-demo:${TAG}
+    restart: always
+    entrypoint: /bin/bash
+    command: -c "sleep 5 && go-wrapper run" # sleep because the postgres container isn't ready on first start
+    environment:
+      - "constraint:node!=*-master"
+      - "constraint:provider==${PROVIDER}"
+      - "TITLE=Docker Demo-${ENVIRONMENT}"
+      - "DB_USER=${DB_USER}"
+      - "DB_PASS=${DB_PASS}"
+      - "DB_NAME=${DB_NAME}"
+      - "DB_SSL_MODE=disable"
+      - "DB_PORT_5432_TCP_ADDR=db"
+      - "DB_PORT_5432_TCP_PORT=5432"
+      - "INTERLOCK_DATA={\"hostname\":\"docker-${ENVIRONMENT}\",\"domain\":\"${DOMAIN_NAME}\"}"
+    networks:
+      - docker-demo
+    ports:
+      - "8080"
+    expose:
+      - "8080"
+  db:
+    image: postgres:latest
+    restart: always
+    environment:
+      - "constraint:node==*master"
+      - "POSTGRES_USER=${DB_USER}"
+      - "POSTGRES_PASSWORD=${DB_PASS}"
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    networks:
+      - docker-demo
+    expose:
+      - "5432"
+    ports:
+      - "${POSTGRES_PORT}:5432"
+
+volumes:
+  postgres-data:
+    driver: local
+
+networks:
+  docker-demo:
+    driver: overlay
diff --git a/docker-compose-test.yml b/docker-compose-test.yml
@@ -0,0 +1,34 @@
+version: "2"
+
+services:
+  app:
+    image: ${DTR_URL}/demo/docker-demo:${TAG}
+    entrypoint: /bin/bash
+    command: -c "sleep 5 && go-wrapper run" # sleep because the postgres container isn't ready on first start
+    environment:
+      - "TITLE=${TITLE}"
+      - "DB_USER=${DB_USER}"
+      - "DB_PASS=${DB_PASS}"
+      - "DB_NAME=${DB_NAME}"
+      - "DB_SSL_MODE=disable"
+    links:
+      - "db:db"
+    network_mode: "bridge"
+    ports:
+      - "8080"
+    expose:
+      - "8080"
+  db:
+    image: postgres:latest
+    environment:
+      - "POSTGRES_USER=${DB_USER}"
+      - "POSTGRES_PASSWORD=${DB_PASS}"
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    network_mode: "bridge"
+    expose:
+      - "5432"
+
+volumes:
+  postgres-data:
+    driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,24 +1,34 @@
-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
+version: "2"
 
-db:
-  image: postgres:latest
-  environment:
-    - "POSTGRES_USER=demo"
-    - "POSTGRES_PASSWORD=demo"
-  expose:
-    - 5432
+services:
+  app:
+    build: .
+    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"
+    network_mode: "bridge"
+    ports:
+      - "8080:8080"
+    expose:
+      - "8080"
+  db:
+    image: postgres:latest
+    environment:
+      - "POSTGRES_USER=demo"
+      - "POSTGRES_PASSWORD=demo"
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    network_mode: "bridge"
+    expose:
+      - "5432"
+
+volumes:
+  postgres-data:
+    driver: local
diff --git a/demo_pq/main.go → main.go b/demo_pq/main.go → main.go
diff --git a/demo_pq/static/css/base.css → static/css/base.css b/demo_pq/static/css/base.css → static/css/base.css
diff --git a/demo_pq/static/font/LigatureSymbols-2.11.eot → static/font/LigatureSymbols-2.11.eot b/demo_pq/static/font/LigatureSymbols-2.11.eot → static/font/LigatureSymbols-2.11.eot
diff --git a/demo_pq/static/font/LigatureSymbols-2.11.otf → static/font/LigatureSymbols-2.11.otf b/demo_pq/static/font/LigatureSymbols-2.11.otf → static/font/LigatureSymbols-2.11.otf
diff --git a/demo_pq/static/font/LigatureSymbols-2.11.svg → static/font/LigatureSymbols-2.11.svg b/demo_pq/static/font/LigatureSymbols-2.11.svg → static/font/LigatureSymbols-2.11.svg
diff --git a/demo_pq/static/font/LigatureSymbols-2.11.ttf → static/font/LigatureSymbols-2.11.ttf b/demo_pq/static/font/LigatureSymbols-2.11.ttf → static/font/LigatureSymbols-2.11.ttf
diff --git a/..._pq/static/font/LigatureSymbols-2.11.woff → static/font/LigatureSymbols-2.11.woff b/..._pq/static/font/LigatureSymbols-2.11.woff → static/font/LigatureSymbols-2.11.woff
diff --git a/demo_pq/static/font/readme.md → static/font/readme.md b/demo_pq/static/font/readme.md → static/font/readme.md
diff --git a/demo_pq/static/font/style.css → static/font/style.css b/demo_pq/static/font/style.css → static/font/style.css
diff --git a/demo_pq/static/img/docker.png → static/img/docker.png b/demo_pq/static/img/docker.png → static/img/docker.png
diff --git a/demo_pq/static/img/docker_large.png → static/img/docker_large.png b/demo_pq/static/img/docker_large.png → static/img/docker_large.png
diff --git a/demo_pq/static/img/docker_small.png → static/img/docker_small.png b/demo_pq/static/img/docker_small.png → static/img/docker_small.png
diff --git a/demo_pq/templates/db.html.tmpl → templates/db.html.tmpl b/demo_pq/templates/db.html.tmpl → templates/db.html.tmpl
diff --git a/demo_pq/templates/index.html.tmpl → templates/index.html.tmpl b/demo_pq/templates/index.html.tmpl → templates/index.html.tmpl