Skip to content

Commit 80e168c

Browse files
author
Summer
authored
fix dll name in docker file not align with real dll name due to dotnet issue (#12)
* fix dll name in docker file not align with real dll name due to dotnet issue * update for fsharp too
1 parent 71d3078 commit 80e168c

File tree

10 files changed

+74
-7
lines changed

10 files changed

+74
-7
lines changed

content/dotnet-template-azure-iot-edge-module/CSharp/.template.config/template.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
}
2020
],
2121
"symbols": {
22+
"name": {
23+
"type": "parameter",
24+
"datatype": "string",
25+
"replaces": "SampleModuleName"
26+
},
2227
"target": {
2328
"type": "parameter",
2429
"datatype": "choice",

content/dotnet-template-azure-iot-edge-module/CSharp/Docker/linux-x64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ WORKDIR /app
66

77
COPY $EXE_DIR/ ./
88

9-
CMD ["dotnet", "SampleModule.dll"]
9+
CMD ["dotnet", "SampleModuleName.dll"]

content/dotnet-template-azure-iot-edge-module/CSharp/Docker/linux-x64/Dockerfile.debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ RUN apt-get install -y unzip procps
1212

1313
RUN curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l ~/vsdbg
1414

15-
CMD ["dotnet", "SampleModule.dll"]
15+
CMD ["dotnet", "SampleModuleName.dll"]

content/dotnet-template-azure-iot-edge-module/CSharp/Docker/windows-nano/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ WORKDIR /app
66

77
COPY $EXE_DIR/ ./
88

9-
CMD ["dotnet", "SampleModule.dll"]
9+
CMD ["dotnet", "SampleModuleName.dll"]

content/dotnet-template-azure-iot-edge-module/CSharp/deployment.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
}
3030
},
3131
"modules": {
32-
"SampleModule": {
32+
"SampleModuleName": {
3333
"version": "1.0",
3434
"type": "docker",
3535
"status": "running",

content/dotnet-template-azure-iot-edge-module/FSharp/.template.config/template.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
}
2020
],
2121
"symbols": {
22+
"name": {
23+
"type": "parameter",
24+
"datatype": "string",
25+
"replaces": "SampleModuleName"
26+
},
2227
"target": {
2328
"type": "parameter",
2429
"datatype": "choice",

content/dotnet-template-azure-iot-edge-module/FSharp/Docker/linux-x64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ WORKDIR /app
66

77
COPY $EXE_DIR/ ./
88

9-
CMD ["dotnet", "SampleModule.dll"]
9+
CMD ["dotnet", "SampleModuleName.dll"]

content/dotnet-template-azure-iot-edge-module/FSharp/Docker/linux-x64/Dockerfile.debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ RUN apt-get install -y unzip procps
1212

1313
RUN curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l ~/vsdbg
1414

15-
CMD ["dotnet", "SampleModule.dll"]
15+
CMD ["dotnet", "SampleModuleName.dll"]

content/dotnet-template-azure-iot-edge-module/FSharp/Docker/windows-nano/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ WORKDIR /app
66

77
COPY $EXE_DIR/ ./
88

9-
CMD ["dotnet", "SampleModule.dll"]
9+
CMD ["dotnet", "SampleModuleName.dll"]
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"moduleContent": {
3+
"$edgeAgent": {
4+
"properties.desired": {
5+
"schemaVersion": "1.0",
6+
"runtime": {
7+
"type": "docker",
8+
"settings": {
9+
"minDockerVersion": "v1.25",
10+
"loggingOptions": ""
11+
}
12+
},
13+
"systemModules": {
14+
"edgeAgent": {
15+
"type": "docker",
16+
"settings": {
17+
"image": "microsoft/azureiotedge-agent:1.0-preview",
18+
"createOptions": ""
19+
}
20+
},
21+
"edgeHub": {
22+
"type": "docker",
23+
"status": "running",
24+
"restartPolicy": "always",
25+
"settings": {
26+
"image": "microsoft/azureiotedge-hub:1.0-preview",
27+
"createOptions": ""
28+
}
29+
}
30+
},
31+
"modules": {
32+
"SampleModuleName": {
33+
"version": "1.0",
34+
"type": "docker",
35+
"status": "running",
36+
"restartPolicy": "always",
37+
"settings": {
38+
"image": "<registry>/<image>:<tag>",
39+
"createOptions": "{}"
40+
}
41+
}
42+
}
43+
}
44+
},
45+
"$edgeHub": {
46+
"properties.desired": {
47+
"schemaVersion": "1.0",
48+
"routes": {
49+
"route": "FROM /* INTO $upstream"
50+
},
51+
"storeAndForwardConfiguration": {
52+
"timeToLiveSecs": 7200
53+
}
54+
}
55+
}
56+
}
57+
}

0 commit comments

Comments
 (0)