Update Docker image for 1.6.1.

docker/1.6/Dockerfile

@@ -0,0 +1,90 @@
+FROM alpine:3.8
+
+LABEL maintainer="Roger Light <[email protected]>" \
+ description="Eclipse Mosquitto MQTT Broker"
+
+ENV VERSION=1.6.1 \
+ DOWNLOAD_SHA256=078d0a1570d9218fe2060f2b7a5b67660ab1e720cff96da8eb485e1d639f3f70 \
+ GPG_KEYS=A0D6EEA1DCAE49A635A3B2F0779B22DFB3E717B7 \
+ LWS_VERSION=2.4.2
+
+RUN set -x && \
+ apk --no-cache add --virtual build-deps \
+ build-base \
+ cmake \
+ gnupg \
+ libressl-dev \
+ util-linux-dev && \
+ wget https://github.com/warmcat/libwebsockets/archive/v${LWS_VERSION}.tar.gz -O /tmp/lws.tar.gz && \
+ mkdir -p /build/lws && \
+ tar --strip=1 -xf /tmp/lws.tar.gz -C /build/lws && \
+ rm /tmp/lws.tar.gz && \
+ cd /build/lws && \
+ cmake . \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLWS_IPV6=ON \
+ -DLWS_WITHOUT_BUILTIN_GETIFADDRS=ON \
+ -DLWS_WITHOUT_CLIENT=ON \
+ -DLWS_WITHOUT_EXTENSIONS=ON \
+ -DLWS_WITHOUT_TESTAPPS=ON \
+ -DLWS_WITH_SHARED=OFF \
+ -DLWS_WITH_ZIP_FOPS=OFF \
+ -DLWS_WITH_ZLIB=OFF && \
+ make -j "$(nproc)" && \
+ rm -rf /root/.cmake && \
+ wget https://mosquitto.org/files/source/mosquitto-${VERSION}.tar.gz -O /tmp/mosq.tar.gz && \
+ echo "$DOWNLOAD_SHA256 /tmp/mosq.tar.gz" | sha256sum -c - && \
+ wget https://mosquitto.org/files/source/mosquitto-${VERSION}.tar.gz.asc -O /tmp/mosq.tar.gz.asc && \
+ export GNUPGHOME="$(mktemp -d)" && \
+ found=''; \
+ for server in \
+ ha.pool.sks-keyservers.net \
+ hkp:https://keyserver.ubuntu.com:80 \
+ hkp:https://p80.pool.sks-keyservers.net:80 \
+ pgp.mit.edu \
+ ; do \
+ echo "Fetching GPG key $GPG_KEYS from $server"; \
+ gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$GPG_KEYS" && found=yes && break; \
+ done; \
+ test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
+ gpg --batch --verify /tmp/mosq.tar.gz.asc /tmp/mosq.tar.gz && \
+ gpgconf --kill all && \
+ rm -rf "$GNUPGHOME" /tmp/mosq.tar.gz.asc && \
+ mkdir -p /build/mosq && \
+ tar --strip=1 -xf /tmp/mosq.tar.gz -C /build/mosq && \
+ rm /tmp/mosq.tar.gz && \
+ make -C /build/mosq -j "$(nproc)" \
+ CFLAGS="-Wall -O2 -I/build/lws/include" \
+ LDFLAGS="-L/build/lws/lib" \
+ WITH_ADNS=no \
+ WITH_DOCS=no \
+ WITH_MEMORY_TRACKING=yes \
+ WITH_SHARED_LIBRARIES=yes \
+ WITH_SRV=no \
+ WITH_STRIP=yes \
+ WITH_TLS_PSK=no \
+ WITH_WEBSOCKETS=yes \
+ prefix=/usr \
+ binary && \
+ addgroup -S -g 1883 mosquitto 2>/dev/null && \
+ adduser -S -u 1883 -D -H -h /var/empty -s /sbin/nologin -G mosquitto -g mosquitto mosquitto 2>/dev/null && \
+ mkdir -p /mosquitto/config /mosquitto/data /mosquitto/log && \
+ install -d /usr/sbin/ && \
+ install -s -m755 /build/mosq/client/mosquitto_pub /usr/bin/mosquitto_pub && \
+ install -s -m755 /build/mosq/client/mosquitto_rr /usr/bin/mosquitto_rr && \
+ install -s -m755 /build/mosq/client/mosquitto_sub /usr/bin/mosquitto_sub && \
+ install -s -m644 /build/mosq/lib/libmosquitto.so.1 /usr/lib/libmosquitto.so.1 && \
+ install -s -m755 /build/mosq/src/mosquitto /usr/sbin/mosquitto && \
+ install -s -m755 /build/mosq/src/mosquitto_passwd /usr/bin/mosquitto_passwd && \
+ install -m644 /build/mosq/mosquitto.conf /mosquitto/config/mosquitto.conf && \
+ chown -R mosquitto:mosquitto /mosquitto && \
+ apk del build-deps && \
+ rm -rf /build
+
+VOLUME ["/mosquitto/data", "/mosquitto/log"]
+
+# Set up the entry point script and default command
+COPY docker-entrypoint.sh /
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["/usr/sbin/mosquitto", "-c", "/mosquitto/config/mosquitto.conf"]

docker/1.6/README.md

@@ -0,0 +1,49 @@
+# Eclipse Mosquitto Docker Image
+Containers built with this Dockerfile build as source from published tarballs.
+
+## Mount Points
+A docker mount point has been created in the image to be used for configuration.
+```
+/mosquitto/config
+```
+
+Two docker volumes have been created in the image to be used for persistent storage and logs.
+```
+/mosquitto/data
+/mosquitto/log
+```
+
+## User/Group
+
+The image runs mosqutto under the mosquitto user and group, which are created
+with a uid and gid of 1883.
+
+## Configuration
+When creating a container from the image, the default configuration values are used.
+To use a custom configuration file, mount a **local** configuration file to `/mosquitto/config/mosquitto.conf`
+```
+docker run -it -p 1883:1883 -v <absolute-path-to-configuration-file>:/mosquitto/config/mosquitto.conf eclipse-mosquitto:<version>
+```
+
+:boom: if the mosquitto configuration (mosquitto.conf) was modified
+to use non-default ports, the docker run command will need to be updated
+to expose the ports that have been configured, for example:
+
+```
+docker run -it -p 1883:1883 -p 9001:9001 -v <absolute-path-to-configuration-file>:/mosquitto/config/mosquitto.conf eclipse-mosquitto:<version>
+```
+
+Configuration can be changed to:
+
+* persist data to `/mosquitto/data`
+* log to `/mosquitto/log/mosquitto.log`
+
+i.e. add the following to `mosquitto.conf`:
+```
+persistence true
+persistence_location /mosquitto/data/
+
+log_dest file /mosquitto/log/mosquitto.log
+```
+
+**Note**: For any volume used, the data will be persistent between containers.

docker/1.6/docker-entrypoint.sh

@@ -0,0 +1,4 @@
+#!/bin/ash
+set -e
+
+exec "$@"