From 361bb00f08d67e6ec186aa49a2b5ce81fb788bea Mon Sep 17 00:00:00 2001 From: Giovanni Angoli Date: Fri, 13 Apr 2018 17:28:33 +0200 Subject: [PATCH] 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) --- Dockerfile | 13 ++++++------- Dockerfile.armhf => Dockerfile.arm32v7 | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) rename Dockerfile.armhf => Dockerfile.arm32v7 (77%) diff --git a/Dockerfile b/Dockerfile index 1be43e4..1014532 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,19 @@ -FROM debian:jessie +FROM debian:stretch LABEL version="0.4" description="Mosquitto and OwnTracks Recorder" LABEL authors="Jan-Piet Mens , Giovanni Angoli " 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 \ diff --git a/Dockerfile.armhf b/Dockerfile.arm32v7 similarity index 77% rename from Dockerfile.armhf rename to Dockerfile.arm32v7 index 2bfd422..f903f3a 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.arm32v7 @@ -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 , Giovanni Angoli " 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 \