From f0358d3e318bf0fa7e07be4ab22074bb544344e2 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Thu, 1 Jul 2021 13:16:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0docker=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/Dockerfile |  6 ++++--
 docker/Readme.txt | 38 ++++++++++++++++++++++++++------------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index cff16958..291171e3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -48,8 +48,10 @@ VOLUME /var/wumei-smart
 COPY docker-entrypoint.sh /
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
-# 拷贝前后端代码
-#COPY wumei-smart /var/
+# 拷贝前后端压缩文件到容器，容器内解压后删除
+COPY ./wumei-smart.tar /var/
+RUN cd /var && tar -xvf wumei-smart.tar && rm wumei-smart.tar
+
 
 # 映射端口
 EXPOSE 80 3306 1883 18083
\ No newline at end of file
diff --git a/docker/Readme.txt b/docker/Readme.txt
index d945db64..cf781486 100644
--- a/docker/Readme.txt
+++ b/docker/Readme.txt
@@ -9,6 +9,12 @@ java -jar /var/wumei-smart/app.jar
 docker build -t wumei-smart:1.0 .
 # 复制文件到容器
 docker cp wumei-smart/* container:/var/wumei-smart/
+# 镜像导出导入
+docker export container| docker import - kerwincui/wumei-smart:1.0
+# 镜像推送
+阿里云镜像：registry.cn-chengdu.aliyuncs.com/kerwincui/wumei-smart:1.0
+docker tag wumei-smart kerwincui/wumei-smart:1.0
+docker push kerwinci/wumei-smart:1.0
 
 # 容器运行
 docker run \
@@ -17,20 +23,32 @@ docker run \
 --publish 18083:18083 \
 --publish 1883:1883 \
 --publish 3306:3306 \
+--publish 6379:6379 \
 --restart always \
 --detach \
-wumei-smart:1.0
+kerwincui/wumei-smart:1.0
+
+docker run ^
+--name wumei-smart ^
+--publish 80:80 ^
+--publish 18083:18083 ^
+--publish 1883:1883 ^
+--publish 3306:3306 ^
+--publish 6379:6379 ^
+--restart always ^
+--detach ^
+kerwincui/wumei-smart:1.0
 
 
 
 ########################容器内处理##########################
 # 安装mysql
-# wget http://repo.mysql.com/mysql-apt-config_0.8.13-1_all.deb
-# apt install ./mysql-apt-config_0.8.13-1_all.deb
-# apt update
-# apt install mysql-server -y
-# service mysql start
-# mysql_secure_installation
+### wget http://repo.mysql.com/mysql-apt-config_0.8.13-1_all.deb && \
+	apt install ./mysql-apt-config_0.8.13-1_all.deb && \
+	apt update && \
+	apt install mysql-server -y
+### service mysql start
+### mysql_secure_installation
 # 配置远程访问 
 ### vim /etc/mysql/mysql.conf.d/mysqld.cnf ，注释bind-address
 ### 本地登录mysql并更新用户host，并刷新
@@ -46,11 +64,7 @@ wumei-smart:1.0
 # vim /etc/redis/redis.conf ，取消注释requirepass admin123，注释 bind:127.0.0.1
 
 # 配置docker-entrypoint.sh
-# 启动mysql和java app
-
-# 配置系统时区 
-# ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-# 或者export TZ=Asia/Shanghai
+# vim /docker-entrypoint.sh 启动mysql和java app
 
 # 配置nginx
 # vim /etc/nginx/nginx.conf，nginx服务配置