Removed s6 dependency

Dockerfile

@@ -1,19 +1,18 @@
-FROM alpine:3.2
+FROM alpine:3.4
 MAINTAINER Oscar Garcia Amor (https://ogarcia.me)
 
 # Install necessary stuff
-RUN echo "http://dl-4.alpinelinux.org/alpine/v3.3/main" > /etc/apk/repositories && \
-  apk -U --no-progress upgrade && \
-  apk -U --no-progress add s6 taskd taskd-pki
+RUN apk -U --no-progress upgrade && \
+  apk -U --no-progress add taskd taskd-pki
 
 # Import build and startup script
 COPY docker /app/taskd/
 
 # Set the data location
-ENV TASKDDATA /var/taskd
+ARG TASKDDATA
+ENV TASKDDATA ${TASKDDATA:-/var/taskd}
 
 # Configure container
-VOLUME ["/var/taskd"]
+VOLUME ["${TASKDDATA}"]
 EXPOSE 53589
 ENTRYPOINT ["/app/taskd/run.sh"]
-CMD ["/usr/bin/s6-svscan", "/app/taskd/s6/"]

docker/run.sh

@@ -36,9 +36,9 @@ if ! test -e ${TASKDDATA}/config; then
 
 fi
 
-# Exec CMD or S6 by default if nothing present
+# Exec CMD or taskd by default if nothing present
 if [ $# -gt 0 ];then
   exec "$@"
 else
-  exec /usr/bin/s6-svscan /app/taskd/s6/
+  exec taskd server --data ${TASKDDATA}
 fi

docker/s6/.s6-svscan/finish

@@ -1 +0,0 @@
-#! /bin/sh

docker/s6/taskd/run

@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec taskd server --data ${TASKDDATA}