From 05d21f5f787cfa863bd1847265820ab6a119b56b Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Thu, 15 Feb 2024 01:23:51 -0500 Subject: Make all variables more descriptive --- portable/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'portable/Dockerfile') diff --git a/portable/Dockerfile b/portable/Dockerfile index 3f86299..096192a 100644 --- a/portable/Dockerfile +++ b/portable/Dockerfile @@ -2,23 +2,23 @@ ARG DOTNET_VERSION=8.0 ARG NODEJS_VERSION=20 -ARG PTYPE=debian -ARG PVERSION=12 +ARG PACKAGE_TYPE=debian +ARG PACKAGE_VERSION=12 -FROM ${PTYPE}:${PVERSION} +FROM ${PACKAGE_TYPE}:${PACKAGE_VERSION} ARG SOURCE_DIR=/jellyfin ARG ARTIFACT_DIR=/dist ARG DOTNET_VERSION ARG NODEJS_VERSION -ARG PTYPE -ARG PVERSION +ARG PACKAGE_TYPE +ARG PACKAGE_VERSION # Docker run environment ENV SOURCE_DIR=/jellyfin ENV ARTIFACT_DIR=/dist -ENV TYPE=${PTYPE} -ENV VERSION=${PVERSION} +ENV TYPE=${PACKAGE_TYPE} +ENV VERSION=${PACKAGE_VERSION} ENV ARCHIVE_TYPES=tar # Prepare Debian build environment @@ -33,7 +33,7 @@ RUN apt-get update -y \ && rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/* # Prepare dotnet SDK -RUN wget https://packages.microsoft.com/config/${PTYPE}/${PVERSION}/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ +RUN wget https://packages.microsoft.com/config/${PACKAGE_TYPE}/${PACKAGE_VERSION}/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb \ && apt-get -f install \ && apt-get update \ -- cgit