From ee39dc6c37c91a47e6b3ffde53d1b94587cd1e80 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Thu, 30 Jul 2020 18:55:10 +0200
Subject: [PATCH] initial selfbuild docker

---
 apps/mosquitto-deployment.yaml      | 28 +++++++++++++++-------------
 apps/mosquitto/Dockerfile           | 19 +++++++++++++++++++
 apps/mosquitto/docker-entrypoint.sh |  5 +++++
 3 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 apps/mosquitto/Dockerfile
 create mode 100644 apps/mosquitto/docker-entrypoint.sh

diff --git a/apps/mosquitto-deployment.yaml b/apps/mosquitto-deployment.yaml
index 547549b..b7c201f 100644
--- a/apps/mosquitto-deployment.yaml
+++ b/apps/mosquitto-deployment.yaml
@@ -22,15 +22,8 @@ spec:
         release: mqtt
     spec:
       containers:
-      - name: mosquitto-exporter
-        image: docker-registry.lan/mosquitto-exporter:arm64
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 9234
-          name: mqtt-exporter
-          protocol: TCP
       - name: mqtt-mosquitto
-        image: eclipse-mosquitto:latest
+        image: docker-registry.lan/mosquitto:arm64
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -57,11 +50,11 @@ spec:
           timeoutSeconds: 1
         resources:
           limits:
-            cpu: 100m
-            memory: 256Mi
-          requests:
             cpu: 50m
-            memory: 100Mi
+            memory: 24Mi
+          requests:
+            cpu: 20m
+            memory: 10Mi
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
         volumeMounts:
@@ -72,6 +65,13 @@ spec:
         - mountPath: /mosquitto/data
           name: mosquitto-data
           subPath: mosquitto/data
+      - name: mosquitto-exporter
+        image: docker-registry.lan/mosquitto-exporter:arm64
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 9234
+          name: mqtt-exporter
+          protocol: TCP
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
@@ -141,6 +141,8 @@ data:
   mosquitto.conf: |-
     log_dest stdout
     listener 1883
-    listener 9090
+    #listener 9090
     protocol websockets
+    persistence true
+    persistence_location /mosquitto/data
 
diff --git a/apps/mosquitto/Dockerfile b/apps/mosquitto/Dockerfile
new file mode 100644
index 0000000..76245df
--- /dev/null
+++ b/apps/mosquitto/Dockerfile
@@ -0,0 +1,19 @@
+FROM debian:buster-slim
+
+RUN echo 'Acquire::http::proxy "http://172.23.255.1:3142";' >/etc/apt/apt.conf.d/proxy
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+	mosquitto mosquitto-clients && \
+    apt-get clean -y && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Op port
+EXPOSE 1883
+# Stats port
+#EXPOSE 9090
+
+ADD docker-entrypoint.sh /usr/bin/
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+CMD ["/usr/sbin/mosquitto", "-c", "/mosquitto/config/mosquitto.conf"]
diff --git a/apps/mosquitto/docker-entrypoint.sh b/apps/mosquitto/docker-entrypoint.sh
new file mode 100644
index 0000000..1eb0714
--- /dev/null
+++ b/apps/mosquitto/docker-entrypoint.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+exec "$@"
\ No newline at end of file