modify dockerfile

Author: maikebing

docker-compose.yml

@@ -14,11 +14,10 @@ services:
       - taos-network
 
   taos:
-    image: tdengine/tdengine:3.3.3.0
+    image: tdengine/tsdb
     restart: always
     hostname: taos
-    volumes:
-        - "./taos.cfg:/etc/taos/taos.cfg"
+
     ports:
       - 6030:6030
       - 6035:6035

src/Example/Dockerfile

@@ -1,24 +1,18 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/runtime:8.0-bookworm-slim AS base
-MAINTAINER Yanhong Ma 2024
-RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free" > /etc/apt/sources.list && \
-	echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-updates main contrib non-free" >> /etc/apt/sources.list && \
-	echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free" >> /etc/apt/sources.list && \
-    apt-get  -y   -q update   && apt-get install  -y  --no-install-recommends  -q  apt-utils lsof net-tools wget curl iputils-ping inetutils-tools && \
+FROM mcr.microsoft.com/dotnet/runtime:10.0 AS base
+RUN apt-get  -y   -q update   && apt-get install  -y  --no-install-recommends  -q  apt-utils lsof net-tools wget curl iputils-ping inetutils-tools && \
 	apt-get autoremove -y &&  apt-get clean  &&  apt-get autoclean && rm  /var/cache/apt/* -rf && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-RUN curl -o TDengine-client.tar.gz "https://www.taosdata.com/assets-download/3.0/TDengine-client-3.3.3.0-Linux-x64.tar.gz" && \
-    tar  -xvf TDengine-client.tar.gz && rm TDengine-client.tar.gz -f  && cd  $(ls TDengine-client*  -d)  && \
+RUN curl -o tdengine-tsdb-oss-client.tar.gz "https://downloads.taosdata.com/tdengine-tsdb-oss/3.3.8.8/tdengine-tsdb-oss-client-3.3.8.8-linux-x64.tar.gz" && \
+    tar  -xvf tdengine-tsdb-oss-client.tar.gz && rm tdengine-tsdb-oss-client.tar.gz -f  && cd  $(ls tdengine-tsdb-oss-client*  -d)  && \
      ./install_client.sh && \
     rm $(pwd) -rf
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 WORKDIR /src
 
 COPY ["src/Example/Example.csproj", "src/Example/"]
 COPY ["src/IoTSharp.Data.Taos/IoTSharp.Data.Taos.csproj", "src/IoTSharp.Data.Taos/"]
-COPY ["src/EFCore.Taos.Core/IoTSharp.EntityFrameworkCore.Taos.csproj", "src/EFCore.Taos.Core/"]
 COPY ["src/LICENSE", "LICENSE"]
 RUN dotnet restore "src/Example/Example.csproj"
 COPY . .

src/Example/Example.csproj

@@ -12,7 +12,6 @@
   <ItemGroup>
     <PackageReference Include="ConsoleTableExt" Version="3.3.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/Example/Program.cs

@@ -109,28 +109,7 @@ private static void Main(string[] args)
                     connection.Close();
                 }
             }
-
-
-            //using (var connection = new TaosConnection(builder.ConnectionString))
-            //{
-            //    try
-            //    {
-            //        connection.Open();
-
-            //        connection.CreateCommand($"select * from power.meters where current > 10")
-            //                   .ExecuteSubscribe<(DateTime ts, double current, double voltage, double phase, string location)>
-            //                   ("topic-meter-current-bg-10", data => Console.WriteLine($"ts:{data.ts} current:{data.current}  voltage:{data.voltage}  phase:{data.phase}  location:{data.location} "));
-
-            //    }
-            //    catch (Exception ex)
-            //    {
-            //        Console.WriteLine("执行ExecuteSubscribe异常" + ex.Message);
-            //    }
-            //    finally
-            //    {
-            //        connection.Close();
-            //    }
-            //}
+            Console.WriteLine("测试完成。");
         }
         /// <summary>
         /// #259 #258