From 9186586740a7bd076156a4e02800756e4e72698c Mon Sep 17 00:00:00 2001 From: Giovanni Angoli Date: Mon, 26 Sep 2016 10:03:37 +0200 Subject: [PATCH 1/2] Dockerfile based on debian/jessie Image, minor edit to launcher.sh --- Dockerfile | 5 ++--- launcher.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b33e75e..6e5773f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:latest +FROM debian:jessie LABEL version="0.4" description="Mosquitto and OwnTracks Recorder" MAINTAINER Jan-Piet Mens @@ -6,12 +6,11 @@ RUN apt-get update && apt-get install -y wget && \ wget -q -O /tmp/owntracks.gpg.key http://repo.owntracks.org/repo.owntracks.org.gpg.key && \ apt-key add /tmp/owntracks.gpg.key RUN apt-get install -y software-properties-common && \ - apt-add-repository ppa:mosquitto-dev/mosquitto-ppa && \ apt-add-repository 'deb http://repo.owntracks.org/debian jessie main' && \ apt-get update && \ apt-get install -y \ libmosquitto1 \ - libsodium18 \ + libsodium13 \ libcurl3 \ liblua5.2-0 \ mosquitto \ diff --git a/launcher.sh b/launcher.sh index 13acf11..5ca04ac 100644 --- a/launcher.sh +++ b/launcher.sh @@ -34,7 +34,7 @@ fi # --- for Mosquitto's persistence mkdir -p /owntracks/mosquitto -chown mosquitto:mosquitto /owntracks/mosquitto +chown mosquitto:nogroup /owntracks/mosquitto # Prime Mosquitto's configuration in volume if it doesn't yet exist there. # Mosquitto will launch with that, allowing the admin to modify config From 62b5451638024588b56d699e3fac811139fd1478 Mon Sep 17 00:00:00 2001 From: Giovanni Angoli Date: Tue, 27 Sep 2016 09:06:22 +0200 Subject: [PATCH 2/2] armhf Dockerfile added --- Dockerfile.armhf | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 Dockerfile.armhf diff --git a/Dockerfile.armhf b/Dockerfile.armhf new file mode 100644 index 0000000..f43dfc3 --- /dev/null +++ b/Dockerfile.armhf @@ -0,0 +1,37 @@ +FROM armhf/debian:jessie +LABEL version="0.4" description="Mosquitto and OwnTracks Recorder" +MAINTAINER Jan-Piet Mens + +RUN apt-get update && apt-get install -y wget && \ + wget -q -O /tmp/owntracks.gpg.key http://repo.owntracks.org/repo.owntracks.org.gpg.key && \ + apt-key add /tmp/owntracks.gpg.key +RUN apt-get install -y software-properties-common && \ + apt-add-repository 'deb http://repo.owntracks.org/debian jessie main' && \ + apt-get update && \ + apt-get install -y \ + libmosquitto1 \ + libsodium13 \ + libcurl3 \ + liblua5.2-0 \ + mosquitto \ + mosquitto-clients \ + supervisor \ + ot-recorder \ + && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +# data volume +VOLUME /owntracks +COPY ot-recorder.default /etc/default/ot-recorder +RUN mkdir -p /var/log/supervisor && \ + mkdir -p -m 775 /owntracks/recorder/store && \ + chown -R owntracks:owntracks /owntracks +COPY launcher.sh /usr/local/sbin/launcher.sh +COPY 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/ + +EXPOSE 1883 8883 8083 +CMD ["/usr/local/sbin/launcher.sh"]