From d05087f404471503308aab52bfbea38be98cd7c9 Mon Sep 17 00:00:00 2001
From: Aiko Mastboom <git@aiko.sh>
Date: Thu, 28 Apr 2016 08:23:13 +0200
Subject: [PATCH] mosquitto 1.3.4

---
 .gitignore |  2 ++
 Dockerfile | 19 ++++++-------------
 Makefile   |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c38fa4e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea
+*.iml
diff --git a/Dockerfile b/Dockerfile
index f8318b2..2c482d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,12 @@
-FROM aiko/baseimage-pi:0.9.16
+FROM aiko/baseimage-pi:0.9.18
 
 MAINTAINER Aiko Mastboom (docker@aiko.sh)
 
-RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
-
-#RUN  /bin/true \
-#  && apt-get update \
-#  && apt-get install -y python-software-properties \
-#  && add-apt-repository ppa:mosquitto-dev/mosquitto-ppa -y
-RUN  /bin/true \
-  && apt-get update \
-  && apt-get install -y mosquitto mosquitto-clients
-
-# Clean up APT when done.
-RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN /bin/true \
+&&  apt-get update \
+&&  apt-get upgrade -y -o Dpkg::Options::="--force-confold" \
+&&  apt-get install -y mosquitto mosquitto-clients \
+&&  apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ADD mosquitto-broker.sh /etc/service/mosquitto-broker/run
 
diff --git a/Makefile b/Makefile
index ded6bb5..bd8b580 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DOCKER_IMAGE_VERSION=0.15-2
+DOCKER_IMAGE_VERSION=1.3.4-2
 DOCKER_IMAGE_NAME=aiko/mosquitto-pi
 DOCKER_IMAGE_TAGNAME=$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_VERSION)