Update Dockerfile

2021-10-01 15:52:55 +02:00 · 2021-10-01 15:52:55 +02:00 · d8f7d9dc85
commit d8f7d9dc85
parent 4a5a806860
1 changed files with 0 additions and 6 deletions
--- a/6
+++ b/6
@ -1,11 +1,5 @@
-<<<<<<< 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"]