Merge pull request #206 from monlor/test

feat: 🎸 适配armv7，重构服务构建方式

alist/Dockerfile

@@ -1,3 +1,7 @@
+FROM alpine as base
+
+RUN apk add dumb-init
+
 FROM xiaoyaliu/alist:hostmode
 
 LABEL MAINTAINER [email protected]
@@ -10,12 +14,10 @@ VOLUME /data
 
 ARG TARGETARCH
 
-ENV DUMB_INIT_VERSION "1.2.5"
-
-ADD --chmod=755 https://raw.githubusercontent.com/monlor/docker-xiaoya/main/bin/dumb-init_${DUMB_INIT_VERSION}_${TARGETARCH} /dumb-init
-
 RUN apk add --no-cache tzdata
 
+COPY --chmod=755 --from=base /usr/bin/dumb-init /dumb-init
+
 COPY --chmod=755 ./*.sh /
 
 RUN /service.sh download

emby/Dockerfile

@@ -1,5 +1,9 @@
 ARG BASE_IMAGE=ghcr.io/monlor/embyserver:latest
 
+FROM alpine as base
+
+RUN apk add dumb-init
+
 FROM ${BASE_IMAGE}
 
 LABEL MAINTAINER [email protected]
@@ -8,17 +12,11 @@ ENV TZ=Asia/Shanghai
 
 ARG TARGETARCH
 
-ENV SHELL2HTTP_VERSION="1.17.0" \
-    DUMB_INIT_VERSION="1.2.5"
-
 ENV PUID=0 PGID=0
 
-ADD https://github.com/msoap/shell2http/releases/download/v${SHELL2HTTP_VERSION}/shell2http_${SHELL2HTTP_VERSION}_linux_${TARGETARCH}.tar.gz .
-
-ADD --chmod=755 https://raw.githubusercontent.com/monlor/docker-xiaoya/main/bin/dumb-init_${DUMB_INIT_VERSION}_${TARGETARCH} /dumb-init
+COPY --chmod=755 --from=base /usr/bin/dumb-init /dumb-init
 
-RUN tar -zxvf shell2http_${SHELL2HTTP_VERSION}_linux_${TARGETARCH}.tar.gz -C /usr/bin/ shell2http && \
-    rm -rf shell2http_${SHELL2HTTP_VERSION}_linux_${TARGETARCH}.tar.gz
+COPY --chmod=755 --from=msoap/shell2http:1.17.0 /app/shell2http /usr/bin/shell2http
 
 COPY --chmod=755 ./*.sh /
 

metadata/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM python:3.12-slim
 
 LABEL MAINTAINER [email protected]
 
@@ -14,23 +14,15 @@ ENV LANG=zh_CN.UTF-8 \
     LC_ALL=zh_CN.UTF-8
 
 RUN apt-get update && \
-    apt-get install -y cron locales fonts-wqy-zenhei software-properties-common busybox unzip curl fd-find gzip lsof sqlite3 httpie jq p7zip-full p7zip-rar tzdata && \
+    apt-get install -y cron locales busybox unzip curl fd-find gzip lsof sqlite3 httpie jq tzdata && \
     locale-gen zh_CN.UTF-8 && \
-    update-locale LANG=zh_CN.UTF-8 && \
     ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
-    add-apt-repository ppa:deadsnakes/ppa && \
-    apt-get install -y python3.12 && \
-    update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 1 && \
-    update-alternatives --config python3 && \
-    curl -sS https://bootstrap.pypa.io/get-pip.py | python3.12 && \
-    apt-get remove -y software-properties-common && \
     apt-get autoremove -y && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/*
-
 
 # 安装solid
-RUN curl -#LO https://github.com/Rik-F5/xiaoya_db/archive/refs/heads/main.zip && \
+RUN curl -#LO https://gh.monlor.com/https://github.com/Rik-F5/xiaoya_db/archive/refs/heads/main.zip && \
     unzip main.zip && \
     pip install -r xiaoya_db-main/requirements.txt && \
     mv xiaoya_db-main/solid.py / && \