Skip to content

Commit afd526d

Browse files
committed
fix: bring back to fix daemonless/daemonless version check workflow
1 parent 3b516b8 commit afd526d

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

Containerfile.pkg

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ ARG BASE_VERSION=15
88
FROM ghcr.io/daemonless/base:${BASE_VERSION}
99

1010
ARG FREEBSD_ARCH=amd64
11-
ARG PACKAGES="jellyfin libva libva-intel-media-driver gmmlib mesa-gallium-va"
11+
ARG PKG_NAME=jellyfin
12+
ARG PACKAGES="${PKG_NAME} libva libva-intel-media-driver gmmlib mesa-gallium-va"
1213
ARG UPSTREAM_URL="https://api.github.com/repos/jellyfin/jellyfin/releases/latest"
1314
ARG UPSTREAM_JQ=".tag_name"
1415
ARG HEALTHCHECK_ENDPOINT="http://localhost:8096/health"
@@ -32,13 +33,14 @@ LABEL org.opencontainers.image.title="Jellyfin" \
3233
io.daemonless.upstream-url="${UPSTREAM_URL}" \
3334
io.daemonless.upstream-jq="${UPSTREAM_JQ}" \
3435
io.daemonless.healthcheck-url="${HEALTHCHECK_ENDPOINT}" \
36+
io.daemonless.pkg-name="${PKG_NAME}" \
3537
io.daemonless.packages="${PACKAGES}"
3638

3739
# Install from FreeBSD packages
3840
RUN pkg update && \
3941
pkg install -y ${PACKAGES} && \
4042
mkdir -p /app /config /cache /media && \
41-
pkg info jellyfin | sed -n 's/.*Version.*: *//p' > /app/version && \
43+
pkg info ${PKG_NAME} | sed -n 's/.*Version.*: *//p' > /app/version && \
4244
pkg clean -ay && \
4345
rm -rf /var/cache/pkg/* /var/db/pkg/repos/* && \
4446
chown bsd:bsd /config /cache /media

Containerfile.pkg.j2

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ ARG BASE_VERSION=15
22
FROM ghcr.io/daemonless/base:${BASE_VERSION}
33

44
ARG FREEBSD_ARCH=amd64
5-
ARG PACKAGES="jellyfin libva libva-intel-media-driver gmmlib mesa-gallium-va"
5+
ARG PKG_NAME=jellyfin
6+
ARG PACKAGES="${PKG_NAME} libva libva-intel-media-driver gmmlib mesa-gallium-va"
67
ARG UPSTREAM_URL="https://api.github.com/repos/jellyfin/jellyfin/releases/latest"
78
ARG UPSTREAM_JQ=".tag_name"
89
{%- if ports %}
@@ -36,13 +37,14 @@ LABEL org.opencontainers.image.title="{{ title }}" \
3637
io.daemonless.upstream-url="${UPSTREAM_URL}" \
3738
io.daemonless.upstream-jq="${UPSTREAM_JQ}" \
3839
io.daemonless.healthcheck-url="${HEALTHCHECK_ENDPOINT}" \
40+
io.daemonless.pkg-name="${PKG_NAME}" \
3941
io.daemonless.packages="${PACKAGES}"
4042

4143
# Install from FreeBSD packages
4244
RUN pkg update && \
4345
pkg install -y ${PACKAGES} && \
4446
mkdir -p /app /config /cache /media && \
45-
pkg info jellyfin | sed -n 's/.*Version.*: *//p' > /app/version && \
47+
pkg info ${PKG_NAME} | sed -n 's/.*Version.*: *//p' > /app/version && \
4648
pkg clean -ay && \
4749
rm -rf /var/cache/pkg/* /var/db/pkg/repos/* && \
4850
chown bsd:bsd /config /cache /media

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Source: dbuild templates
77

88
[![Build Status](https://img.shields.io/github/actions/workflow/status/daemonless/jellyfin/build.yaml?style=flat-square&label=Build&color=green)](https://github.com/daemonless/jellyfin/actions)
99
[![Last Commit](https://img.shields.io/github/last-commit/daemonless/jellyfin?style=flat-square&label=Last+Commit&color=blue)](https://github.com/daemonless/jellyfin/commits)
10+
[![mlock Required](https://img.shields.io/badge/mlock-required-orange?style=flat-square&logo=freebsd&logoColor=white)](https://daemonless.io/guides/ocijail-patch/)
1011

1112
Volunteer-built media solution that puts you in control — stream to any device from your own server, with no strings attached.
1213

0 commit comments

Comments
 (0)