mirrors/dockerfiles_vimagick
2
0
Fork 0
mirror of https://github.com/vimagick/dockerfiles.git synced 2025-12-21 21:33:02 +01:00
Code Issues Projects Releases Wiki Activity

update mosquitto tls

Browse Source
This commit is contained in:
kev
2017-05-22 14:48:55 +08:00
parent 10494ffc63
commit f84e0f0f5b
6 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mosquitto/Dockerfile
View File

@@ -5,7 +5,7 @@
FROM alpine FROM alpine
MAINTAINER kev <noreply@easypi.pro> MAINTAINER kev <noreply@easypi.pro>
RUN apk add --no-cache mosquitto RUN apk add --no-cache ca-certificates mosquitto
VOLUME /etc/mosquitto VOLUME /etc/mosquitto
EXPOSE 1883 8883 EXPOSE 1883 8883

24
mosquitto/README.md
View File

@@ -24,27 +24,33 @@ mosquitto:
## mosquitto.conf ## mosquitto.conf
``` ```ini
port 8883 port 1883
log_dest stdout log_dest stdout
allow_anonymous false
password_file /etc/mosquitto/pwfile password_file /etc/mosquitto/pwfile
persistence true persistence true
persistence_location /var/lib/mosquitto persistence_location /var/lib/mosquitto
cafile /var/lib/mosquitto/ca.crt
certfile /var/lib/mosquitto/server.crt ###### ENABLE TLS ######
keyfile /var/lib/mosquitto/server.key listener 8883
protocol mqtt
capath /etc/ssl/certs
certfile /var/lib/mosquitto/fullchain.pem
keyfile /var/lib/mosquitto/privkey.pem
require_certificate false require_certificate false
``` ```
- `pwfile` is managed by [mosquitto_passwd][3]. - `pwfile` is managed by [mosquitto_passwd][3].
- TLS keys are generated by [openssl][2]. - Two methods to support TLS:
- You can get free TLS certificates from letsencrypt, `capath` is needed.
- Self-signed TLS keys can be generated by [openssl][2], `cafile` is needed.
> It is important to use different certificate subject parameters for your CA, > It is important to use different certificate subject parameters for your self-signed CA, server and clients.
> server and clients.
## server ## server
``` ```bash
$ mkdir -p data $ mkdir -p data
$ touch data/mosquitto.conf data/pwfile $ touch data/mosquitto.conf data/pwfile
$ docker-compose up -d $ docker-compose up -d

2
mosquitto/arm/Dockerfile
View File

@@ -5,7 +5,7 @@
FROM easypi/alpine-arm FROM easypi/alpine-arm
MAINTAINER EasyPi Software Foundation MAINTAINER EasyPi Software Foundation
RUN apk add --no-cache mosquitto RUN apk add --no-cache ca-certificates mosquitto
VOLUME /etc/mosquitto VOLUME /etc/mosquitto
EXPOSE 1883 8883 EXPOSE 1883 8883

4
mosquitto/arm/data/mosquitto.conf
View File

@@ -12,7 +12,7 @@ persistence_location /var/lib/mosquitto
###### ENABLE WS ###### ###### ENABLE WS ######
#listener 8080 #listener 8080
#protocol websockets #protocol websockets
#cafile /var/lib/mosquitto/DST_Root_CA_X3.pem #capath /etc/ssl/certs
#certfile /var/lib/mosquitto/fullchain.pem #certfile /var/lib/mosquitto/fullchain.pem
#keyfile /var/lib/mosquitto/privkey.pem #keyfile /var/lib/mosquitto/privkey.pem
#require_certificate false #require_certificate false
@@ -20,7 +20,7 @@ persistence_location /var/lib/mosquitto
###### ENABLE TLS ###### ###### ENABLE TLS ######
#listener 8883 #listener 8883
#protocol mqtt #protocol mqtt
#cafile /var/lib/mosquitto/DST_Root_CA_X3.pem #capath /etc/ssl/certs
#certfile /var/lib/mosquitto/fullchain.pem #certfile /var/lib/mosquitto/fullchain.pem
#keyfile /var/lib/mosquitto/privkey.pem #keyfile /var/lib/mosquitto/privkey.pem
#require_certificate false #require_certificate false

4
mosquitto/data/mosquitto.conf
View File

@@ -12,7 +12,7 @@ persistence_location /var/lib/mosquitto
###### ENABLE WS ###### ###### ENABLE WS ######
#listener 8080 #listener 8080
#protocol websockets #protocol websockets
#cafile /var/lib/mosquitto/DST_Root_CA_X3.pem #capath /etc/ssl/certs
#certfile /var/lib/mosquitto/fullchain.pem #certfile /var/lib/mosquitto/fullchain.pem
#keyfile /var/lib/mosquitto/privkey.pem #keyfile /var/lib/mosquitto/privkey.pem
#require_certificate false #require_certificate false
@@ -20,7 +20,7 @@ persistence_location /var/lib/mosquitto
###### ENABLE TLS ###### ###### ENABLE TLS ######
#listener 8883 #listener 8883
#protocol mqtt #protocol mqtt
#cafile /var/lib/mosquitto/DST_Root_CA_X3.pem #capath /etc/ssl/certs
#certfile /var/lib/mosquitto/fullchain.pem #certfile /var/lib/mosquitto/fullchain.pem
#keyfile /var/lib/mosquitto/privkey.pem #keyfile /var/lib/mosquitto/privkey.pem
#require_certificate false #require_certificate false

52
netdata/arm/Dockerfile
View File

@@ -2,48 +2,36 @@
# Dockerfile for netdata-arm # Dockerfile for netdata-arm
# #
FROM resin/rpi-raspbian:jessie FROM easypi/alpine-arm
MAINTAINER EasyPi Software Foundation MAINTAINER EasyPi Software Foundation
ENV NETDATA_VER 1.6.0 ENV NETDATA_VERSION 1.6.0
ENV NETDATA_URL https://github.com/firehol/netdata/releases/download/v${NETDATA_VER}/netdata-${NETDATA_VER}.tar.gz
ENV NETDATA_DEB netdata_${NETDATA_VER}_armhf.deb
WORKDIR /usr/src
RUN set -xe \ RUN set -xe \
&& apt-get update \ && apk add --no-cache autoconf \
&& apt-get -y install autoconf \
autoconf-archive \
autogen \
automake \ automake \
build-essential \ bash \
build-base \
curl \ curl \
debhelper \ libmnl \
dh-autoreconf \
dh-systemd \
fakeroot \
libmnl-dev \ libmnl-dev \
pkg-config \ libuuid \
uuid-dev \ util-linux-dev \
zlib1g-dev \ zlib-dev \
&& curl -sSL ${NETDATA_URL} | tar xz \ && addgroup -g 1000 netdata \
&& cd netdata-${NETDATA_VER} \ && adduser -D -H -u 1000 -G netdata netdata \
&& ln -s contrib/debian \ && curl -sSL https://github.com/firehol/netdata/releases/download/v$NETDATA_VERSION/netdata-$NETDATA_VERSION.tar.gz | tar xz \
&& dpkg-buildpackage -us -uc -rfakeroot \ && cd netdata-$NETDATA_VERSION \
&& ./netdata-installer.sh --dont-wait \
&& cd .. \ && cd .. \
&& dpkg -i ${NETDATA_DEB} \ && rm -rf netdata-$NETDATA_VERSION \
&& apt-get remove -y autoconf \ && apk del autoconf \
autoconf-archive \
autogen \
automake \ automake \
build-essential \ build-base \
curl \ curl \
debhelper \ libmnl-dev \
dh-autoreconf \ util-linux-dev \
dh-systemd \ zlib-dev
pkg-config \
&& rm -rf netdata-${NETDATA_VER} /var/lib/apt/lists/*
VOLUME /etc/netdata VOLUME /etc/netdata