Skip to content

Commit aae242b

Browse files
author
Summer
authored
add support to arm32v7 and revert fix due to dotnet template regression (#14)
* add arm32v7 dockerfiles, update linux-x64 docker image to stretch tag * upgrade * revert customize name parameter in .template.json due to dotnet tempalting regression
1 parent be07c29 commit aae242b

File tree

13 files changed

+35
-21
lines changed

13 files changed

+35
-21
lines changed

Microsoft.Azure.IoT.Edge.Module.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>Microsoft.Azure.IoT.Edge.Module</id>
5-
<version>1.1.0</version>
5+
<version>1.2.0</version>
66
<title>Azure IoT Edge Module</title>
77
<authors>Microsoft</authors>
88
<owners>microsoft, nugetazureiotedge</owners>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
}
2020
],
2121
"symbols": {
22-
"name": {
23-
"type": "parameter",
24-
"datatype": "string",
25-
"replaces": "SampleModuleName"
26-
},
2722
"target": {
2823
"type": "parameter",
2924
"datatype": "choice",
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
FROM microsoft/dotnet:2.0.0-runtime-stretch-arm32v7
2+
3+
ARG EXE_DIR=.
4+
5+
WORKDIR /app
6+
7+
COPY $EXE_DIR/ ./
8+
9+
CMD ["dotnet", "SampleModule.dll"]
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM microsoft/dotnet:2.0.0-runtime-stretch-arm32v7
2+
3+
ARG EXE_DIR=.
4+
5+
WORKDIR /app
6+
7+
COPY $EXE_DIR/ ./
8+
9+
RUN apt-get update
10+
11+
RUN apt-get install -y unzip procps
12+
13+
RUN curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l ~/vsdbg
14+
15+
CMD ["dotnet", "SampleModule.dll"]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM microsoft/dotnet:2.0.0-runtime
1+
FROM microsoft/dotnet:2.0.0-runtime-stretch
22

33
ARG EXE_DIR=.
44

55
WORKDIR /app
66

77
COPY $EXE_DIR/ ./
88

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.0.0-runtime
1+
FROM microsoft/dotnet:2.0.0-runtime-stretch
22

33
ARG EXE_DIR=.
44

@@ -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", "SampleModuleName.dll"]
15+
CMD ["dotnet", "SampleModule.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", "SampleModuleName.dll"]
9+
CMD ["dotnet", "SampleModule.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-
"SampleModuleName": {
32+
"SampleModule": {
3333
"version": "1.0",
3434
"type": "docker",
3535
"status": "running",

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
}
2020
],
2121
"symbols": {
22-
"name": {
23-
"type": "parameter",
24-
"datatype": "string",
25-
"replaces": "SampleModuleName"
26-
},
2722
"target": {
2823
"type": "parameter",
2924
"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", "SampleModuleName.dll"]
9+
CMD ["dotnet", "SampleModule.dll"]

0 commit comments

Comments
 (0)