mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2026-06-18 20:22:27 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix docker makefile; broke from bitrot since nobody's using it

Browse source 
(the podman approach (make.sh) is recommended)
This commit is contained in:
ed 2026-05-07 18:15:59 +00:00
parent b009c585a6
commit 2a4c82c742
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/devnotes.md
View file

@ -494,9 +494,12 @@ to get started, first `cd` into the `scripts` folder
* if you want to build a pypi package, now run `./make-pypi-release.sh d` * if you want to build a pypi package, now run `./make-pypi-release.sh d`
* if you want to build a docker-image, you have two options: * if you want to build a docker-image, you have two options:
* if you want to use podman to build all docker-images for all supported architectures, now run `(cd docker; ./make.sh hclean; ./make.sh hclean pull img)` * if you want to use podman to build all docker-images for all supported architectures, now run `(cd docker; make -C base; ./make.sh hclean; ./make.sh hclean pull img)`
* if you want to use docker to build all docker-images for your native architecture, now run `sudo make -C docker` * if you want to use docker to build all docker-images for your native architecture, now run `sudo make -C docker`
* if you want to do something else, please take a look at `docker/make.sh` or `docker/Makefile` for inspiration * if you want to do something else, please take a look at `docker/make.sh` or `docker/Makefile` for inspiration
* beware of the following:
* if you build with docker, you get the [stock alpine-provided ffmpeg](https://github.com/9001/copyparty/blob/hovudstraum/docs/bad-codecs.md), which makes the docker-image almost twice as big
* if you build with podman (make.sh) you get the copyparty-official legally-comfy custom ffmpeg, but the first build takes about 2-3 hours longer
* if you want to build the windows exe, first grab some snacks and a beer, [you'll need it](https://github.com/9001/copyparty/tree/hovudstraum/scripts/pyinstaller) * if you want to build the windows exe, first grab some snacks and a beer, [you'll need it](https://github.com/9001/copyparty/tree/hovudstraum/scripts/pyinstaller)

7
scripts/docker/Makefile
View file

@ -6,7 +6,12 @@ all:
rm -rf i rm -rf i
mkdir i mkdir i
tar -cC../.. dist/copyparty-sfx.py bin/mtag | tar -xvCi tar -cC../../dist copyparty-sfx.py | tar -xvCi
tar -cC../.. bin/mtag | tar -xvCi
# # use stock ffmpeg because ./base/Makefile requires podman;
# # beware: https://github.com/9001/copyparty/blob/hovudstraum/docs/bad-codecs.md
touch i/stock_ffmpeg
docker build -t copyparty/min:latest -f Dockerfile.min . docker build -t copyparty/min:latest -f Dockerfile.min .
echo 'scale=1;'`docker save copyparty/min:latest | pigz -c | wc -c`/1024/1024 | bc echo 'scale=1;'`docker save copyparty/min:latest | pigz -c | wc -c`/1024/1024 | bc

5
scripts/docker/innvikler.sh
View file

@ -14,8 +14,11 @@ ised() {
tmv "$2" tmv "$2"
} }
# use stock ffmpeg if requested
echo $1 | grep -qE 'ac|iv|dj' && [ -e "/z/stock_ffmpeg" ] && apk add ffmpeg
# use custom ffmpeg if relevant # use custom ffmpeg if relevant
echo $1 | grep -qE 'ac|iv|dj' && ( echo $1 | grep -qE 'ac|iv|dj' && [ ! -e "/z/stock_ffmpeg" ] && (
cp -pv /z/packages/*.pub /etc/apk/keys/ cp -pv /z/packages/*.pub /etc/apk/keys/
cd /z/packages/$(cat /etc/apk/arch) cd /z/packages/$(cat /etc/apk/arch)
apk add ./ffmpeg-*.apk apk add ./ffmpeg-*.apk