From 05d21f5f787cfa863bd1847265820ab6a119b56b Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Thu, 15 Feb 2024 01:23:51 -0500
Subject: Make all variables more descriptive

---
 debian/docker/Dockerfile | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'debian/docker/Dockerfile')

diff --git a/debian/docker/Dockerfile b/debian/docker/Dockerfile
index ebb6bb6..02caa7b 100644
--- a/debian/docker/Dockerfile
+++ b/debian/docker/Dockerfile
@@ -4,28 +4,28 @@ ARG NODEJS_VERSION=20
 # Default to 12, but set externally by the `build.py` script
 ARG GCC_VERSION=12
 
-ARG PTYPE
-ARG PVERSION
-ARG PARCH
+ARG PACKAGE_TYPE
+ARG PACKAGE_VERSION
+ARG PACKAGE_ARCH
 
-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 PARCH
+ARG PACKAGE_TYPE
+ARG PACKAGE_VERSION
+ARG PACKAGE_ARCH
 ARG GCC_VERSION
 
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
 ENV DEB_BUILD_OPTIONS=noddebs
-ENV TYPE=${PTYPE}
-ENV VERSION=${PVERSION}
-ENV ARCH=${PARCH}
+ENV TYPE=${PACKAGE_TYPE}
+ENV VERSION=${PACKAGE_VERSION}
+ENV ARCH=${PACKAGE_ARCH}
 
 # Prepare Debian build environment
 RUN apt-get update -y \
@@ -39,7 +39,7 @@ RUN apt-get update -y \
  && rm -rf /var/lib/apt/lists/*
 
 # Prepare the cross-toolchain
-RUN if test "${PARCH}" != "$( dpkg --print-architecture )"; then \
+RUN if test "${PACKAGE_ARCH}" != "$( dpkg --print-architecture )"; then \
  if grep -q -i ubuntu /etc/os-release; then \
    rm /etc/apt/sources.list \
    && export CODENAME="$( lsb_release -c -s )" \
@@ -47,33 +47,33 @@ RUN if test "${PARCH}" != "$( dpkg --print-architecture )"; then \
    && echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ ${CODENAME}-updates main restricted universe multiverse" >>/etc/apt/sources.list.d/amd64.list \
    && echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ ${CODENAME}-backports main restricted universe multiverse" >>/etc/apt/sources.list.d/amd64.list \
    && echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ ${CODENAME}-security main restricted universe multiverse" >>/etc/apt/sources.list.d/amd64.list \
-   && echo "deb [arch=${PARCH}] http://ports.ubuntu.com/ ${CODENAME} main restricted universe multiverse" >>/etc/apt/sources.list.d/${PARCH}.list \
-   && echo "deb [arch=${PARCH}] http://ports.ubuntu.com/ ${CODENAME}-updates main restricted universe multiverse" >>/etc/apt/sources.list.d/${PARCH}.list \
-   && echo "deb [arch=${PARCH}] http://ports.ubuntu.com/ ${CODENAME}-backports main restricted universe multiverse" >>/etc/apt/sources.list.d/${PARCH}.list \
-   && echo "deb [arch=${PARCH}] http://ports.ubuntu.com/ ${CODENAME}-security main restricted universe multiverse" >>/etc/apt/sources.list.d/${PARCH}.list \
+   && echo "deb [arch=${PACKAGE_ARCH}] http://ports.ubuntu.com/ ${CODENAME} main restricted universe multiverse" >>/etc/apt/sources.list.d/${PACKAGE_ARCH}.list \
+   && echo "deb [arch=${PACKAGE_ARCH}] http://ports.ubuntu.com/ ${CODENAME}-updates main restricted universe multiverse" >>/etc/apt/sources.list.d/${PACKAGE_ARCH}.list \
+   && echo "deb [arch=${PACKAGE_ARCH}] http://ports.ubuntu.com/ ${CODENAME}-backports main restricted universe multiverse" >>/etc/apt/sources.list.d/${PACKAGE_ARCH}.list \
+   && echo "deb [arch=${PACKAGE_ARCH}] http://ports.ubuntu.com/ ${CODENAME}-security main restricted universe multiverse" >>/etc/apt/sources.list.d/${PACKAGE_ARCH}.list \
  ; fi \
  && set -o xtrace \
- && dpkg --add-architecture ${PARCH} \
+ && dpkg --add-architecture ${PACKAGE_ARCH} \
  && apt-get update -y \
  && apt-get install --no-install-recommends -y cross-gcc-dev \
- && TARGET_LIST="${PARCH}" cross-gcc-gensource ${GCC_VERSION} \
- && cd cross-gcc-packages-amd64/cross-gcc-${GCC_VERSION}-${PARCH} \
+ && TARGET_LIST="${PACKAGE_ARCH}" cross-gcc-gensource ${GCC_VERSION} \
+ && cd cross-gcc-packages-amd64/cross-gcc-${GCC_VERSION}-${PACKAGE_ARCH} \
  && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \
     apt-get -f install --no-install-recommends -o Dpkg::Options::="--force-overwrite" -y \
     bison flex libtool gdb sharutils netbase libmpc-dev libmpfr-dev libgmp-dev \
     systemtap-sdt-dev autogen expect chrpath zlib1g-dev zip \
     binutils-aarch64-linux-gnu binutils-arm-linux-gnueabihf \
-    gcc-${GCC_VERSION}-source libstdc++-${GCC_VERSION}-dev-${PARCH}-cross \
-    libc6-dev:${PARCH} linux-libc-dev:${PARCH} libgcc1:${PARCH} libstdc++-${GCC_VERSION}-dev:${PARCH} \
-    libfontconfig*-dev:${PARCH} libcurl*openssl-dev:${PARCH} libfreetype*-dev:${PARCH} libssl-dev:${PARCH} \
-    libssl[13].*:${PARCH} liblttng-ust*:${PARCH} \
+    gcc-${GCC_VERSION}-source libstdc++-${GCC_VERSION}-dev-${PACKAGE_ARCH}-cross \
+    libc6-dev:${PACKAGE_ARCH} linux-libc-dev:${PACKAGE_ARCH} libgcc1:${PACKAGE_ARCH} libstdc++-${GCC_VERSION}-dev:${PACKAGE_ARCH} \
+    libfontconfig*-dev:${PACKAGE_ARCH} libcurl*openssl-dev:${PACKAGE_ARCH} libfreetype*-dev:${PACKAGE_ARCH} libssl-dev:${PACKAGE_ARCH} \
+    libssl[13].*:${PACKAGE_ARCH} liblttng-ust*:${PACKAGE_ARCH} \
  && apt-get clean autoclean -y \
  && apt-get autoremove -y \
  && rm -rf /var/lib/apt/lists/* \
  ; fi
 
 # 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