diff --git a/Dockerfile b/Dockerfile index 2f3b322..1847596 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,9 @@ COPY --from=builder /wheels /wheels RUN pip --no-cache-dir install --find-links /wheels --no-index pnut-matrix +COPY run.sh /usr/local/bin/run.sh + VOLUME /data WORKDIR /data EXPOSE 5000 -CMD [ "bash", "/usr/src/app/run.sh" ] +CMD [ "bash", "/usr/local/bin/run.sh" ] diff --git a/run.sh b/run.sh index cd78615..13eb221 100755 --- a/run.sh +++ b/run.sh @@ -1,7 +1,10 @@ !#/bin/bash -pnutservice -c /data/config.yml & -matrixappsvc -c /data/config.yml & +cd /data + +appservice -c config.toml & +pnutservice -c config.toml & + wait -n exit $?