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

Conflicts: Dockerfile
2021-10-01 15:52:26 +02:00 · 2021-10-01 15:52:26 +02:00 · 4a5a806860
parent 9e19382e0f adea6be4f7
commit 4a5a806860
1 changed files with 6 additions and 0 deletions
--- a/6
+++ b/6
@ -1,5 +1,11 @@
+<<<<<<< HEAD
 FROM alpine:3.14
 RUN \
  apk -U upgrade && apk add mosquitto mosquitto-clients openssl && \
  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"]