From 0b4310d91a2ec829ca7930a96655f043ff39cc39 Mon Sep 17 00:00:00 2001 From: Jan-Piet Mens Date: Mon, 25 Jan 2016 09:30:26 +0100 Subject: [PATCH] local files relative to recorder root --- docker/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6e2a80e..58791b0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -33,18 +33,18 @@ RUN mkdir -p /usr/local/src /var/log/supervisor WORKDIR /usr/local/src RUN git clone https://github.com/owntracks/recorder.git WORKDIR /usr/local/src/recorder -COPY config.mk /usr/local/src/recorder/config.mk +COPY docker/config.mk /usr/local/src/recorder/config.mk RUN make && make install RUN chown owntracks /usr/local/bin/ocat /usr/local/sbin/ot-recorder && \ chgrp owntracks /usr/local/bin/ocat /usr/local/sbin/ot-recorder && \ chmod 7111 /usr/local/bin/ocat /usr/local/sbin/ot-recorder -COPY launcher.sh /usr/local/sbin/launcher.sh -COPY generate-CA.sh /usr/local/sbin/generate-CA.sh +COPY docker/launcher.sh /usr/local/sbin/launcher.sh +COPY docker/generate-CA.sh /usr/local/sbin/generate-CA.sh RUN chmod 755 /usr/local/sbin/launcher.sh /usr/local/sbin/generate-CA.sh -COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf -COPY mosquitto.conf mosquitto.acl /etc/mosquitto/ +COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf +COPY docker/mosquitto.conf docker/mosquitto.acl /etc/mosquitto/ EXPOSE 1883 8883 8083 CMD ["/usr/local/sbin/launcher.sh"]