mirror of
https://github.com/mainflux/mainflux.git
synced 2025-05-11 19:29:16 +08:00
790f8a6abf
* Minor changes on mqtt publisher using nats Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Remove vernemq dependencies Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Restore VerneMQ config files Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Fix Makefile to support custom Docker profiles The Makefile has been updated to support custom Docker profiles. Previously, the Makefile only supported the default profiles for the message broker and MQTT broker. Now, the Makefile allows for custom profiles to be specified using environment variables. If the MF_BROKER_TYPE or MF_MQTT_BROKER_TYPE variables are not set, the default values "nats" and "nats" will be used, respectively. This change enables more flexibility in configuring the Docker environment for the project. The `run` target has also been modified to use the correct broker configuration file based on the MF_BROKER_TYPE variable. The sed command in the `run` target now replaces the placeholder in the docker/docker-compose.yml file with the appropriate broker configuration file. This commit improves the Makefile to support custom Docker profiles and ensures the correct broker configuration file is used when running the project. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Fix queue binding issue in RabbitMQ pubsub The commit fixes an issue in the RabbitMQ pubsub implementation where the queue binding was not correctly set up. Instead of using the topic as the queue name, the commit now uses a unique client ID generated by combining the topic and subscriber ID. This ensures that each subscriber has its own dedicated queue. The commit also updates the queue binding to use the correct queue name. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Refactor Docker config editing in Makefile The commit refactors the `edit_docker_config` function in the Makefile to improve readability and maintainability. The changes include: - Removing unnecessary conditionals related to the `rabbitmq` broker These changes ensure that the Docker configuration is correctly updated based on the specified MQTT broker type. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Fix failing tests on RabbitMQ Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Refactor MQTT_BROKER comment in docker-compose.yml The MQTT_BROKER comment in the docker-compose.yml file has been updated to provide a more accurate description of its functionality. The comment now states that the MQTT_BROKER handles MQTT communication between MQTT adapters and the message broker, instead of Mainflux services. This change improves clarity and aligns with the actual purpose of the MQTT_BROKER. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Rename `MF_BROKER` to `MF_MESSAGE_BROKER` The Makefile and Semaphore configuration files have been refactored to update the variable names related to the message broker type. These changes ensure consistency and clarity in the codebase by using more descriptive variable names related to the message broker type. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Fix Docker profile configuration for nats_rabbitmq Update the Docker profile configuration for nats_rabbitmq by replacing the NATS URL in the .env file with the correct value. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Rename MF_BROKER_URL to MF_MESSAGE_BROKER_URL Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Fix MQTT QoS level in pubsub.go The MQTT QoS level in the pubsub.go file was set to 1, which is the default level. However, since NATS supports up to QoS 1, I updated the QoS level comment to reflect this. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Refactor NewPublisher to accept QoS parameter The NewPublisher function in the pkg/messaging/mqtt/publisher.go file has been refactored to accept a new parameter, qos, which represents the Quality of Service level for MQTT message publishing. This change allows for more flexibility in configuring the MQTT publisher. The NewPublisher function now has the following signature: ```go func NewPublisher(address string, qos uint8, timeout time.Duration) (messaging.Publisher, error) ``` This change ensures that the MQTT publisher can be created with the desired QoS level, enhancing the reliability and delivery guarantees of the published messages. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Fix test assertions in pubsub_test.go The test assertions in the pubsub_test.go file were incorrect. This commit fixes the assertions to properly compare the expected and received message values. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Test configurable MQTT broker Signed-off-by: rodneyosodo <blackd0t@protonmail.com> --------- Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
54 lines
1.6 KiB
Docker
54 lines
1.6 KiB
Docker
# Builder
|
|
FROM erlang:24.3.3.0-alpine AS builder
|
|
RUN apk add --update git build-base bsd-compat-headers openssl-dev snappy-dev curl \
|
|
&& git clone -b 1.12.5 https://github.com/vernemq/vernemq \
|
|
&& cd vernemq \
|
|
&& make -j 16 rel
|
|
|
|
# Executor
|
|
FROM alpine:3.13
|
|
|
|
COPY --from=builder /vernemq/_build/default/rel /
|
|
|
|
RUN apk --no-cache --update --available upgrade && \
|
|
apk add --no-cache ncurses-libs openssl libstdc++ jq curl bash snappy-dev && \
|
|
addgroup --gid 10000 vernemq && \
|
|
adduser --uid 10000 -H -D -G vernemq -h /vernemq vernemq && \
|
|
install -d -o vernemq -g vernemq /vernemq
|
|
|
|
# Defaults
|
|
ENV DOCKER_VERNEMQ_KUBERNETES_LABEL_SELECTOR="app=vernemq" \
|
|
DOCKER_VERNEMQ_LOG__CONSOLE=console \
|
|
PATH="/vernemq/bin:$PATH" \
|
|
VERNEMQ_VERSION="1.12.5"
|
|
|
|
WORKDIR /vernemq
|
|
|
|
COPY --chown=10000:10000 bin/vernemq.sh /usr/sbin/start_vernemq
|
|
COPY --chown=10000:10000 files/vm.args /vernemq/etc/vm.args
|
|
|
|
RUN chown -R 10000:10000 /vernemq && \
|
|
ln -s /vernemq/etc /etc/vernemq && \
|
|
ln -s /vernemq/data /var/lib/vernemq && \
|
|
ln -s /vernemq/log /var/log/vernemq
|
|
|
|
# Ports
|
|
# 1883 MQTT
|
|
# 8883 MQTT/SSL
|
|
# 8080 MQTT WebSockets
|
|
# 44053 VerneMQ Message Distribution
|
|
# 4369 EPMD - Erlang Port Mapper Daemon
|
|
# 8888 Prometheus Metrics
|
|
# 9100 9101 9102 9103 9104 9105 9106 9107 9108 9109 Specific Distributed Erlang Port Range
|
|
|
|
EXPOSE 1883 8883 8080 44053 4369 8888 \
|
|
9100 9101 9102 9103 9104 9105 9106 9107 9108 9109
|
|
|
|
|
|
VOLUME ["/vernemq/log", "/vernemq/data", "/vernemq/etc"]
|
|
|
|
HEALTHCHECK CMD curl -s -f http://localhost:8888/health || false
|
|
|
|
USER vernemq
|
|
CMD ["start_vernemq"]
|