优化docker镜像的构建

Dockerfile

@@ -34,8 +34,14 @@ ENV TIME_ZONE=Asia/Shanghai
 COPY --from=publish /app/publish .
 COPY ./docker/entry.sh ./docker/crontab /app/
 RUN ln -fs /usr/share/zoneinfo/$TIME_ZONE /etc/localtime \
-    && echo $TIME_ZONE > /etc/timezone \
-    && apt-get update \
-    && apt-get install -y cron tzdata \
+    && echo $TIME_ZONE > /etc/timezone
+RUN cp /etc/apt/sources.list /etc/apt/sources.list.bak \
+	&& sed -i 's/deb.debian.org/mirrors.163.com/g' /etc/apt/sources.list \
+	&& sed -i 's/security.debian.org/mirrors.163.com/g' /etc/apt/sources.list \
+	&& apt-get clean
+RUN apt-get update \
+    && apt-get install -y cron tzdata tofrodos \
     && apt-get clean
+RUN fromdos /app/entry.sh \
+    && fromdos /app/crontab
 ENTRYPOINT ["/bin/bash", "-c", "/app/entry.sh"]

docker/entry.sh

@@ -4,24 +4,30 @@ set -e
 # https://stackoverflow.com/questions/27771781/how-can-i-access-docker-set-environment-variables-from-a-cron-job
 echo "[step 1/4]导入环境变量"
 printenv | grep -v "no_proxy" > /etc/environment
+echo "=>完成"
 
 echo "[step 2/4]配置cron定时任务"
 myarray=(`find /app -maxdepth 1 -name "custom_crontab"`)
 if [ ${#myarray[@]} -gt 0 ]; then 
-	echo "检测到自定义了cron定时任务，使用自定义配置"
+	echo "=>检测到自定义了cron定时任务，使用自定义配置"
 	cp /app/custom_crontab /etc/cron.d/bilicron
 else
-	echo "使用默认cron定时任务配置"
+	echo "=>使用默认cron定时任务配置"
 	cp /app/crontab /etc/cron.d/bilicron
 fi
+echo "=>完成"
 
 echo "[step 3/4]启动定时任务，开启每日定时运行"
 chmod 0644 /etc/cron.d/bilicron
 crontab /etc/cron.d/bilicron
 touch /var/log/cron.log
 cron
+echo "=>完成"
 
 echo "[step 4/4]初始启动容器，尝试测试Cookie"
-/app/Ray.BiliBiliTool.Console.dll -runTasks=Test -closeConsoleWhenEnd=1
+/app/Ray.BiliBiliTool.Console -runTasks=Test -closeConsoleWhenEnd=1
+echo "=>完成"
 
-tail -f /var/log/cron.log
+echo "[step 全部已完成]"
+
+tail -f /var/log/cron.log # 追踪cron日志

src/Ray.BiliBiliTool.Application/TestAppService.cs

@@ -1,18 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Ray.BiliBiliTool.Agent.BiliBiliAgent.Dtos;
 using Ray.BiliBiliTool.Application.Attributes;
 using Ray.BiliBiliTool.Application.Contracts;
-using Ray.BiliBiliTool.Config.Options;
 using Ray.BiliBiliTool.DomainService.Interfaces;
-using Ray.BiliBiliTool.Infrastructure.Enums;
 
 namespace Ray.BiliBiliTool.Application
 {

src/Ray.BiliBiliTool.Console/Ray.BiliBiliTool.Console.csproj

@@ -56,7 +56,13 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.13" />
-    <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
+    <PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="4.1.2" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+    <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
   </ItemGroup>