Stretch base image, Debian provided Mosquitto package (#17)

* Debian Stretch base image, debian provided mosquitto and new arm32v7 base image

* left jessie as base image in Dockerfile, fixed.

* added gnupg install to arm32v7 Dockerfile

* arm32v7: libsodium18

* fixed Dockerfiles formatting (tabs)
This commit is contained in:
Giovanni Angoli
2018-04-13 17:28:33 +02:00
committed by GitHub
parent 6627c96edf
commit 361bb00f08
2 changed files with 12 additions and 14 deletions
+6 -7
View File
@@ -1,20 +1,19 @@
FROM debian:jessie
FROM debian:stretch
LABEL version="0.4" description="Mosquitto and OwnTracks Recorder"
LABEL authors="Jan-Piet Mens <jpmens@gmail.com>, Giovanni Angoli <juzam76@gmail.com>"
ADD http://repo.owntracks.org/repo.owntracks.org.gpg.key /tmp/owntracks.gpg.key
ADD http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key /tmp/mosquitto.gpg.key
RUN apt-key add /tmp/owntracks.gpg.key && \
apt-key add /tmp/mosquitto.gpg.key && \
RUN apt-get update && \
apt-get install -y gnupg && \
apt-key add /tmp/owntracks.gpg.key && \
apt-get update && \
apt-get install -y software-properties-common net-tools && \
apt-add-repository 'deb http://repo.owntracks.org/debian jessie main' && \
apt-add-repository 'deb http://repo.mosquitto.org/debian jessie main' && \
apt-add-repository 'deb http://repo.owntracks.org/debian stretch main' && \
apt-get update && \
apt-get install -y \
libmosquitto1 \
libsodium13 \
libsodium18 \
libcurl3 \
liblua5.2-0 \
mosquitto \
+6 -7
View File
@@ -1,20 +1,19 @@
FROM armhf/debian:jessie
FROM arm32v7/debian:stretch
LABEL version="0.4" description="Mosquitto and OwnTracks Recorder"
LABEL authors="Jan-Piet Mens <jpmens@gmail.com>, Giovanni Angoli <juzam76@gmail.com>"
ADD http://repo.owntracks.org/repo.owntracks.org.gpg.key /tmp/owntracks.gpg.key
ADD http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key /tmp/mosquitto.gpg.key
RUN apt-key add /tmp/owntracks.gpg.key && \
apt-key add /tmp/mosquitto.gpg.key && \
RUN apt-get update && \
apt-get install -y gnupg && \
apt-key add /tmp/owntracks.gpg.key && \
apt-get update && \
apt-get install -y software-properties-common net-tools && \
apt-add-repository 'deb http://repo.owntracks.org/debian jessie main' && \
apt-add-repository 'deb http://repo.mosquitto.org/debian jessie main' && \
apt-add-repository 'deb http://repo.owntracks.org/debian stretch main' && \
apt-get update && \
apt-get install -y \
libmosquitto1 \
libsodium13 \
libsodium18 \
libcurl3 \
liblua5.2-0 \
mosquitto \