From aaefeffe036a945ab5d34d2c86d8c16261fb9836 Mon Sep 17 00:00:00 2001
From: James Spurin <james@spurin.com>
Date: Mon, 16 Dec 2024 11:13:32 +0000
Subject: [PATCH] cross arch builds, upstream debian and yt/pipes fixes

---
 Dockerfile | 15 +++++++--------
 build.sh   | 11 +++++++++++
 2 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100755 build.sh

diff --git a/Dockerfile b/Dockerfile
index 6215750..ff5b01c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:jessie
+FROM debian
 
 MAINTAINER Werner Beroux <werner@beroux.com>
 
@@ -32,13 +32,12 @@ RUN apt-get update \
         vlc \
         watch \
         xaos \
-
-    && echo "Install lolcat and youtube-dl" \
-    && echo "deb http://http.us.debian.org/debian sid main non-free contrib" >> /etc/apt/sources.list \
-    && apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
         lolcat \
-        youtube-dl \
+        ffmpeg \
+
+    && echo "Install youtube-dl" \
+    && curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/bin/youtube-dl \
+    && chmod 755 /usr/bin/youtube-dl \
 
     && echo "Install asciiquarium" \
     && cpan -i Term::Animation \
@@ -53,7 +52,7 @@ RUN apt-get update \
     && chmod +x /usr/local/bin/falling-hearts \
 
     && echo "Install pipes" \
-    && curl -L https://gist.githubusercontent.com/livibetter/4689307/raw/949e43fe2962c2c97c8b1d974ff93dd053d9bd37/pipes.sh -o /usr/local/bin/pipes \
+    && curl -L https://raw.githubusercontent.com/pipeseroni/pipes.sh/refs/heads/master/pipes.sh -o /usr/local/bin/pipes \
     && chmod +x /usr/local/bin/pipes \
 
     && echo "Clean-up" \
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..5c6d423
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# Setup buildx environment
+docker buildx create --name build_cross --driver-opt env.BUILDKIT_STEP_LOG_MAX_SIZE=10000000 --driver-opt env.BUILDKIT_STEP_LOG_MAX_SPEED=10000000 || true
+docker buildx use build_cross
+
+# Build and push
+docker buildx build --platform linux/386,linux/amd64,linux/arm64/v8,linux/arm/v6,linux/arm/v7,linux/ppc64le,linux/s390x -t wernight/funbox:latest . --push
+
+# Update local image
+docker pull wernight/funbox:latest