upgrade docker to alpine 3.18:

* enables chiptune player
* smaller containers (generate pycache at runtime)
This commit is contained in:
ed 2023-05-11 06:56:21 +00:00
parent c2ed2314c8
commit b985011a00
7 changed files with 25 additions and 11 deletions

View file

@ -5,11 +5,13 @@ LABEL org.opencontainers.image.url="https://github.com/9001/copyparty" \
org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.title="copyparty-ac" \ org.opencontainers.image.title="copyparty-ac" \
org.opencontainers.image.description="copyparty with Pillow and FFmpeg (image/audio/video thumbnails, audio transcoding, media tags)" 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 \ wget \
py3-pillow \ py3-pillow \
ffmpeg \ ffmpeg \
&& rm -rf /tmp/pyc \
&& mkdir /cfg /w \ && mkdir /cfg /w \
&& chmod 777 /cfg /w \ && chmod 777 /cfg /w \
&& echo % /cfg > initcfg && echo % /cfg > initcfg

View file

@ -5,26 +5,27 @@ LABEL org.opencontainers.image.url="https://github.com/9001/copyparty" \
org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.title="copyparty-dj" \ org.opencontainers.image.title="copyparty-dj" \
org.opencontainers.image.description="copyparty with all optional dependencies, including musical key / bpm detection" 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/install-deps.sh ./
COPY i/bin/mtag/audio-bpm.py /mtag/ COPY i/bin/mtag/audio-bpm.py /mtag/
COPY i/bin/mtag/audio-key.py /mtag/ COPY i/bin/mtag/audio-key.py /mtag/
RUN apk add -U \ RUN apk add -U !pyc \
wget \ wget \
py3-pillow py3-pip py3-cffi \ py3-pillow py3-pip py3-cffi \
ffmpeg \ ffmpeg \
vips-jxl vips-heif vips-poppler vips-magick \ vips-jxl vips-heif vips-poppler vips-magick \
py3-numpy fftw libsndfile \ py3-numpy fftw libsndfile \
vamp-sdk vamp-sdk-libs \ vamp-sdk vamp-sdk-libs \
&& python3 -m pip install pyvips \ && apk add -t .bd \
&& apk --no-cache add -t .bd \
bash wget gcc g++ make cmake patchelf \ bash wget gcc g++ make cmake patchelf \
python3-dev ffmpeg-dev fftw-dev libsndfile-dev \ python3-dev ffmpeg-dev fftw-dev libsndfile-dev \
py3-wheel py3-numpy-dev \ py3-wheel py3-numpy-dev \
vamp-sdk-dev \ vamp-sdk-dev \
&& python3 -m pip install pyvips \
&& bash install-deps.sh \ && bash install-deps.sh \
&& apk del py3-pip .bd \ && apk del py3-pip .bd \
&& rm -rf /var/cache/apk/* \ && rm -rf /var/cache/apk/* /tmp/pyc \
&& chmod 777 /root \ && chmod 777 /root \
&& ln -s /root/vamp /root/.local / \ && ln -s /root/vamp /root/.local / \
&& mkdir /cfg /w \ && mkdir /cfg /w \

View file

@ -5,10 +5,12 @@ LABEL org.opencontainers.image.url="https://github.com/9001/copyparty" \
org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.title="copyparty-im" \ org.opencontainers.image.title="copyparty-im" \
org.opencontainers.image.description="copyparty with Pillow and Mutagen (image thumbnails, media tags)" 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 \ wget \
py3-pillow py3-mutagen \ py3-pillow py3-mutagen \
&& rm -rf /tmp/pyc \
&& mkdir /cfg /w \ && mkdir /cfg /w \
&& chmod 777 /cfg /w \ && chmod 777 /cfg /w \
&& echo % /cfg > initcfg && echo % /cfg > initcfg

View file

@ -5,14 +5,19 @@ LABEL org.opencontainers.image.url="https://github.com/9001/copyparty" \
org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.title="copyparty-iv" \ org.opencontainers.image.title="copyparty-iv" \
org.opencontainers.image.description="copyparty with Pillow, FFmpeg, libvips (image/audio/video thumbnails, audio transcoding, media tags)" 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 \ wget \
py3-pillow py3-pip py3-cffi \ py3-pillow py3-pip py3-cffi \
ffmpeg \ ffmpeg \
vips-jxl vips-heif vips-poppler vips-magick \ 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 \ && python3 -m pip install pyvips \
&& apk del py3-pip \ && apk del py3-pip .bd \
&& rm -rf /var/cache/apk/* /tmp/pyc \
&& mkdir /cfg /w \ && mkdir /cfg /w \
&& chmod 777 /cfg /w \ && chmod 777 /cfg /w \
&& echo % /cfg > initcfg && echo % /cfg > initcfg

View file

@ -5,9 +5,11 @@ LABEL org.opencontainers.image.url="https://github.com/9001/copyparty" \
org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.title="copyparty-min" \ org.opencontainers.image.title="copyparty-min" \
org.opencontainers.image.description="just copyparty, no thumbnails / media tags / audio transcoding" 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 \ python3 \
&& rm -rf /tmp/pyc \
&& mkdir /cfg /w \ && mkdir /cfg /w \
&& chmod 777 /cfg /w \ && chmod 777 /cfg /w \
&& echo % /cfg > initcfg && echo % /cfg > initcfg

View file

@ -5,10 +5,12 @@ LABEL org.opencontainers.image.url="https://github.com/9001/copyparty" \
org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.title="copyparty-min-pip" \ org.opencontainers.image.title="copyparty-min-pip" \
org.opencontainers.image.description="just copyparty, no thumbnails, no media tags, no audio transcoding" 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 \ && python3 -m pip install copyparty \
&& apk del py3-pip \ && apk del py3-pip \
&& rm -rf /tmp/pyc \
&& mkdir /cfg /w \ && mkdir /cfg /w \
&& chmod 777 /cfg /w \ && chmod 777 /cfg /w \
&& echo % /cfg > initcfg && echo % /cfg > initcfg

View file

@ -95,7 +95,7 @@ filt=
[ $(jobs -p | wc -l) -lt $(nproc) ] && break [ $(jobs -p | wc -l) -lt $(nproc) ] && break
while [ -e .blk ]; do sleep 0.2; done while [ -e .blk ]; do sleep 0.2; done
done done
aa="$(printf '%7s' $a)" aa="$(printf '%11s' $a-$i)"
# arm takes forever so make it top priority # arm takes forever so make it top priority
[ ${a::3} == arm ] && nice= || nice=nice [ ${a::3} == arm ] && nice= || nice=nice