Merge pull request #7 from project-casa/develop

v1.2.1

README.md

@@ -4,7 +4,7 @@ Mosquitto MQTT broker
 [![Latest release][latest-release-img]][latest-release-url]
 [![Build status][build-status-img]][build-status-url]
 [![Layers][image-layers-img]][image-layers-url]
-![Image size][image-size-img]
+[![Image size][image-size-img]][image-size-url]
 
 [latest-release-img]: https://img.shields.io/github/release/project-casa/mosquitto.svg?label=latest
 [latest-release-url]: https://github.com/project-casa/mosquitto/releases
@@ -13,6 +13,7 @@ Mosquitto MQTT broker
 [image-layers-img]: https://img.shields.io/microbadger/layers/roeldev/casa-mosquitto/latest.svg
 [image-layers-url]: https://microbadger.com/images/roeldev/casa-mosquitto
 [image-size-img]: https://img.shields.io/microbadger/image-size/roeldev/casa-mosquitto/latest.svg
+[image-size-url]: https://hub.docker.com/r/roeldev/casa-mosquitto/tags
 
 
 This Docker image adds a default password and creates CA and server certificates so the MQTT broker can be accessed

docker/Dockerfile

@@ -14,7 +14,9 @@ LABEL maintainer="Roel Schut" \
       org.label-schema.vcs-url="https://github.com/project-casa/mosquitto" \
       org.label-schema.schema-version="1.0"
 
-COPY docker/versions /etc/profile.d/
+ENV ENV="/etc/motd"
+COPY docker/motd /etc/motd.d/
+COPY docker/motd.sh /etc/motd
 COPY docker/mosquitto_certs.sh /usr/bin/mosquitto_certs
 
 RUN set -x && \

docker/hooks/build

@@ -7,13 +7,17 @@ LABEL_VCS_REF=$( git rev-parse --short HEAD )
 DOCKERFILE_PATH="$( dirname ${cwd} )/Dockerfile"
 
 echo "docker build \
+    --build-arg DOCKER_REPO=${DOCKER_REPO} \
+    --build-arg DOCKER_TAG=${DOCKER_TAG} \
     --build-arg LABEL_BUILD_DATE=${LABEL_BUILD_DATE} \
     --build-arg LABEL_VCS_REF=${LABEL_VCS_REF} \
     --file ${DOCKERFILE_PATH} \
     --tag ${IMAGE_NAME} \
     "$( dirname "$( dirname "${cwd}" )" )""
 
 docker build \
+    --build-arg DOCKER_REPO=${DOCKER_REPO} \
+    --build-arg DOCKER_TAG=${DOCKER_TAG} \
     --build-arg LABEL_BUILD_DATE=${LABEL_BUILD_DATE} \
     --build-arg LABEL_VCS_REF=${LABEL_VCS_REF} \
     --file ${DOCKERFILE_PATH} \

docker/motd.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for script in /etc/motd.d/*.sh
+do
+    if [ -r ${script} ]
+    then
+        . ${script}
+    fi
+done
+echo