diff --git a/Dockerfile b/Dockerfile index 2219501..85a6870 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -FROM hanxi/xiaomusic:builder AS builder -ENV DEBIAN_FRONTEND=noninteractive +FROM morkerjay/xiaomusic:builder AS builder RUN pip install -U pdm ENV PDM_CHECK_UPDATE=false WORKDIR /app @@ -10,7 +9,7 @@ COPY holiday/ ./holiday/ COPY xiaomusic.py . RUN pdm install --prod --no-editable -FROM hanxi/xiaomusic:runtime +FROM morkerjay/xiaomusic:runtime WORKDIR /app COPY --from=builder /app/.venv ./.venv COPY --from=builder /app/xiaomusic/ ./xiaomusic/ diff --git a/Dockerfile.builder b/Dockerfile.builder index 504e4e7..d5961b6 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -1,5 +1,4 @@ -FROM python:3.10 -ENV DEBIAN_FRONTEND=noninteractive +FROM python:3.10.18-alpine3.22 RUN pip install -U pdm ENV PDM_CHECK_UPDATE=false WORKDIR /app @@ -9,4 +8,3 @@ COPY plugins/ ./plugins/ COPY holiday/ ./holiday/ COPY xiaomusic.py . RUN pdm install --prod --no-editable - diff --git a/Dockerfile.runtime b/Dockerfile.runtime index 60d9719..383d1f6 100644 --- a/Dockerfile.runtime +++ b/Dockerfile.runtime @@ -1,12 +1,11 @@ -FROM python:3.10-slim -ENV DEBIAN_FRONTEND=noninteractive +FROM python:3.10.18-alpine3.22 -RUN apt-get update && apt-get install -y \ +RUN apk add --no-cache bash\ wget \ - xz-utils \ - libtiff6 \ - libopenjp2-7 \ - libxcb1 \ + xz \ + tiff \ + openjpeg \ + libxcb \ supervisor \ vim \ && rm -rf /var/lib/apt/lists/*