jellyfin/jellyfin-packaging
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-packaging.git synced 2024-11-23 05:59:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add JELLYFIN_VERSION to all build-time envs

Browse Source
This commit is contained in:
Joshua M. Boniface 2024-02-16 01:14:03 -05:00
parent d25fa2a4c2
commit 1c936530c4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.py
View File

@ -71,7 +71,7 @@ def build_package_deb(jellyfin_version, build_type, build_arch, build_version):
# Build the dockerfile and packages
os.system(f"{docker_build_cmd} --build-arg PACKAGE_TYPE={os_type} --build-arg PACKAGE_VERSION={os_version} --build-arg PACKAGE_ARCH={PACKAGE_ARCH} --build-arg GCC_VERSION={crossgccvers} --file {repo_root_dir}/{dockerfile} --tag {imagename} {repo_root_dir}")
os.system(f"{docker_run_cmd} --volume {repo_root_dir}:/jellyfin --volume {repo_root_dir}/out/{build_type}:/dist --name {imagename} {imagename}")
os.system(f"{docker_run_cmd} --volume {repo_root_dir}:/jellyfin --volume {repo_root_dir}/out/{build_type}:/dist --env JELLYFIN_VERSION={jellyfin_version} --name {imagename} {imagename}")
def build_package_rpm(jellyfin_version, build_type, build_arch, build_version):
@ -218,7 +218,7 @@ def build_docker(jellyfin_version, build_type, _build_arch, _build_version):
print()
# Build the dockerfile
os.system(f"{docker_build_cmd} --build-arg PACKAGE_ARCH={PACKAGE_ARCH} --build-arg DOTNET_ARCH={DOTNET_ARCH} --build-arg QEMU_ARCH={QEMU_ARCH} --build-arg IMAGE_ARCH={IMAGE_ARCH} --file {repo_root_dir}/{dockerfile} --tag {imagename} {repo_root_dir}")
os.system(f"{docker_build_cmd} --build-arg PACKAGE_ARCH={PACKAGE_ARCH} --build-arg DOTNET_ARCH={DOTNET_ARCH} --build-arg QEMU_ARCH={QEMU_ARCH} --build-arg IMAGE_ARCH={IMAGE_ARCH} --build-arg JELLYFIN_VERSION={jellyfin_version} --file {repo_root_dir}/{dockerfile} --tag {imagename} {repo_root_dir}")
images.append(imagename)
print()

6
docker/Dockerfile
View File

@ -23,6 +23,9 @@ ARG QEMU_ARCH
# Base Image archiecture (amd64, arm64v8, arm32v7), set by build script
ARG IMAGE_ARCH
# Jellyfin version
ARG JELLYFIN_VERSION
#
# Build the web artifacts
#
@ -31,6 +34,9 @@ FROM node:${NODEJS_VERSION}-alpine as web
ARG SOURCE_DIR=/src
ARG ARTIFACT_DIR=/web
ARG JELLYFIN_VERSION
ENV JELLYFIN_VERSION=${JELLYFIN_VERSION}
RUN apk add \
autoconf \
g++ \