From 97bc6ddca0b386313687130fcddb78192deb5866 Mon Sep 17 00:00:00 2001 From: kev Date: Mon, 15 Nov 2021 13:37:03 +0800 Subject: [PATCH] update mosquitto --- mosquitto/Dockerfile | 4 +-- mosquitto/README.md | 35 +++++++++++---------- mosquitto/arm/Dockerfile | 2 +- mosquitto/arm/docker-compose.yml | 21 ++++++------- mosquitto/data/{ => etc}/DST_Root_CA_X3.pem | 0 mosquitto/data/{ => etc}/fullchain.pem | 0 mosquitto/data/{ => etc}/mosquitto.conf | 7 +++-- mosquitto/data/{ => etc}/privkey.pem | 0 mosquitto/data/{ => etc}/pwfile | 0 mosquitto/data/var/.gitkeep | 0 mosquitto/docker-compose.yml | 21 ++++++------- 11 files changed, 47 insertions(+), 43 deletions(-) rename mosquitto/data/{ => etc}/DST_Root_CA_X3.pem (100%) rename mosquitto/data/{ => etc}/fullchain.pem (100%) rename mosquitto/data/{ => etc}/mosquitto.conf (73%) rename mosquitto/data/{ => etc}/privkey.pem (100%) rename mosquitto/data/{ => etc}/pwfile (100%) create mode 100644 mosquitto/data/var/.gitkeep diff --git a/mosquitto/Dockerfile b/mosquitto/Dockerfile index 6467e0f..8c5d583 100644 --- a/mosquitto/Dockerfile +++ b/mosquitto/Dockerfile @@ -2,8 +2,8 @@ # Dockerfile for mosquitto # -FROM alpine -MAINTAINER kev +FROM alpine:3 +MAINTAINER EasyPi Software Foundation RUN apk add --no-cache ca-certificates mosquitto diff --git a/mosquitto/README.md b/mosquitto/README.md index 81ea635..66d5f53 100644 --- a/mosquitto/README.md +++ b/mosquitto/README.md @@ -4,33 +4,35 @@ mosquitto ![](https://badge.imagelayers.io/vimagick/mosquitto:latest.svg) [Mosquitto][1] is an open source (BSD licensed) message broker that implements -the MQ Telemetry Transport protocol versions 3.1 and 3.1.1. +the MQTT protocol versions 3.1 and 3.1.1. ## docker-compose.yml ```yaml -mosquitto: - image: vimagick/mosquitto - ports: - - "1883:1883" - - "8080:8080" - - "8883:8883" - volumes: - - ./data/mosquitto.conf:/etc/mosquitto/mosquitto.conf - - ./data/pwfile:/etc/mosquitto/pwfile - - ./data:/var/lib/mosquitto - restart: always +version: "3.8" +services: + mosquitto: + image: vimagick/mosquitto + ports: + - "1883:1883" + volumes: + - ./data/etc:/etc/mosquitto + - ./data/var:/var/lib/mosquitto + restart: unless-stopped ``` ## mosquitto.conf ```ini -port 1883 +listener 1883 log_dest stdout allow_anonymous false password_file /etc/mosquitto/pwfile persistence true persistence_location /var/lib/mosquitto +persistence_file mosquitto.db +#plugin /usr/lib/mosquitto_dynamic_security.so +#plugin_opt_config_file /etc/mosquitto/dynamic-security.json ###### ENABLE TLS ###### listener 8883 @@ -51,9 +53,10 @@ require_certificate false ## server ```bash -$ mkdir -m 777 data -$ touch data/mosquitto.conf data/pwfile -$ vi data/mosquitto.conf +$ mkdir -p data/{etc,var} +$ chmod -R 777 data +$ touch data/etc/mosquitto.conf data/etc/pwfile +$ vi data/etc/mosquitto.conf $ docker-compose up -d $ docker-compose exec mosquitto sh >>> cd /etc/mosquitto diff --git a/mosquitto/arm/Dockerfile b/mosquitto/arm/Dockerfile index e722055..0f020fb 100644 --- a/mosquitto/arm/Dockerfile +++ b/mosquitto/arm/Dockerfile @@ -2,7 +2,7 @@ # Dockerfile for mosquitto-arm # -FROM easypi/alpine-arm +FROM alpine:3 MAINTAINER EasyPi Software Foundation RUN apk add --no-cache ca-certificates mosquitto diff --git a/mosquitto/arm/docker-compose.yml b/mosquitto/arm/docker-compose.yml index ffee206..1b6a0d4 100644 --- a/mosquitto/arm/docker-compose.yml +++ b/mosquitto/arm/docker-compose.yml @@ -1,11 +1,10 @@ -mosquitto: - image: easypi/mosquitto-arm - ports: - - "1883:1883" - - "8080:8080" - - "8883:8883" - volumes: - - ./data/mosquitto.conf:/etc/mosquitto/mosquitto.conf - - ./data/pwfile:/etc/mosquitto/pwfile - - ./data:/var/lib/mosquitto - restart: always +version: "3.8" +services: + mosquitto: + image: easypi/mosquitto-arm64 + ports: + - "1883:1883" + volumes: + - ./data/etc:/etc/mosquitto + - ./data/var:/var/lib/mosquitto + restart: unless-stopped diff --git a/mosquitto/data/DST_Root_CA_X3.pem b/mosquitto/data/etc/DST_Root_CA_X3.pem similarity index 100% rename from mosquitto/data/DST_Root_CA_X3.pem rename to mosquitto/data/etc/DST_Root_CA_X3.pem diff --git a/mosquitto/data/fullchain.pem b/mosquitto/data/etc/fullchain.pem similarity index 100% rename from mosquitto/data/fullchain.pem rename to mosquitto/data/etc/fullchain.pem diff --git a/mosquitto/data/mosquitto.conf b/mosquitto/data/etc/mosquitto.conf similarity index 73% rename from mosquitto/data/mosquitto.conf rename to mosquitto/data/etc/mosquitto.conf index 8312c11..975793b 100644 --- a/mosquitto/data/mosquitto.conf +++ b/mosquitto/data/etc/mosquitto.conf @@ -2,12 +2,15 @@ # Docs: https://mosquitto.org/man/mosquitto-conf-5.html # -port 1883 +listener 1883 log_dest stdout allow_anonymous false password_file /etc/mosquitto/pwfile persistence true -persistence_location /var/lib/mosquitto/ +persistence_location /var/lib/mosquitto +persistence_file mosquitto.db +#plugin /usr/lib/mosquitto_dynamic_security.so +#plugin_opt_config_file /etc/mosquitto/dynamic-security.json ###### ENABLE WS ###### #listener 8080 diff --git a/mosquitto/data/privkey.pem b/mosquitto/data/etc/privkey.pem similarity index 100% rename from mosquitto/data/privkey.pem rename to mosquitto/data/etc/privkey.pem diff --git a/mosquitto/data/pwfile b/mosquitto/data/etc/pwfile similarity index 100% rename from mosquitto/data/pwfile rename to mosquitto/data/etc/pwfile diff --git a/mosquitto/data/var/.gitkeep b/mosquitto/data/var/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/mosquitto/docker-compose.yml b/mosquitto/docker-compose.yml index 38a1129..3b4e616 100644 --- a/mosquitto/docker-compose.yml +++ b/mosquitto/docker-compose.yml @@ -1,11 +1,10 @@ -mosquitto: - image: vimagick/mosquitto - ports: - - "1883:1883" - - "8080:8080" - - "8883:8883" - volumes: - - ./data/mosquitto.conf:/etc/mosquitto/mosquitto.conf - - ./data/pwfile:/etc/mosquitto/pwfile - - ./data:/var/lib/mosquitto - restart: always +version: "3.8" +services: + mosquitto: + image: vimagick/mosquitto + ports: + - "1883:1883" + volumes: + - ./data/etc:/etc/mosquitto + - ./data/var:/var/lib/mosquitto + restart: unless-stopped