diff options
| author | Andrew Rabert <ar@nullsum.net> | 2019-10-19 19:36:56 -0400 |
|---|---|---|
| committer | Andrew Rabert <ar@nullsum.net> | 2019-10-19 19:36:56 -0400 |
| commit | 64eca9e1c74c3a22008d06569c992ef0ec428e9c (patch) | |
| tree | 4a9d418133fd67797c81baf1fe956fbce963a435 | |
| parent | cd3c14961f9acfce29bdff14da9fcbc063a40257 (diff) | |
Update Docker containers to dotnet 3.0
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Dockerfile.arm | 2 | ||||
| -rw-r--r-- | Dockerfile.arm64 | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile index 7fe55d544..6c938a557 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG DOTNET_VERSION=2.2 +ARG DOTNET_VERSION=3.0 ARG FFMPEG_VERSION=latest FROM node:alpine as web-builder diff --git a/Dockerfile.arm b/Dockerfile.arm index 7999621ba..92af22530 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -17,8 +17,6 @@ FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION} as builder WORKDIR /repo COPY . . ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 -# TODO Remove or update the sed line when we update dotnet version. -RUN find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \; # Discard objs - may cause failures if exists RUN find . -type d -name obj | xargs -r rm -r # Build diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 29ce31869..7dbdd1f06 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -17,8 +17,6 @@ FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION} as builder WORKDIR /repo COPY . . ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 -# TODO Remove or update the sed line when we update dotnet version. -RUN find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \; # Discard objs - may cause failures if exists RUN find . -type d -name obj | xargs -r rm -r # Build |