diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2024-02-15 01:23:51 -0500 |
|---|---|---|
| committer | Joshua M. Boniface <joshua@boniface.me> | 2024-02-15 01:23:51 -0500 |
| commit | 05d21f5f787cfa863bd1847265820ab6a119b56b (patch) | |
| tree | f162f971dc2361af3235b0a891ef28ea328365a1 /portable | |
| parent | Fix version suffixing without PARCH (diff) | |
| download | jellyfin-packaging-05d21f5f787cfa863bd1847265820ab6a119b56b.tar.gz jellyfin-packaging-05d21f5f787cfa863bd1847265820ab6a119b56b.tar.bz2 jellyfin-packaging-05d21f5f787cfa863bd1847265820ab6a119b56b.zip | |
Make all variables more descriptive
Diffstat (limited to 'portable')
| -rw-r--r-- | portable/Dockerfile | 16 | ||||
| -rwxr-xr-x | portable/build.sh | 6 |
2 files changed, 11 insertions, 11 deletions
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 \ diff --git a/portable/build.sh b/portable/build.sh index b8bb2ce..c979805 100755 --- a/portable/build.sh +++ b/portable/build.sh @@ -20,7 +20,7 @@ case ${BTYPE} in APPHOST="-p:UseAppHost=false" ;; *) - RUNTIME="--self-contained --runtime ${DTYPE}-${DARCH}" + RUNTIME="--self-contained --runtime ${DOTNET_TYPE}-${DOTNET_ARCH}" APPHOST="-p:UseAppHost=true" ;; esac @@ -36,8 +36,8 @@ popd mkdir -p "${ARTIFACT_DIR}/" -if [[ -n ${PARCH} ]]; then - VERSION_SUFFIX="${JVERS}-${PARCH}" +if [[ -n ${PACKAGE_ARCH} ]]; then + VERSION_SUFFIX="${JVERS}-${PACKAGE_ARCH}" else VERSION_SUFFIX="${JVERS}" fi |