aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Dybiec <pawel.to.malpa@gmail.com>2019-04-17 17:37:41 +0200
committerPaweł Dybiec <pawel.to.malpa@gmail.com>2019-04-17 17:37:41 +0200
commit677fdd7f51a4b382aad09a24ddb7a25ca0d24fe9 (patch)
treedeb33b24df24d7b90194daf71e43a17f1439339c
parentAdd hosts file (diff)
Inline counter app config
-rw-r--r--composer/app/docker-compose.yml10
-rw-r--r--docker.yml19
2 files changed, 16 insertions, 13 deletions
diff --git a/composer/app/docker-compose.yml b/composer/app/docker-compose.yml
deleted file mode 100644
index e2225be..0000000
--- a/composer/app/docker-compose.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: '3'
-services:
- web:
- build: .
- ports:
- - "127.0.0.1:5004:5000"
- restart: always
- redis:
- image: "redis:alpine"
- restart: always
diff --git a/docker.yml b/docker.yml
index 769356d..47ae3ad 100644
--- a/docker.yml
+++ b/docker.yml
@@ -2,14 +2,27 @@
- name: Docker apps
hosts: tamriel
remote_user: ansible_worker
+ vars:
+ docker_compose_dir: "~/composer"
tasks:
- name: Synchronize docker-compose files
synchronize:
src: composer/
dest: composer
- - name: counter app
+ - name: Counter app
docker_service:
- project_src: composer/app
+ project_name: app
+ definition:
+ version: '3'
+ services:
+ web:
+ build: "{{docker_compose_dir}}/app"
+ ports:
+ - "127.0.0.1:5004:5000"
+ restart: always
+ redis:
+ image: "redis:alpine"
+ restart: always
- name: nginx
docker_service:
project_src: composer/nginx
@@ -91,7 +104,7 @@
extra_hosts:
- "dockerhost:172.17.0.1"
volumes:
- - "~/composer/monitoring/prometheus:/etc/prometheus/:ro"
+ - "{{docker_compose_dir}}/monitoring/prometheus:/etc/prometheus/:ro"
restart: always
cadvisor:
image: google/cadvisor