diff --git a/Dockerfile b/Dockerfile index 8866216..b99628b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,7 @@ RUN apk add --no-cache --virtual build-dependencies \ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..; \ make; \ make install; \ + cd .. && cp -r pki /usr/share/doc/taskd/; \ cd ../.. && rm -rf taskserver; \ apk del --purge build-dependencies; \ apk add --no-cache gnutls libuuid util-linux bash libgcc libstdc++; \ diff --git a/taskd.sh b/taskd.sh index f590fd7..400aa71 100644 --- a/taskd.sh +++ b/taskd.sh @@ -8,16 +8,20 @@ if [[ ! -w $TASKDDATA ]] ; then >&2 echo " Did you set permissions on the volume correctly?" fi -# Refresh example configuration -if [[ -d $TASKDDATA/example ]] ; then - rm -rf "$TASKDDATA/example" -fi +# Do preliminary configuration if needed. +if [[ ! -f $TASKDDATA/config ]] ; then + mkdir "$TASKDDATA" -mkdir -p "$TASKDDATA/example" || exit 1 -taskd init --data "$TASKDDATA/example" + taskd init --data "$TASKDDATA" + taskd config --force server=0.0.0.0:53589 + + # Generating stub certificates that WILL BE INVALID. + # See taskd configuration guide for configuring it right. + /usr/share/doc/taskd/pki/generate +fi # Print version and diagnostics to logs taskd diagnostics --data "$TASKDDATA" # Hand off to taskd -exec taskd server \ No newline at end of file +exec taskd server