Skip to content

Commit aaefeff

Browse files
committed
cross arch builds, upstream debian and yt/pipes fixes
1 parent 4977861 commit aaefeff

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

Dockerfile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:jessie
1+
FROM debian
22

33
MAINTAINER Werner Beroux <[email protected]>
44

@@ -32,13 +32,12 @@ RUN apt-get update \
3232
vlc \
3333
watch \
3434
xaos \
35-
36-
&& echo "Install lolcat and youtube-dl" \
37-
&& echo "deb http://http.us.debian.org/debian sid main non-free contrib" >> /etc/apt/sources.list \
38-
&& apt-get update \
39-
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
4035
lolcat \
41-
youtube-dl \
36+
ffmpeg \
37+
38+
&& echo "Install youtube-dl" \
39+
&& curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/bin/youtube-dl \
40+
&& chmod 755 /usr/bin/youtube-dl \
4241

4342
&& echo "Install asciiquarium" \
4443
&& cpan -i Term::Animation \
@@ -53,7 +52,7 @@ RUN apt-get update \
5352
&& chmod +x /usr/local/bin/falling-hearts \
5453

5554
&& echo "Install pipes" \
56-
&& curl -L https://gist.githubusercontent.com/livibetter/4689307/raw/949e43fe2962c2c97c8b1d974ff93dd053d9bd37/pipes.sh -o /usr/local/bin/pipes \
55+
&& curl -L https://raw.githubusercontent.com/pipeseroni/pipes.sh/refs/heads/master/pipes.sh -o /usr/local/bin/pipes \
5756
&& chmod +x /usr/local/bin/pipes \
5857

5958
&& echo "Clean-up" \

build.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/env bash
2+
3+
# Setup buildx environment
4+
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
5+
docker buildx use build_cross
6+
7+
# Build and push
8+
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
9+
10+
# Update local image
11+
docker pull wernight/funbox:latest

0 commit comments

Comments
 (0)