From 9b23b5e71266dcbd6e9007bb4ab0ebee9c9fb611 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Mon, 30 May 2022 03:31:19 +0800
Subject: [PATCH] =?UTF-8?q?emqx=E5=AE=89=E8=A3=85=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/Dockerfile | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 40cfde80..ee2c5c67 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -27,32 +27,31 @@ RUN apt-get update && \
 	apt-get install redis-server -y --no-install-recommends && \
 	echo "6. 修改redis配置 =============================" && \
 	sed -i "s/# requirepass foobared/requirepass wumei-smart/g" /etc/redis/redis.conf && \
-	sed -i "s/bind 127.0.0.1/# bind 127.0.0.1/g" /etc/redis/redis.conf && \
-	echo "6. 安装 emqx =============================" && \
-	echo "6.1 安装所需依赖包 =============================" && \
-	apt update && apt install -y \
-    		apt-transport-https \
-    		ca-certificates \
-    		curl \
-    		gnupg-agent \
-    		software-properties-common && \
-	echo "6.2 添加EMQX官方GPG秘钥 =============================" && \
-	curl -fsSL https://repos.emqx.io/gpg.pub | apt-key add - && \
-	echo "6.3 设置存储库 =============================" && \
-	add-apt-repository \
-    		"deb [arch=amd64] https://repos.emqx.io/emqx-ce/deb/ubuntu/ \
-    		./bionic \
-    		stable" && \
-	echo "6.4 更新apt包索引 =============================" && \
-	apt update && \
-	echo "6.5 安装4.0版本 =============================" && \
-	apt install emqx=4.0.0 -y --no-install-recommends
+	sed -i "s/bind 127.0.0.1/# bind 127.0.0.1/g" /etc/redis/redis.conf
+	# echo "6. 安装 emqx =============================" && \
+	# apt update && apt install -y \
+    # 		apt-transport-https \
+    # 		ca-certificates \
+    # 		curl \
+    # 		gnupg-agent \
+    # 		software-properties-common && \
+	# echo "6.2 添加EMQX官方GPG秘钥 =============================" && \
+	# curl -fsSL https://repos.emqx.io/gpg.pub | apt-key add - && \
+	# echo "6.3 设置存储库 =============================" && \
+	# add-apt-repository \
+    # 		"deb [arch=amd64] https://repos.emqx.io/emqx-ce/deb/ubuntu/ \
+    # 		./bionic \
+    # 		stable" && \
+	# echo "6.4 更新apt包索引 =============================" && \
+	# apt update && \
+	# echo "6.5 安装4.0版本 =============================" && \
+	# apt install emqx=4.0.0 -y --no-install-recommends
 
 # 复制emqx和Nginx的配置文件
-COPY ./emqx4.0/emqx.conf /etc/emqx/emqx.conf 
-COPY ./emqx4.0/emqx_auth_http.conf /etc/emqx/plugins/emqx_auth_http.conf
-COPY ./emqx4.0/emqx_web_hook.conf /etc/emqx/plugins/emqx_web_hook.conf
-COPY ./emqx4.0/loaded_plugins /var/lib/emqx/loaded_plugins
+# COPY ./emqx4.0/emqx.conf /etc/emqx/emqx.conf 
+# COPY ./emqx4.0/emqx_auth_http.conf /etc/emqx/plugins/emqx_auth_http.conf
+# COPY ./emqx4.0/emqx_web_hook.conf /etc/emqx/plugins/emqx_web_hook.conf
+# COPY ./emqx4.0/loaded_plugins /var/lib/emqx/loaded_plugins
 COPY ./nginx.conf /etc/nginx/nginx.conf
 # 拷贝前后端压缩文件到容器，容器内解压后删除
 # COPY ./wumei-smart.tar /var/