Skip to content

Commit

Permalink
Update ASP.NET Core Runtime base images (Azure#4573)
Browse files Browse the repository at this point in the history
- Linux AMD64: `3.1.12-alpine3.12` --> `3.1.13-alpine3.13`
- Linux ARM32: `3.1.12-bionic-arm*` --> `3.1.13-bionic-arm*` (1.0.5.9-linux-arm*)
- Address CR path different : dotnet/dotnet-docker#2375
  • Loading branch information
yophilav authored and darobs committed Mar 22, 2021
1 parent e9564d1 commit 1cdcdbb
Show file tree
Hide file tree
Showing 89 changed files with 137 additions and 137 deletions.
4 changes: 2 additions & 2 deletions edge-agent/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG base_tag=3.1.12-alpine3.12
ARG base_tag=3.1.13-alpine3.13
# base dockerfile is located at \edge-util\docker\linux\amd64
FROM azureiotedge/azureiotedge-runtime-base:1.2-linux-amd64 as builder

FROM mcr.microsoft.com/dotnet/core/aspnet:${base_tag}
FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}

ARG EXE_DIR=.

Expand Down
2 changes: 1 addition & 1 deletion edge-agent/docker/linux/arm32v7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm32v7
ARG base_tag=1.0.5.9-linux-arm32v7
FROM azureiotedge/azureiotedge-agent-base:${base_tag}

ARG EXE_DIR=.
Expand Down
4 changes: 2 additions & 2 deletions edge-agent/docker/linux/arm32v7/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-bionic-arm32v7
FROM mcr.microsoft.com/dotnet/core/aspnet:${base_tag}
ARG base_tag=3.1.13-bionic-arm32v7
FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}

RUN apt-get update && \
apt-get install -y libsnappy1v5 && \
Expand Down
2 changes: 1 addition & 1 deletion edge-agent/docker/linux/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm64v8
ARG base_tag=1.0.5.9-linux-arm64v8

FROM azureiotedge/azureiotedge-agent-base:${base_tag}

Expand Down
4 changes: 2 additions & 2 deletions edge-agent/docker/linux/arm64v8/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG base_tag=3.1.12-bionic-arm64v8
ARG base_tag=3.1.13-bionic-arm64v8
ARG num_procs=4

FROM mcr.microsoft.com/dotnet/core/aspnet:${base_tag}
FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}

RUN mkdir -p ../publish

Expand Down
4 changes: 2 additions & 2 deletions edge-agent/docker/windows/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-nanoserver-1809
FROM mcr.microsoft.com/dotnet/core/aspnet:${base_tag}
ARG base_tag=3.1.13-nanoserver-1809
FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}

# In order to set system PATH, ContainerAdministrator must be used
USER ContainerAdministrator
Expand Down
4 changes: 2 additions & 2 deletions edge-hub/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG base_tag=3.1.12-alpine3.12
ARG base_tag=3.1.13-alpine3.13
# base dockerfile is located at \edge-util\docker\linux\amd64
FROM azureiotedge/azureiotedge-runtime-base:1.2-linux-amd64 as builder

FROM mcr.microsoft.com/dotnet/core/aspnet:${base_tag}
FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}

ARG EXE_DIR=.

Expand Down
2 changes: 1 addition & 1 deletion edge-hub/docker/linux/arm32v7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm32v7
ARG base_tag=1.0.5.9-linux-arm32v7
FROM azureiotedge/azureiotedge-hub-base:${base_tag}

ARG EXE_DIR=.
Expand Down
4 changes: 2 additions & 2 deletions edge-hub/docker/linux/arm32v7/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-bionic-arm32v7
FROM mcr.microsoft.com/dotnet/core/aspnet:${base_tag}
ARG base_tag=3.1.13-bionic-arm32v7
FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}

# Add an unprivileged user account for running Edge Hub
ARG EDGEHUBUSER_ID=1000
Expand Down
2 changes: 1 addition & 1 deletion edge-hub/docker/linux/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm64v8
ARG base_tag=1.0.5.9-linux-arm64v8
FROM azureiotedge/azureiotedge-hub-base:${base_tag}

ARG EXE_DIR=.
Expand Down
4 changes: 2 additions & 2 deletions edge-hub/docker/linux/arm64v8/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-bionic-arm64v8
FROM mcr.microsoft.com/dotnet/core/aspnet:${base_tag}
ARG base_tag=3.1.13-bionic-arm64v8
FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}

# Add an unprivileged user account for running Edge Hub
ARG EDGEHUBUSER_ID=1000
Expand Down
4 changes: 2 additions & 2 deletions edge-hub/docker/windows/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-nanoserver-1809
FROM mcr.microsoft.com/dotnet/core/aspnet:${base_tag}
ARG base_tag=3.1.13-nanoserver-1809
FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}

ARG EXE_DIR=.

Expand Down
4 changes: 2 additions & 2 deletions edge-modules/MetricsCollector/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-alpine3.12
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-alpine3.13
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm32v7
ARG base_tag=1.0.5.9-linux-arm32v7
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm64v8
ARG base_tag=1.0.5.9-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
4 changes: 2 additions & 2 deletions edge-modules/MetricsCollector/docker/windows/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-nanoserver-1809
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-alpine3.12
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-alpine3.13
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm32v7
ARG base_tag=1.0.5.9-linux-arm32v7
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-bionic-arm32v7
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-bionic-arm32v7
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

# Add an unprivileged user account for running the module
RUN useradd -ms /bin/bash moduleuser
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm64v8
ARG base_tag=1.0.5.9-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-bionic-arm64v8
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-bionic-arm64v8
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

# Add an unprivileged user account for running the module
RUN useradd -ms /bin/bash moduleuser
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-nanoserver-1809
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-alpine3.12
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-alpine3.13
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm32v7
ARG base_tag=1.0.5.9-linux-arm32v7
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm64v8
ARG base_tag=1.0.5.9-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-nanoserver-1809
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-alpine3.12
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-alpine3.13
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Network controller arm32 and arm64 require different base images. This is because arm32 needs iproute tooling and thus needs module-base-full.
ARG base_tag=1.0.5.8-linux-arm32v7
ARG base_tag=1.0.5.9-linux-arm32v7
FROM azureiotedge/azureiotedge-module-base-full:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Network controller arm32 and arm64 require different base images. This is because arm32 needs iproute tooling and thus needs module-base-full.
ARG base_tag=1.0.5.8-linux-arm64v8
ARG base_tag=1.0.5.9-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-nanoserver-1809
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-alpine3.12
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-alpine3.13
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm32v7
ARG base_tag=1.0.5.9-linux-arm32v7
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm64v8
ARG base_tag=1.0.5.9-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-nanoserver-1809
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ENV MODULE_NAME "CloudToDeviceMessageTester.dll"

Expand Down
4 changes: 2 additions & 2 deletions test/modules/DeploymentTester/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-alpine3.12
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-alpine3.13
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm32v7
ARG base_tag=1.0.5.9-linux-arm32v7
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm64v8
ARG base_tag=1.0.5.9-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
4 changes: 2 additions & 2 deletions test/modules/DeploymentTester/docker/windows/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-nanoserver-1809
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ENV MODULE_NAME "DeploymentTester.dll"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-alpine3.12
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-alpine3.13
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm32v7
ARG base_tag=1.0.5.9-linux-arm32v7
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm64v8
ARG base_tag=1.0.5.9-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-nanoserver-1809
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
4 changes: 2 additions & 2 deletions test/modules/DirectMethodSender/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-alpine3.12
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-alpine3.13
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm32v7
ARG base_tag=1.0.5.9-linux-arm32v7
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm64v8
ARG base_tag=1.0.5.9-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-nanoserver-1809
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-alpine3.12
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-alpine3.13
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm32v7
ARG base_tag=1.0.5.9-linux-arm32v7
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm64v8
ARG base_tag=1.0.5.9-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-nanoserver-1809
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
4 changes: 2 additions & 2 deletions test/modules/MetricsValidator/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-alpine3.12
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-alpine3.13
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm32v7
ARG base_tag=1.0.5.9-linux-arm32v7
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.8-linux-arm64v8
ARG base_tag=1.0.5.9-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
4 changes: 2 additions & 2 deletions test/modules/MetricsValidator/docker/windows/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=3.1.12-nanoserver-1809
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
ARG base_tag=3.1.13-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.

Expand Down
Loading

0 comments on commit 1cdcdbb

Please sign in to comment.