From f33d35f4f61776fefab18d198677d49da19e330d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=BD=87=E9=98=B3?= <wanna_zxy@yeah.net>
Date: Mon, 13 Nov 2023 17:27:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9docker=20=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=EF=BC=8C=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC=E5=8F=B7=E8=87=B3?=
 =?UTF-8?q?1.0.1.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 24Hour/24Hour.csproj         |  4 ++--
 24Hour/build/dockerbuild.txt | 30 ++++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/24Hour/24Hour.csproj b/24Hour/24Hour.csproj
index 1ced5dd..dcd9f31 100644
--- a/24Hour/24Hour.csproj
+++ b/24Hour/24Hour.csproj
@@ -8,8 +8,8 @@
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<UserSecretsId>e485308c-2f05-470b-b0a4-68f1ec2b3412</UserSecretsId>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<AssemblyVersion>1.0.1.6</AssemblyVersion>
-		<Version>1.0.1.6</Version>
+		<AssemblyVersion>1.0.1.8</AssemblyVersion>
+		<Version>1.0.1.8</Version>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/24Hour/build/dockerbuild.txt b/24Hour/build/dockerbuild.txt
index 623daa1..ddac110 100644
--- a/24Hour/build/dockerbuild.txt
+++ b/24Hour/build/dockerbuild.txt
@@ -12,8 +12,27 @@ create birdge:
 docker network create twentytotwneyfour
 
 for 24hourserver
-docker run --name twentyfoursvc -p 8098:8098 -v /home/24hour/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always --link mysql --network twentytotwneyfour --network-alias twentyfour  -d twentyfoursvc:1.0.1.5
-docker run --name twentyfoursvc -p 8098:8098 -v /home/24hour/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always -d twentyfoursvc:1.0.1.5
+docker run \
+--name twentyfoursvc \
+-p 8098:8098 \
+-v /home/24hour/logs:/app/logs \
+-v /home/24hour/wwwroot:/app/wwwroot \
+-v /home/24hour/config/appsettings.json:/app/appsettings.json \n 
+-v /etc/localtime:/etc/localtime \
+--restart=always \
+--link mysql \
+--network twentytotwneyfour \
+--network-alias twentyfour \
+-d twentyfoursvc:1.0.1.5
+
+
+docker run 
+--name twentyfoursvc 
+-p 8098:8098 
+-v /home/24hour/config/appsettings.json:/app/appsettings.json 
+-v /etc/localtime:/etc/localtime 
+--restart=always 
+-d twentyfoursvc:1.0.1.5
 
 for 2.0 proxyclient
 docker run --name twentysysproxy -p 5194:5194 -v /home/twentysysproxy/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always --link mysql --network twentytotwneyfour --network-alias twentyproxy  -d twentysysproxy:1.1
@@ -27,13 +46,16 @@ docker run --name twentysysproxy -p 5194:5194 -v /home/twentysysproxy/config/app
 
 
 
-docker run --name twentyfoursvc -p 8098:8098 \
+docker run --name twentyfoursvc1018 \
+-p 8098:8098 \
 -v /home/24hour/config/appsettings.json:/app/appsettings.json \
+-v /home/24hour/config/log4net.config:/app/log4net.config \
 -v /home/24hour/config/caselist.txt:/app/caselist.txt \
 -v /home/24hour/config/jzlist.txt:/app/jzlist.txt \
 -v /home/24hour/wwwroot:/app/wwwroot \
+-v /home/24hour/logs:/app/logs \
 -v /etc/localtime:/etc/localtime \
---restart=always -d twentyfoursvc:1.0.1.5
+--restart=always -d twentyfoursvc:1.0.1.8