Skip to content

Commit bfbdd9a

Browse files
authored
Merge pull request #723 from arabcoders/dev
Frontend changes to make the WebUI look a bit better
2 parents 760618c + ef04262 commit bfbdd9a

File tree

116 files changed

+12208
-7260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+12208
-7260
lines changed

Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ WORKDIR /frontend
44
COPY ./frontend ./
55
RUN if [ ! -d /frontend/exported ]; then yarn install --production --prefer-offline --frozen-lockfile && yarn run generate; fi
66

7-
FROM alpine:edge
7+
FROM debian:13
88

99
COPY --from=composer/composer:2-bin /composer /opt/bin/composer
1010

@@ -23,10 +23,10 @@ ENV PACKAGES=""
2323
# Setup the required environment.
2424
#
2525
RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime && echo ${TZ} > /etc/timezone && \
26-
ARCH=`uname -m` && if [ "${ARCH}" == "x86_64" ]; then PACKAGES="${PACKAGES} intel-media-driver"; fi && \
27-
apk add --no-cache bash icu-data-full nano curl procps net-tools iproute2 ffmpeg \
28-
shadow sqlite redis tzdata gettext ca-certificates nss mailcap libcap fontconfig ttf-freefont font-noto \
29-
terminus-font font-dejavu libva-utils ${PACKAGES} && \
26+
ARCH="$(dpkg --print-architecture)" && \
27+
if [ "$ARCH" = "amd64" ]; then PACKAGES="${PACKAGES} intel-media-va-driver i965-va-driver libmfx-gen1.2"; fi && \
28+
apt update && apt install -y --no-install-recommends nano curl procps net-tools iproute2 tzdata sqlite3 \
29+
redis gettext ca-certificates fontconfig fonts-freefont-ttf fonts-noto fonts-terminus fonts-dejavu vainfo ${PACKAGES} && \
3030
# Delete unused users change users group gid to allow unRaid users to use gid 100 \
3131
deluser redis && groupmod -g 1588787 users && \
3232
# Create our own user. \
@@ -37,6 +37,8 @@ RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime && echo ${TZ} > /etc/timezo
3737
# Copy frankenphp (caddy+php) to the container.
3838
#
3939
COPY --chown=app:app --from=ghcr.io/arabcoders/franken_builder:latest /usr/local/bin/frankenphp /opt/bin/
40+
COPY --chown=app:app --from=ghcr.io/arabcoders/jellyfin-ffmpeg /usr/bin/ffmpeg /usr/bin/ffmpeg
41+
COPY --chown=app:app --from=ghcr.io/arabcoders/jellyfin-ffmpeg /usr/bin/ffprobe /usr/bin/ffprobe
4042

4143
# Copy source code to container.
4244
COPY ./ /opt/app
@@ -51,7 +53,6 @@ RUN echo '' && \
5153
# create /usr/bin/php that points to /opt/bin/frankenphp php-cli "$@" \
5254
echo '#!/bin/sh' > /usr/bin/php && \
5355
echo 'exec /opt/bin/frankenphp php-cli "$@"' >> /usr/bin/php && chmod +x /usr/bin/php && \
54-
ln -s /usr/bin/nano /usr/bin/pico && \
5556
# Create basic directories \
5657
bash -c 'umask 0000 && mkdir -p /temp_data/ /opt/{app,bin,config} /config/{backup,cache,config,db,debug,logs,webhooks,profiler}' && \
5758
# Link console. \

FAQ.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -652,10 +652,7 @@ database indexes with the new guids.
652652

653653
# Sync watch progress.
654654

655-
In order to sync the watch progress between media backends, you need to enable the following environment variable
656-
`WS_SYNC_PROGRESS` in `WebUI > Env` page.
657-
658-
For best experience, you should enable the [webhook](guides/webhooks.md) feature for the media backends you want to sync
655+
For best experience, you SHOULD enable the [webhook](guides/webhooks.md) feature for the media backends you want to sync
659656
the watch progress, however, if you are unable to do so, the `Tasks > import` task will also generate progress watch
660657
events. However, it's not as reliable as the `Webhooks` or as fast. using `Webhooks` is the recommended way and offers
661658
the best experience.

composer.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
"scripts": {
1414
"test": "vendor/bin/phpunit",
1515
"tests": "vendor/bin/phpunit",
16-
"update_ui": "yarn --cwd ./frontend upgrade --latest",
17-
"generate": "yarn --cwd ./frontend run generate"
16+
"ui_update": "pnpm up --dir ./frontend --latest",
17+
"ui_gen": "pnpm run --dir ./frontend generate",
18+
"ui_dev": "pnpm run --dir ./frontend dev",
19+
"ui_tc": "pnpm run --dir ./frontend typecheck"
1820
},
1921
"require": {
2022
"php": "^8.4",

0 commit comments

Comments
 (0)