From f77d1aee56f40c983485e52395b6ce5480d14c06 Mon Sep 17 00:00:00 2001
From: Enno Runne <458526+ennru@users.noreply.github.com>
Date: Tue, 29 Aug 2023 11:33:35 +0200
Subject: [PATCH] mqtt: use the official Eclipse Mosquitto image (#3004)

---
 docker-compose.yml                                  | 9 ++++++---
 mqtt/src/test/{travis => mosquitto/config}/acl      | 0
 mqtt/src/test/mosquitto/config/mosquitto.conf       | 6 ++++++
 mqtt/src/test/{travis => mosquitto/config}/password | 0
 mqtt/src/test/travis/auth.conf                      | 2 --
 5 files changed, 12 insertions(+), 5 deletions(-)
 rename mqtt/src/test/{travis => mosquitto/config}/acl (100%)
 create mode 100644 mqtt/src/test/mosquitto/config/mosquitto.conf
 rename mqtt/src/test/{travis => mosquitto/config}/password (100%)
 delete mode 100644 mqtt/src/test/travis/auth.conf

diff --git a/docker-compose.yml b/docker-compose.yml
index 6702ccf40c..6d3ecf7c52 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@
 # To start all docker containers required to execute the tests locally run:
 # docker-compose up
 
-version: '2.2'
+version: '3.7'
 services:
   amazoneventbridge:
     image: localstack/localstack:0.10.6
@@ -214,11 +214,14 @@ services:
     ports:
       - "8086:8086"
   mqtt:
-    image: toke/mosquitto
+    image: eclipse-mosquitto:2.0
+    user: 1000:1000
     ports:
       - "1883:1883"
     volumes:
-      - ./mqtt/src/test/travis:/mqtt/config/conf.d
+      - ./mqtt/src/test/mosquitto:/mosquitto:rw
+    networks:
+      - default
   orientdb:
     image: orientdb:3.1.9
     ports:
diff --git a/mqtt/src/test/travis/acl b/mqtt/src/test/mosquitto/config/acl
similarity index 100%
rename from mqtt/src/test/travis/acl
rename to mqtt/src/test/mosquitto/config/acl
diff --git a/mqtt/src/test/mosquitto/config/mosquitto.conf b/mqtt/src/test/mosquitto/config/mosquitto.conf
new file mode 100644
index 0000000000..316b05f374
--- /dev/null
+++ b/mqtt/src/test/mosquitto/config/mosquitto.conf
@@ -0,0 +1,6 @@
+# https://mosquitto.org/man/mosquitto-conf-5.html
+listener 1883
+allow_anonymous true
+
+password_file /mosquitto/config/password
+acl_file /mosquitto/config/acl
diff --git a/mqtt/src/test/travis/password b/mqtt/src/test/mosquitto/config/password
similarity index 100%
rename from mqtt/src/test/travis/password
rename to mqtt/src/test/mosquitto/config/password
diff --git a/mqtt/src/test/travis/auth.conf b/mqtt/src/test/travis/auth.conf
deleted file mode 100644
index 1a9c3dcfae..0000000000
--- a/mqtt/src/test/travis/auth.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-password_file /mqtt/config/conf.d/password
-acl_file /mqtt/config/conf.d/acl