From 2416aeebc76447b7efa661f06daf236592e29cbf Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Mon, 23 Jan 2023 19:55:14 +0100
Subject: [PATCH 1/2] build: allow user-specified image tag for make docker
 build

---
 build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build b/build
index 87c719a53..06b1d29e2 100755
--- a/build
+++ b/build
@@ -332,13 +332,15 @@ make_docker() {
     if [[ "$PROFILE" = *-elixir ]]; then
       PKG_VSN="$PKG_VSN-elixir"
     fi
+    local default_tag="emqx/${PROFILE%%-elixir}:${PKG_VSN}"
+    EMQX_IMAGE_TAG="${EMQX_IMAGE_TAG:-$default_tag}"
 
     set -x
     docker build --no-cache --pull \
        --build-arg BUILD_FROM="${EMQX_BUILDER}" \
        --build-arg RUN_FROM="${EMQX_RUNNER}" \
        --build-arg EMQX_NAME="$PROFILE" \
-       --tag "emqx/${PROFILE%%-elixir}:${PKG_VSN}" \
+       --tag "${EMQX_IMAGE_TAG}" \
        -f "${EMQX_DOCKERFILE}" .
 }
 

From feb02389118fe3d5196e45d9a9e3c48512170f00 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Tue, 24 Jan 2023 12:54:42 +0100
Subject: [PATCH 2/2] fix(influxdb): ensure client is stopped before returning
 error

---
 lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl
index 824233a6d..0ee27c5c4 100644
--- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl
+++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl
@@ -248,6 +248,8 @@ do_start_client(
                         client => Client,
                         reason => "client is not alive"
                     }),
+                    %% no leak
+                    _ = influxdb:stop_client(Client),
                     {error, influxdb_client_not_alive}
             end;
         {error, {already_started, Client0}} ->