Skip to content

Commit

Permalink
Base image update for ARM32 and ARM64 platforms for security vulnerab…
Browse files Browse the repository at this point in the history
…ility [USN-4377-1] (Azure#3202)

Base image update for ARM32 and ARM64 platforms for security vulnerability [USN-4377-1](https://lists.ubuntu.com/archives/ubuntu-security-announce/2020-June/005457.html) with iotedge non-root user
3.1.5-bionic-arm32v7 -> 1.0.6.0-linux-arm32v7
3.1.5-bionic-arm64v8 -> 1.0.6.0-linux-arm64v8

(Cherry-pick from Azure@a9ce4ce)
  • Loading branch information
yophilav authored Jul 22, 2020
1 parent db895a6 commit 1fb21ff
Show file tree
Hide file tree
Showing 45 changed files with 48 additions and 48 deletions.
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.6-linux-arm32v7
ARG base_tag=1.0.6.0-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.4-bionic-arm32v7
ARG base_tag=3.1.5-bionic-arm32v7
FROM mcr.microsoft.com/dotnet/core/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.6-linux-arm64v8
ARG base_tag=1.0.6.0-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.4-bionic-arm64v8
ARG base_tag=3.1.5-bionic-arm64v8
ARG num_procs=4

FROM mcr.microsoft.com/dotnet/core/aspnet:${base_tag}
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-linux-arm32v7
ARG base_tag=1.0.6.0-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.4-bionic-arm32v7
ARG base_tag=3.1.5-bionic-arm32v7
FROM mcr.microsoft.com/dotnet/core/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-linux-arm64v8
ARG base_tag=1.0.6.0-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.4-bionic-arm64v8
ARG base_tag=3.1.5-bionic-arm64v8
FROM mcr.microsoft.com/dotnet/core/aspnet:${base_tag}

# Add an unprivileged user account for running Edge Hub
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-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-linux-arm64v8
ARG base_tag=1.0.6.0-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=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-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.4-bionic-arm32v7
ARG base_tag=3.1.5-bionic-arm32v7
FROM mcr.microsoft.com/dotnet/core/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-linux-arm64v8
ARG base_tag=1.0.6.0-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.4-bionic-arm64v8
ARG base_tag=3.1.5-bionic-arm64v8
FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}

# Add an unprivileged user account for running the module
Expand Down
4 changes: 2 additions & 2 deletions scripts/linux/createArmBase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ process_args()
print_help_and_exit
fi

if [[ "azureiotedge-module-base" != ${DOCKER_IMAGENAME} ]] && [[ "azureiotedge-hub-base" != ${DOCKER_IMAGENAME} ]] && [[ "azureiotedge-agent-base" != ${DOCKER_IMAGENAME} ]] && [[ "azureiotedge-iotedged-base" != ${DOCKER_IMAGENAME} ]] && [[ "azureiotedge-proxy-base" != ${DOCKER_IMAGENAME} ]]; then
echo "Docker image name must be one of azureiotedge-module-base, azureiotedge-hub-base, azureiotedge-agent-base, azureiotedge-iotedged-base or azureiotedge-proxy-base"
if [[ "azureiotedge-module-base" != ${DOCKER_IMAGENAME} ]] && [[ "azureiotedge-hub-base" != ${DOCKER_IMAGENAME} ]] && [[ "azureiotedge-agent-base" != ${DOCKER_IMAGENAME} ]] && [[ "azureiotedge-iotedged-base" != ${DOCKER_IMAGENAME} ]] && [[ "azureiotedge-proxy-base" != ${DOCKER_IMAGENAME} ]] && [[ "azureiotedge-module-base-full" != ${DOCKER_IMAGENAME} ]]; then
echo "Docker image name must be one of azureiotedge-module-base, azureiotedge-module-base-full, azureiotedge-hub-base, azureiotedge-agent-base, azureiotedge-iotedged-base or azureiotedge-proxy-base"
print_help_and_exit
fi

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-linux-arm32v7
FROM edgebuilds.azurecr.io/microsoft/azureiotedge-module-base-full:${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-linux-arm64v8
ARG base_tag=1.0.6.0-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=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-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-linux-arm64v8
ARG base_tag=1.0.6.0-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=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-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-linux-arm64v8
ARG base_tag=1.0.6.0-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=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-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-linux-arm64v8
ARG base_tag=1.0.6.0-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=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-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-linux-arm64v8
ARG base_tag=1.0.6.0-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=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-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-linux-arm64v8
ARG base_tag=1.0.6.0-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=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-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-linux-arm64v8
ARG base_tag=1.0.6.0-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=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-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-linux-arm64v8
ARG base_tag=1.0.6.0-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

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

ARG EXE_DIR=.
Expand Down
2 changes: 1 addition & 1 deletion test/modules/Relayer/docker/linux/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5-linux-arm64v8
ARG base_tag=1.0.6.0-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=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-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-linux-arm64v8
ARG base_tag=1.0.6.0-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
2 changes: 1 addition & 1 deletion test/modules/TestAnalyzer/docker/linux/arm32v7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-linux-arm32v7
FROM edgebuilds.azurecr.io/microsoft/azureiotedge-module-base-full:${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.4-bionic-arm32v7
ARG base_tag=3.1.5-bionic-arm32v7
FROM mcr.microsoft.com/dotnet/core/aspnet:${base_tag}

RUN apt-get update && apt-get install -y libcap2-bin libsnappy1v5 && \
Expand Down
2 changes: 1 addition & 1 deletion test/modules/TestAnalyzer/docker/linux/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5-linux-arm64v8
ARG base_tag=1.0.6.0-linux-arm64v8
FROM edgebuilds.azurecr.io/microsoft/azureiotedge-module-base-full:${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.4-bionic-arm64v8
ARG base_tag=3.1.5-bionic-arm64v8
FROM mcr.microsoft.com/dotnet/core/aspnet:${base_tag}

RUN apt-get update && \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-linux-arm32v7
FROM edgebuilds.azurecr.io/microsoft/azureiotedge-module-base-full:${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-linux-arm64v8
ARG base_tag=1.0.6.0-linux-arm64v8
FROM edgebuilds.azurecr.io/microsoft/azureiotedge-module-base-full:${base_tag}

ARG EXE_DIR=.
Expand Down
4 changes: 2 additions & 2 deletions test/modules/TwinTester/docker/linux/arm32v7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=1.0.5-linux-arm32v7
FROM edgebuilds.azurecr.io/microsoft/azureiotedge-module-base-rocksdb:${base_tag}
ARG base_tag=1.0.6.0-linux-arm32v7
FROM edgebuilds.azurecr.io/microsoft/azureiotedge-module-base-full:${base_tag}

ARG EXE_DIR=.

Expand Down
4 changes: 2 additions & 2 deletions test/modules/TwinTester/docker/linux/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG base_tag=1.0.5-linux-arm64v8
FROM edgebuilds.azurecr.io/microsoft/azureiotedge-module-base-rocksdb:${base_tag}
ARG base_tag=1.0.6.0-linux-arm64v8
FROM edgebuilds.azurecr.io/microsoft/azureiotedge-module-base-full:${base_tag}

ARG EXE_DIR=.

Expand Down
2 changes: 1 addition & 1 deletion test/modules/load-gen/docker/linux/arm32v7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5-linux-arm32v7
ARG base_tag=1.0.6.0-linux-arm32v7
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down
2 changes: 1 addition & 1 deletion test/modules/load-gen/docker/linux/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_tag=1.0.5-linux-arm64v8
ARG base_tag=1.0.6.0-linux-arm64v8
FROM azureiotedge/azureiotedge-module-base:${base_tag}

ARG EXE_DIR=.
Expand Down

0 comments on commit 1fb21ff

Please sign in to comment.