paspo/docker-mqtt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://git@git.asperti.com:1022/paspo/docker-mqtt.git

Browse Source 
Conflicts:
	Dockerfile
This commit is contained in:
Paolo Asperti 2021-10-01 15:52:26 +02:00
commit 4a5a806860
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -1,5 +1,11 @@
<<<<<<< HEAD
FROM alpine:3.14 FROM alpine:3.14
RUN \ RUN \
apk -U upgrade && apk add mosquitto mosquitto-clients openssl && \ apk -U upgrade && apk add mosquitto mosquitto-clients openssl && \
echo "log_dest stdout" >/etc/mosquitto/mosquitto.conf echo "log_dest stdout" >/etc/mosquitto/mosquitto.conf
=======
FROM alpine:3.12
RUN apk -U upgrade && apk add mosquitto mosquitto-clients openssl
EXPOSE 8883
>>>>>>> master
ENTRYPOINT ["mosquitto", "-c", "/etc/mosquitto/mosquitto.conf"] ENTRYPOINT ["mosquitto", "-c", "/etc/mosquitto/mosquitto.conf"]