diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2024-02-16 01:14:03 -0500 |
|---|---|---|
| committer | Joshua M. Boniface <joshua@boniface.me> | 2024-02-16 01:14:03 -0500 |
| commit | 1c936530c438a11d1c672e68049db7a93986ec6f (patch) | |
| tree | d644488161c3bc21498596b633c0ce47c1a1d8f1 | |
| parent | Fix spelling mistake (diff) | |
| download | jellyfin-packaging-1c936530c438a11d1c672e68049db7a93986ec6f.tar.gz jellyfin-packaging-1c936530c438a11d1c672e68049db7a93986ec6f.tar.bz2 jellyfin-packaging-1c936530c438a11d1c672e68049db7a93986ec6f.zip | |
Add JELLYFIN_VERSION to all build-time envs
| -rwxr-xr-x | build.py | 4 | ||||
| -rw-r--r-- | docker/Dockerfile | 6 |
2 files changed, 8 insertions, 2 deletions
@@ -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() diff --git a/docker/Dockerfile b/docker/Dockerfile index 705935f..a8ab0a1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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++ \ |