Compare commits

..

No commits in common. "70656ac62e76687fb1092b381eb9d5bb71e5df67" and "de873188a3d1cdc0ae954c44f365670e4177b46f" have entirely different histories.

2 changed files with 4 additions and 15 deletions

View File

@ -2,15 +2,7 @@
1. Download the "root" folder from the [Tdarr Repo (direct link)](https://github.com/HaveAGitGat/Tdarr/tree/master/docker/root) 1. Download the "root" folder from the [Tdarr Repo (direct link)](https://github.com/HaveAGitGat/Tdarr/tree/master/docker/root)
2. Place this folder in here, next to the dockerfile 2. Place this folder in here, next to the dockerfile
3. Build the server and the node container 3. Build the container. `buildah bud -t tdarr-ffmpeg5.1:<tag> -f debian-bullseye.dockerfile`
### Server
`$ buildah bud -t tdarr-server-ffmpeg5.1:2 -t tdarr-server-ffmpeg5.1:latest -f debian-bullseye.dockerfile`
### Node
`$ buildah bud -t tdarr-node-ffmpeg5.1:2 -t tdarr-node-ffmpeg5.1:latest -f debian-bullseye.dockerfile --build-arg "MODULE=Tdarr_Node"`
## Versions ## Versions

View File

@ -20,7 +20,6 @@ RUN apt-get update && \
apt-get install -y \ apt-get install -y \
software-properties-common \ software-properties-common \
git \ git \
vainfo \
trash-cli && \ trash-cli && \
mkdir -p \ mkdir -p \
/app \ /app \
@ -46,7 +45,7 @@ RUN apt-get update && \
apt-get update && \ apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
intel-media-va-driver-non-free \ intel-media-va-driver-non-free \
#vainfo \ vainfo \
mesa-va-drivers && \ mesa-va-drivers && \
# HandBrake deps # HandBrake deps
@ -123,14 +122,12 @@ RUN if [ "$MODULE" = "Tdarr_Node" ]; then \
apt-get update && apt-get install -y curl unzip mkvtoolnix libtesseract-dev && \ apt-get update && apt-get install -y curl unzip mkvtoolnix libtesseract-dev && \
if uname -m | grep -q x86; then \ if uname -m | grep -q x86; then \
curl --connect-timeout 120 --retry 5 -o /tmp/$MODULE.zip -L \ curl --connect-timeout 120 --retry 5 -o /tmp/$MODULE.zip -L \
"https://f000.backblazeb2.com/file/tdarrs/versions/$VERSION/linux_x64/$MODULE.zip" && \ "https://tdarrs.s3.us-west-000.backblazeb2.com/versions/$VERSION/linux_x64/$MODULE.zip" && \
#"https://tdarrs.s3.us-west-000.backblazeb2.com/versions/$VERSION/linux_x64/$MODULE.zip" && \
unzip -q /tmp/$MODULE.zip -d /app/$MODULE -x *.exe && \ unzip -q /tmp/$MODULE.zip -d /app/$MODULE -x *.exe && \
if [ "$MODULE" = "Tdarr_Server" ]; then \ if [ "$MODULE" = "Tdarr_Server" ]; then \
curl --connect-timeout 120 --retry 5 -o /tmp/Tdarr_Node.zip -L \ curl --connect-timeout 120 --retry 5 -o /tmp/Tdarr_Node.zip -L \
"https://f000.backblazeb2.com/file/tdarrs/versions/$VERSION/linux_x64/Tdarr_Node.zip" && \ "https://tdarrs.s3.us-west-000.backblazeb2.com/versions/$VERSION/linux_x64/Tdarr_Node.zip" && \
#"https://tdarrs.s3.us-west-000.backblazeb2.com/versions/$VERSION/linux_x64/Tdarr_Node.zip" && \
unzip -q /tmp/Tdarr_Node.zip -d /app/Tdarr_Node -x *.exe ; \ unzip -q /tmp/Tdarr_Node.zip -d /app/Tdarr_Node -x *.exe ; \
fi ; \ fi ; \
fi && \ fi && \