Merge pull request #69 from TomasTomecek/master

ansible 2.1 demo: fix compose file
josefkarasek · May 31, 2016 · de66e05 · de66e05
2 parents 4de90a2 + 671a1ea
commit de66e05
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/ansible-2.1-demo/docker-compose.yml b/ansible-2.1-demo/docker-compose.yml
@@ -1,5 +1,5 @@
 web:
-  build: .
+  build: https://raw.githubusercontent.com/TomasTomecek/open-house-2016-demo/master/Dockerfile
   ports:
    - "8000:8000"
   volumes:
@@ -8,7 +8,7 @@ web:
    - db
    - redis
   environment:
-    - DATABASE_URL=postgres://user:openhouse2016@db:5432/chat
+    - DATABASE_URL=postgres://user:containers@db:5432/chat
     - REDIS_URL=redis://redis:6379/1
 db:
   image: praiskup/postgresql:APIv1.0.1-fedora23
@@ -17,12 +17,12 @@ db:
   environment:
    - POSTGRESQL_DATABASE=chat
    - POSTGRESQL_USER=user
-   - POSTGRESQL_PASSWORD=openhouse2016
+   - POSTGRESQL_PASSWORD=containers
    - POSTGRESQL_CONTAINER_OPTS=assert_external_data = false
 worker:
-  build: .
+  build: https://raw.githubusercontent.com/TomasTomecek/open-house-2016-demo/master/Dockerfile
   environment:
-    - DATABASE_URL=postgres://user:openhouse2016@db:5432/chat
+    - DATABASE_URL=postgres://user:containers@db:5432/chat
     - REDIS_URL=redis://redis:6379/1
   links:
    - db