about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaweł Dybiec <pdybiec@stud.cs.uni.wroc.pl>2019-10-12 19:05:18 +0200
committerPaweł Dybiec <pdybiec@stud.cs.uni.wroc.pl>2019-10-12 19:05:18 +0200
commite7212bd15e366c12936cc8ad77c176b0af9324ce (patch)
tree3cdddcfb317ca8c850c0165a9d303706dbb2a3af
parentFix deprecated commands, move to python3 executor (diff)
Forced upgrade of services, disabled unused services
-rw-r--r--docker.yml15
-rw-r--r--domains.yml2
2 files changed, 14 insertions, 3 deletions
diff --git a/docker.yml b/docker.yml
index c426404..7dc413d 100644
--- a/docker.yml
+++ b/docker.yml
@@ -24,10 +24,12 @@
       server: "{{item.value}}"
       short_name: "{{item.key}}"
     with_items: "{{domains | dict2items}}"
+    when: (item.value.disabled is undefined) or (item.value.disabled != true)
 
   - name: Counter app
     docker_compose:
       project_name: app
+      pull: yes
       build: yes
       definition:
         version: '3'
@@ -43,7 +45,9 @@
   - name: nginx
     docker_compose:
       project_name: nginx
+      pull: yes
       build: yes
+      restarted: yes
       definition:
         version: '3'
         services:
@@ -56,8 +60,9 @@
             restart: always
 
   - name: gitea
-    docker_service:
+    docker_compose:
       project_name: gitea
+      pull: yes
       restarted: true
       definition:
         version: '2'
@@ -118,7 +123,8 @@
   - name: grafana
     docker_compose:
       project_name: monitoring
-      restarted: true
+      pull: yes
+      state: absent
       definition:
         version: '3'
         volumes:
@@ -145,7 +151,7 @@
             restart: always
           cadvisor:
             image: google/cadvisor
-            expose: [8080]
+            #expose: [8080]
             volumes:
               - "/:/rootfs:ro"
               - "/var/run:/var/run:ro"
@@ -156,6 +162,8 @@
   - name: registry
     docker_compose:
       project_name: registry
+      pull: yes
+      state: absent
       definition:
         version: '3'
         volumes:
@@ -178,6 +186,7 @@
   - name: vpn
     docker_compose:
       project_name: vpn
+      pull: yes
       definition:
         version: '3'
         volumes:
diff --git a/domains.yml b/domains.yml
index ad12623..2cdb377 100644
--- a/domains.yml
+++ b/domains.yml
@@ -6,6 +6,7 @@ domains:
     dir: "/usr/share/nginx/html"
   registry:
     name: "registry.dybiec.info"
+    disabled: true
     proxy:
       port: 5000
   git:
@@ -16,6 +17,7 @@ domains:
       cache: true
   grafana:
     name: "grafana.dybiec.info"
+    disabled: true
     http_redirect: true
     proxy:
       port: 5002