diff --git a/scripts/docker/Dockerfile.ac b/scripts/docker/Dockerfile.ac index 4b0e0ea2..83e382fe 100644 --- a/scripts/docker/Dockerfile.ac +++ b/scripts/docker/Dockerfile.ac @@ -5,11 +5,13 @@ LABEL org.opencontainers.image.url="https://github.com/9001/copyparty" \ org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.title="copyparty-ac" \ org.opencontainers.image.description="copyparty with Pillow and FFmpeg (image/audio/video thumbnails, audio transcoding, media tags)" +ENV PYTHONPYCACHEPREFIX=/tmp/pyc -RUN apk --no-cache add \ +RUN apk --no-cache add !pyc \ wget \ py3-pillow \ ffmpeg \ + && rm -rf /tmp/pyc \ && mkdir /cfg /w \ && chmod 777 /cfg /w \ && echo % /cfg > initcfg diff --git a/scripts/docker/Dockerfile.dj b/scripts/docker/Dockerfile.dj index 78e98832..c60fc891 100644 --- a/scripts/docker/Dockerfile.dj +++ b/scripts/docker/Dockerfile.dj @@ -5,26 +5,27 @@ LABEL org.opencontainers.image.url="https://github.com/9001/copyparty" \ org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.title="copyparty-dj" \ org.opencontainers.image.description="copyparty with all optional dependencies, including musical key / bpm detection" +ENV PYTHONPYCACHEPREFIX=/tmp/pyc COPY i/bin/mtag/install-deps.sh ./ COPY i/bin/mtag/audio-bpm.py /mtag/ COPY i/bin/mtag/audio-key.py /mtag/ -RUN apk add -U \ +RUN apk add -U !pyc \ wget \ py3-pillow py3-pip py3-cffi \ ffmpeg \ vips-jxl vips-heif vips-poppler vips-magick \ py3-numpy fftw libsndfile \ vamp-sdk vamp-sdk-libs \ - && python3 -m pip install pyvips \ - && apk --no-cache add -t .bd \ + && apk add -t .bd \ bash wget gcc g++ make cmake patchelf \ python3-dev ffmpeg-dev fftw-dev libsndfile-dev \ py3-wheel py3-numpy-dev \ vamp-sdk-dev \ + && python3 -m pip install pyvips \ && bash install-deps.sh \ && apk del py3-pip .bd \ - && rm -rf /var/cache/apk/* \ + && rm -rf /var/cache/apk/* /tmp/pyc \ && chmod 777 /root \ && ln -s /root/vamp /root/.local / \ && mkdir /cfg /w \ diff --git a/scripts/docker/Dockerfile.im b/scripts/docker/Dockerfile.im index 3dcd7c47..53f9dd67 100644 --- a/scripts/docker/Dockerfile.im +++ b/scripts/docker/Dockerfile.im @@ -5,10 +5,12 @@ LABEL org.opencontainers.image.url="https://github.com/9001/copyparty" \ org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.title="copyparty-im" \ org.opencontainers.image.description="copyparty with Pillow and Mutagen (image thumbnails, media tags)" +ENV PYTHONPYCACHEPREFIX=/tmp/pyc -RUN apk --no-cache add \ +RUN apk --no-cache add !pyc \ wget \ py3-pillow py3-mutagen \ + && rm -rf /tmp/pyc \ && mkdir /cfg /w \ && chmod 777 /cfg /w \ && echo % /cfg > initcfg diff --git a/scripts/docker/Dockerfile.iv b/scripts/docker/Dockerfile.iv index 426657d0..c4a93aa0 100644 --- a/scripts/docker/Dockerfile.iv +++ b/scripts/docker/Dockerfile.iv @@ -5,14 +5,19 @@ LABEL org.opencontainers.image.url="https://github.com/9001/copyparty" \ org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.title="copyparty-iv" \ org.opencontainers.image.description="copyparty with Pillow, FFmpeg, libvips (image/audio/video thumbnails, audio transcoding, media tags)" +ENV PYTHONPYCACHEPREFIX=/tmp/pyc -RUN apk --no-cache add \ +RUN apk add -U !pyc \ wget \ py3-pillow py3-pip py3-cffi \ ffmpeg \ vips-jxl vips-heif vips-poppler vips-magick \ + && apk add -t .bd \ + bash wget gcc g++ make cmake patchelf \ + python3-dev py3-wheel \ && python3 -m pip install pyvips \ - && apk del py3-pip \ + && apk del py3-pip .bd \ + && rm -rf /var/cache/apk/* /tmp/pyc \ && mkdir /cfg /w \ && chmod 777 /cfg /w \ && echo % /cfg > initcfg diff --git a/scripts/docker/Dockerfile.min b/scripts/docker/Dockerfile.min index 157a8280..7d1b9029 100644 --- a/scripts/docker/Dockerfile.min +++ b/scripts/docker/Dockerfile.min @@ -5,9 +5,11 @@ LABEL org.opencontainers.image.url="https://github.com/9001/copyparty" \ org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.title="copyparty-min" \ org.opencontainers.image.description="just copyparty, no thumbnails / media tags / audio transcoding" +ENV PYTHONPYCACHEPREFIX=/tmp/pyc -RUN apk --no-cache add \ +RUN apk --no-cache add !pyc \ python3 \ + && rm -rf /tmp/pyc \ && mkdir /cfg /w \ && chmod 777 /cfg /w \ && echo % /cfg > initcfg diff --git a/scripts/docker/Dockerfile.min.pip b/scripts/docker/Dockerfile.min.pip index 8bedd6d6..0364d049 100644 --- a/scripts/docker/Dockerfile.min.pip +++ b/scripts/docker/Dockerfile.min.pip @@ -5,10 +5,12 @@ LABEL org.opencontainers.image.url="https://github.com/9001/copyparty" \ org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.title="copyparty-min-pip" \ org.opencontainers.image.description="just copyparty, no thumbnails, no media tags, no audio transcoding" +ENV PYTHONPYCACHEPREFIX=/tmp/pyc -RUN apk --no-cache add python3 py3-pip \ +RUN apk --no-cache add python3 py3-pip !pyc \ && python3 -m pip install copyparty \ && apk del py3-pip \ + && rm -rf /tmp/pyc \ && mkdir /cfg /w \ && chmod 777 /cfg /w \ && echo % /cfg > initcfg diff --git a/scripts/docker/make.sh b/scripts/docker/make.sh index 72236d1b..ca8a4598 100755 --- a/scripts/docker/make.sh +++ b/scripts/docker/make.sh @@ -95,7 +95,7 @@ filt= [ $(jobs -p | wc -l) -lt $(nproc) ] && break while [ -e .blk ]; do sleep 0.2; done done - aa="$(printf '%7s' $a)" + aa="$(printf '%11s' $a-$i)" # arm takes forever so make it top priority [ ${a::3} == arm ] && nice= || nice=nice