From 3d25966c178edc1c47f090bc36831ba25e56fce4 Mon Sep 17 00:00:00 2001 From: Shawn Anderson Date: Tue, 6 Apr 2021 09:46:49 -0400 Subject: [PATCH] Added support to set dotnet version during build --- Dockerfile | 3 ++- Dockerfile.build | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4131a49..9aaa3b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ FROM ghcr.io/linuxserver/baseimage-mono:LTS ARG BUILD_DATE ARG VERSION ARG RDTCLIENT_VERSION +ARG DOTNET_VERSION=5.0 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="ravensorb" @@ -22,7 +23,7 @@ RUN mkdir /app || true && ln -s /config /data && mkdir -p /data/downloads /data/ dpkg -i packages-microsoft-prod.deb 2> /dev/null && \ rm packages-microsoft-prod.deb && \ apt update -y -qq && \ - apt install -y -qq apt-transport-https dotnet-runtime-5.0 aspnetcore-runtime-5.0 && \ + apt install -y -qq apt-transport-https dotnet-runtime-${DOTNET_VERSION} aspnetcore-runtime-${DOTNET_VERSION} && \ echo "**** install rtd-client ****" && \ if [ -z ${RDTCLIENT_VERSION+x} ]; then \ RDTCLIENT_VERSION=$(curl -sX GET https://api.github.com/repos/rogerfar/rdt-client/releases/latest | jq -r ".name"); \ diff --git a/Dockerfile.build b/Dockerfile.build index 39f19b5..ac424fe 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -29,6 +29,7 @@ FROM ghcr.io/linuxserver/baseimage-mono:LTS ARG BUILD_DATE ARG VERSION ARG RDTCLIENT_VERSION +ARG DOTNET_VERSION=5.0 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="ravensorb" @@ -45,7 +46,7 @@ RUN mkdir /app || true && ln -s /config /data && mkdir -p /data/downloads /data/ dpkg -i packages-microsoft-prod.deb 2> /dev/null && \ rm packages-microsoft-prod.deb && \ apt update -y -qq && \ - apt install -y -qq apt-transport-https dotnet-runtime-5.0 aspnetcore-runtime-5.0 && \ + apt install -y -qq apt-transport-https dotnet-runtime-${DOTNET_VERSION} aspnetcore-runtime-${DOTNET_VERSION} && \ echo "**** Setting permissions ****" && \ chown -R abc:abc /data && \ echo "**** Cleaning image ****" && \