[update] upgrade container runtime to be compatible with iotedge 1.0.5.

[update] update container base images to dotnet 2.1 [new] add windows arm32v7 container output
Azure · Jan 28, 2019 · c237eed · c237eed
1 parent 482c568
commit c237eed
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 12 deletions.
diff --git a/iotedgeSQLite/modules/iotedgeSQLite/Dockerfile.amd64 b/iotedgeSQLite/modules/iotedgeSQLite/Dockerfile.amd64
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.0-sdk AS build-env
+FROM microsoft/dotnet:2.1-sdk AS build-env
 WORKDIR /app
 
 COPY *.csproj ./
@@ -7,12 +7,12 @@ RUN dotnet restore
 COPY . ./
 RUN dotnet publish -c Release -o out
 
-FROM microsoft/dotnet:2.0-runtime
+FROM microsoft/dotnet:2.1-runtime
 WORKDIR /app
 
 COPY --from=build-env /app/out ./
 
 RUN useradd -ms /bin/bash moduleuser
 USER moduleuser
 
-ENTRYPOINT ["dotnet", "iotedgeSQLite.dll"]
+CMD ["dotnet", "iotedgeSQLite.dll"]
diff --git a/iotedgeSQLite/modules/iotedgeSQLite/Dockerfile.amd64.debug b/iotedgeSQLite/modules/iotedgeSQLite/Dockerfile.amd64.debug
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.0-runtime-stretch AS base
+FROM microsoft/dotnet:2.1-runtime-stretch AS base
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends unzip procps && \
@@ -8,7 +8,7 @@ RUN useradd -ms /bin/bash moduleuser
 USER moduleuser
 RUN curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l ~/vsdbg
 
-FROM microsoft/dotnet:2.0-sdk AS build-env
+FROM microsoft/dotnet:2.1-sdk AS build-env
 WORKDIR /app
 
 COPY *.csproj ./

diff --git a/iotedgeSQLite/modules/iotedgeSQLite/Dockerfile.arm32v7 b/iotedgeSQLite/modules/iotedgeSQLite/Dockerfile.arm32v7
@@ -15,4 +15,4 @@ COPY --from=build-env /app/out ./
 RUN useradd -ms /bin/bash moduleuser
 USER moduleuser
 
-ENTRYPOINT ["dotnet", "iotedgeSQLite.dll"]
+CMD ["dotnet", "iotedgeSQLite.dll"]
diff --git a/iotedgeSQLite/modules/iotedgeSQLite/Dockerfile.windows-amd64 b/iotedgeSQLite/modules/iotedgeSQLite/Dockerfile.windows-amd64
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.0-sdk AS build-env
+FROM microsoft/dotnet:2.1-sdk AS build-env
 WORKDIR /app
 
 COPY *.csproj ./
@@ -7,7 +7,7 @@ RUN dotnet restore
 COPY . ./
 RUN dotnet publish -c Release -o out
 
-FROM microsoft/dotnet:2.0-runtime
+FROM microsoft/dotnet:2.1.6-runtime-nanoserver-1809
 WORKDIR /app
 COPY --from=build-env /app/out ./
-ENTRYPOINT ["dotnet", "iotedgeSQLite.dll"]
+CMD ["dotnet", "iotedgeSQLite.dll"]
diff --git a/iotedgeSQLite/modules/iotedgeSQLite/Dockerfile.windows-arm32v7 b/iotedgeSQLite/modules/iotedgeSQLite/Dockerfile.windows-arm32v7
@@ -0,0 +1,13 @@
+FROM microsoft/dotnet:2.1-sdk AS build-env
+WORKDIR /app
+
+COPY *.csproj ./
+RUN dotnet restore -r win10-arm
+
+COPY . ./
+RUN dotnet publish -c Release -r win10-arm -o out
+
+FROM mcr.microsoft.com/windows/nanoserver:1809_arm
+WORKDIR /app
+COPY --from=build-env /app/out ./
+CMD ["iotedgeSQLite.exe"]
diff --git a/iotedgeSQLite/modules/iotedgeSQLite/module.json b/iotedgeSQLite/modules/iotedgeSQLite/module.json
@@ -2,14 +2,15 @@
     "$schema-version": "0.0.1",
     "description": "",
     "image": {
-        "repository": "localhost:5000/iotedgesqlite",
+        "repository": "azureiotedge/sqlite",
         "tag": {
-            "version": "0.0.1",
+            "version": "1.0.5",
             "platforms": {
                 "amd64": "./Dockerfile.amd64", 
                 "amd64.debug": "./Dockerfile.amd64.debug",
                 "arm32v7": "./Dockerfile.arm32v7",
-                "windows-amd64": "./Dockerfile.windows-amd64"
+                "windows-amd64": "./Dockerfile.windows-amd64",
+                "windows-arm32v7": "./Dockerfile.windows-arm32v7"
             }
         },
         "buildOptions": []