From a275e595d3e945eaf1ac8e0f0ff73db72d16e453 Mon Sep 17 00:00:00 2001
From: Till Höppner
Date: Sun, 1 Oct 2017 22:33:09 +0200
Subject: Upgrade runit

---
 images/runit/Dockerfile | 2 +-
 services/router.yml     | 1 -
 services/runit.yml      | 1 +
 services/znc.yml        | 6 ++++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/images/runit/Dockerfile b/images/runit/Dockerfile
index 9ec17b7..77df52a 100644
--- a/images/runit/Dockerfile
+++ b/images/runit/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 RUN apk add --no-cache sudo shadow runit
 
diff --git a/services/router.yml b/services/router.yml
index 1c43a65..5c245fd 100644
--- a/services/router.yml
+++ b/services/router.yml
@@ -11,7 +11,6 @@ services:
       - git
       - paste
       - znc
-      - taskwarrior
     ports:
       - "80:80"   # http
       - "443:443" # https
diff --git a/services/runit.yml b/services/runit.yml
index be5cc99..5aa9967 100644
--- a/services/runit.yml
+++ b/services/runit.yml
@@ -2,5 +2,6 @@ version: '3'
 
 services:
   runit:
+    image: server_runit
     build: $IMAGES/runit
     entrypoint: /bin/true
diff --git a/services/znc.yml b/services/znc.yml
index 624a252..47d0f78 100644
--- a/services/znc.yml
+++ b/services/znc.yml
@@ -5,6 +5,12 @@ volumes:
 
 services:
   znc:
+    depends_on:
+      - runit
     build: $IMAGES/znc
     volumes:
       - znc_data:/data
+    cap_add:
+      - ALL
+      - NET_BIND_SERVICE
+      - SETPCAP
-- 
cgit v1.2.3