Skip to content

Commit f58f0b8

Browse files
committed
chore: use pkg create/add for jellyfin-ffmpeg so it appears in pkg info & sbom
1 parent 04cc235 commit f58f0b8

3 files changed

Lines changed: 8 additions & 9 deletions

File tree

Containerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ RUN pkg install -y git && \
3838
WORKDIR /usr/ports/multimedia/jellyfin-ffmpeg
3939
RUN make BATCH=yes MAKE_JOBS_NUMBER=4 install clean || \
4040
(cat /usr/ports/multimedia/jellyfin-ffmpeg/work/jellyfin-ffmpeg-7.1.3-3/ffbuild/config.log && false)
41+
RUN mkdir -p /tmp/packages && pkg create -o /tmp/packages/ jellyfin-ffmpeg
4142

4243
FROM ghcr.io/daemonless/base:${BASE_VERSION} AS builder
4344

@@ -160,10 +161,9 @@ RUN pkg update && \
160161
rm -f /usr/local/lib/libopcodes* /usr/local/lib/libbfd*
161162

162163
# Install jellyfin-ffmpeg (HDR tonemapping) and override system ffmpeg
163-
COPY --from=jffmpeg-builder /usr/local/lib/jellyfin-ffmpeg /usr/local/lib/jellyfin-ffmpeg
164-
RUN mkdir -p /usr/local/libdata/ldconfig && \
165-
echo /usr/local/lib/jellyfin-ffmpeg/lib > /usr/local/libdata/ldconfig/jellyfin-ffmpeg && \
166-
ldconfig -m /usr/local/lib/jellyfin-ffmpeg/lib && \
164+
COPY --from=jffmpeg-builder /tmp/packages/jellyfin-ffmpeg-*.pkg /tmp/
165+
RUN pkg add -f /tmp/jellyfin-ffmpeg-*.pkg && \
166+
rm /tmp/jellyfin-ffmpeg-*.pkg && \
167167
ln -sf /usr/local/lib/jellyfin-ffmpeg/bin/ffmpeg /usr/local/bin/ffmpeg && \
168168
ln -sf /usr/local/lib/jellyfin-ffmpeg/bin/ffprobe /usr/local/bin/ffprobe
169169

Containerfile.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ RUN pkg install -y git && \
3232
WORKDIR /usr/ports/multimedia/jellyfin-ffmpeg
3333
RUN make BATCH=yes MAKE_JOBS_NUMBER=4 install clean || \
3434
(cat /usr/ports/multimedia/jellyfin-ffmpeg/work/jellyfin-ffmpeg-7.1.3-3/ffbuild/config.log && false)
35+
RUN mkdir -p /tmp/packages && pkg create -o /tmp/packages/ jellyfin-ffmpeg
3536

3637
FROM ghcr.io/daemonless/base:${BASE_VERSION} AS builder
3738

@@ -165,10 +166,9 @@ RUN pkg update && \
165166
rm -f /usr/local/lib/libopcodes* /usr/local/lib/libbfd*
166167

167168
# Install jellyfin-ffmpeg (HDR tonemapping) and override system ffmpeg
168-
COPY --from=jffmpeg-builder /usr/local/lib/jellyfin-ffmpeg /usr/local/lib/jellyfin-ffmpeg
169-
RUN mkdir -p /usr/local/libdata/ldconfig && \
170-
echo /usr/local/lib/jellyfin-ffmpeg/lib > /usr/local/libdata/ldconfig/jellyfin-ffmpeg && \
171-
ldconfig -m /usr/local/lib/jellyfin-ffmpeg/lib && \
169+
COPY --from=jffmpeg-builder /tmp/packages/jellyfin-ffmpeg-*.pkg /tmp/
170+
RUN pkg add -f /tmp/jellyfin-ffmpeg-*.pkg && \
171+
rm /tmp/jellyfin-ffmpeg-*.pkg && \
172172
ln -sf /usr/local/lib/jellyfin-ffmpeg/bin/ffmpeg /usr/local/bin/ffmpeg && \
173173
ln -sf /usr/local/lib/jellyfin-ffmpeg/bin/ffprobe /usr/local/bin/ffprobe
174174

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Source: dbuild templates
1010

1111
Self-hosted photo and video backup and management server with web UI, mobile sync, and shared albums.
1212

13-
1413
| | |
1514
|---|---|
1615
| **Port** | 2283 |

0 commit comments

Comments
 (0)