summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTill Höppner2017-10-01 22:33:09 +0200
committerTill Höppner2017-10-01 22:33:23 +0200
commita275e595d3e945eaf1ac8e0f0ff73db72d16e453 (patch)
treea536082c6e20448088f791d465a0dfc07dd2f4b4
parent60237f322b5b3e541859e820537036c2dcf28fb7 (diff)
downloadserver-a275e595d3e945eaf1ac8e0f0ff73db72d16e453.tar.gz
server-a275e595d3e945eaf1ac8e0f0ff73db72d16e453.tar.xz
server-a275e595d3e945eaf1ac8e0f0ff73db72d16e453.zip
Upgrade runit
-rw-r--r--images/runit/Dockerfile2
-rw-r--r--services/router.yml1
-rw-r--r--services/runit.yml1
-rw-r--r--services/znc.yml6
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