Merge pull request #3 from juzam/debian

Docker base image switched to Debian + arhmf Dockerfile

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM debian:jessie
 LABEL version="0.4" description="Mosquitto and OwnTracks Recorder"
 MAINTAINER Jan-Piet Mens <jpmens@gmail.com>
 
@@ -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 \

Dockerfile.armhf

@@ -0,0 +1,37 @@
+FROM armhf/debian:jessie
+LABEL version="0.4" description="Mosquitto and OwnTracks Recorder"
+MAINTAINER Jan-Piet Mens <jpmens@gmail.com>
+
+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"]

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