Skip to content

Commit

Permalink
Update Base Images for a Security Patch (#5191)
Browse files Browse the repository at this point in the history
Update Base Images for Security Patch
- ARM32/64 ๐Ÿ ˜ 3.1.16-bionic-arm*
- Linux AMD64 ๐Ÿ ˜ 3.1.16-alpine3.13
- Winwods AMD64 ๐Ÿ ˜ 3.1.16-nanoserver-1809
  • Loading branch information
yophilav committed Jun 30, 2021
1 parent b4d989b commit de48c49
Show file tree
Hide file tree
Showing 103 changed files with 122 additions and 122 deletions.
2 changes: 1 addition & 1 deletion edge-agent/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=3.1.15-alpine3.13
ARG base_tag=3.1.16-alpine3.13
# base dockerfile is located at \edge-util\docker\linux\amd64
FROM azureiotedge/azureiotedge-runtime-base:1.2-linux-amd64 as builder

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.11-linux-arm32v7
ARG base_tag=1.0.5.12-linux-arm32v7
FROM azureiotedge/azureiotedge-agent-base:${base_tag}

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

RUN apt-get update && \
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.11-linux-arm64v8
ARG base_tag=1.0.5.12-linux-arm64v8

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

Expand Down
2 changes: 1 addition & 1 deletion edge-agent/docker/linux/arm64v8/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=3.1.15-bionic-arm64v8
ARG base_tag=3.1.16-bionic-arm64v8
ARG num_procs=4

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

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

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.11-linux-arm32v7
ARG base_tag=1.0.5.12-linux-arm32v7
FROM azureiotedge/azureiotedge-hub-base:${base_tag}

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

# Add an unprivileged user account for running Edge Hub
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.11-linux-arm64v8
ARG base_tag=1.0.5.12-linux-arm64v8
FROM azureiotedge/azureiotedge-hub-base:${base_tag}

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

# Add an unprivileged user account for running Edge Hub
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,4 +1,4 @@
ARG base_tag=3.1.15-nanoserver-1809
ARG base_tag=3.1.16-nanoserver-1809
FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}

ARG EXE_DIR=.
Expand All @@ -12,4 +12,4 @@ EXPOSE 8883/tcp
EXPOSE 5671/tcp
EXPOSE 443/tcp

CMD ["dotnet", "Microsoft.Azure.Devices.Edge.Hub.Service.dll"]
CMD ["dotnet", "Microsoft.Azure.Devices.Edge.Hub.Service.dll"]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=3.1.15-alpine3.13
ARG base_tag=3.1.16-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.11-linux-arm32v7
ARG base_tag=1.0.5.12-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.11-linux-arm64v8
ARG base_tag=1.0.5.12-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,4 +1,4 @@
ARG base_tag=3.1.15-nanoserver-1809
ARG base_tag=3.1.16-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,4 +1,4 @@
ARG base_tag=3.1.15-alpine3.13
ARG base_tag=3.1.16-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.11-linux-arm32v7
ARG base_tag=1.0.5.12-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=3.1.15-bionic-arm32v7
ARG base_tag=3.1.16-bionic-arm32v7
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

# Add an unprivileged user account for running the module
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.11-linux-arm64v8
ARG base_tag=1.0.5.12-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,4 +1,4 @@
ARG base_tag=3.1.15-bionic-arm64v8
ARG base_tag=3.1.16-bionic-arm64v8
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

# Add an unprivileged user account for running the module
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=3.1.15-nanoserver-1809
ARG base_tag=3.1.16-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.
Expand All @@ -7,4 +7,4 @@ WORKDIR /app

COPY $EXE_DIR/ ./

CMD ["dotnet", "SimulatedTemperatureSensor.dll"]
CMD ["dotnet", "SimulatedTemperatureSensor.dll"]
2 changes: 1 addition & 1 deletion edge-modules/azure-monitor/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=3.1.15-alpine3.12
ARG base_tag=3.1.16-alpine3.13
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.
Expand Down
2 changes: 1 addition & 1 deletion edge-modules/azure-monitor/docker/linux/arm32v7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.11-linux-arm32v7
ARG base_tag=1.0.5.12-linux-arm32v7
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
2 changes: 1 addition & 1 deletion edge-modules/azure-monitor/docker/linux/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5.11-linux-arm64v8
ARG base_tag=1.0.5.12-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
2 changes: 1 addition & 1 deletion edge-modules/azure-monitor/docker/windows/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=3.1.15-nanoserver-1809
ARG base_tag=3.1.16-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.
Expand Down
2 changes: 1 addition & 1 deletion edge-modules/edgehub-proxy/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM haproxy:1.8.23-alpine
FROM haproxy:1.8.23-alpine

RUN apk add --no-cache curl jq

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azure-functions/dotnet:3.0
FROM mcr.microsoft.com/azure-functions/dotnet:3.0

ENV AzureWebJobsScriptRoot=/app

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# escape=`
# escape=`

FROM mcr.microsoft.com/azure-functions/dotnet:3.0-nanoserver-1809

COPY . /approot
COPY . /approot
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=3.1.15-alpine3.13
ARG base_tag=3.1.16-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.11-linux-arm32v7
ARG base_tag=1.0.5.12-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.11-linux-arm64v8
ARG base_tag=1.0.5.12-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,4 +1,4 @@
ARG base_tag=3.1.15-nanoserver-1809
ARG base_tag=3.1.16-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.
Expand Down
6 changes: 3 additions & 3 deletions edge-util/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# docker file for azureiotedge/azureiotedge-runtime-base:1.2-linux-amd64
FROM alpine:3.10
# docker file for azureiotedge/azureiotedge-runtime-base:1.2-linux-amd64
FROM alpine:3.13

ARG num_procs=4

Expand All @@ -12,4 +12,4 @@ RUN git clone -b v5.17.2 --depth 1 https://github.com/facebook/rocksdb.git && \
CFLAGS="-static-libstdc++ -Wno-psabi -DSNAPPY" PORTABLE=1 make -j ${num_procs} shared_lib && \
strip librocksdb.so && \
mkdir -p ../publish && \
cp -vL librocksdb.so ../publish/
cp -vL librocksdb.so ../publish/
2 changes: 1 addition & 1 deletion edgelet/iotedge-proxy/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.13

RUN addgroup -S proxy && adduser -S proxy -G proxy
USER proxy
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedged/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:10-slim
FROM debian:10-slim

# package installation needs to exec as root
RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion mqtt/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- mode: dockerfile -*-
# -*- mode: dockerfile -*-

# You can override this `--build-arg BASE_IMAGE=...` to use different
# version of Rust or OpenSSL.
Expand Down
4 changes: 2 additions & 2 deletions smoke/docker/linux/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Base image runs systemd, allows us to install/run iotedged in a container for testing
# Base image runs systemd, allows us to install/run iotedged in a container for testing
FROM solita/ubuntu-systemd:bionic

# Install dependencies
Expand All @@ -12,4 +12,4 @@ RUN apt-get update && \
ca-certificates \
# Needed to get the IP address used for iotedged's management endpoint
iproute2 && \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=3.1.15-alpine3.13
ARG base_tag=3.1.16-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.11-linux-arm32v7
ARG base_tag=1.0.5.12-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.11-linux-arm64v8
ARG base_tag=1.0.5.12-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,4 +1,4 @@
ARG base_tag=3.1.15-nanoserver-1809
ARG base_tag=3.1.16-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.
Expand All @@ -7,4 +7,4 @@ WORKDIR /app

COPY $EXE_DIR/ ./

CMD ["dotnet", "NetworkController.dll"]
CMD ["dotnet", "NetworkController.dll"]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=3.1.15-alpine3.13
ARG base_tag=3.1.16-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.11-linux-arm32v7
ARG base_tag=1.0.5.12-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.11-linux-arm64v8
ARG base_tag=1.0.5.12-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,4 +1,4 @@
ARG base_tag=3.1.15-nanoserver-1809
ARG base_tag=3.1.16-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ENV MODULE_NAME "CloudToDeviceMessageTester.dll"
Expand All @@ -9,4 +9,4 @@ WORKDIR /app

COPY $EXE_DIR/ ./

CMD ["dotnet", "CloudToDeviceMessageTester.dll"]
CMD ["dotnet", "CloudToDeviceMessageTester.dll"]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=3.1.15-alpine3.13
ARG base_tag=3.1.16-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.11-linux-arm32v7
ARG base_tag=1.0.5.12-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.11-linux-arm64v8
ARG base_tag=1.0.5.12-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,4 +1,4 @@
ARG base_tag=3.1.15-nanoserver-1809
ARG base_tag=3.1.16-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,4 +1,4 @@
ARG base_tag=3.1.15-alpine3.13
๏ปฟARG base_tag=3.1.16-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.11-linux-arm32v7
ARG base_tag=1.0.5.12-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.11-linux-arm64v8
ARG base_tag=1.0.5.12-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,4 +1,4 @@
ARG base_tag=3.1.15-nanoserver-1809
๏ปฟARG base_tag=3.1.16-nanoserver-1809
FROM mcr.microsoft.com/dotnet/runtime:${base_tag}

ARG EXE_DIR=.
Expand All @@ -7,4 +7,4 @@ WORKDIR /app

COPY $EXE_DIR/ ./

CMD ["dotnet", "DirectMethodReceiver.dll"]
CMD ["dotnet", "DirectMethodReceiver.dll"]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=3.1.15-alpine3.13
๏ปฟARG base_tag=3.1.16-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.11-linux-arm32v7
ARG base_tag=1.0.5.12-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.11-linux-arm64v8
ARG base_tag=1.0.5.12-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down

0 comments on commit de48c49

Please sign in to comment.