diff --git a/distros/src/Dockerfile.apt-debian b/distros/src/Dockerfile.apt-debian index fc85b10..cd0e611 100644 --- a/distros/src/Dockerfile.apt-debian +++ b/distros/src/Dockerfile.apt-debian @@ -2,6 +2,22 @@ ARG REPO= ARG VER=12 FROM ${REPO}infrastlabs/x11-base:rootfs AS rootfs +# 20.04> 24.04: betterThemeView +FROM --platform=linux/amd64 registry.cn-shenzhen.aliyuncs.com/infrastlabs/x11-base:app-ubuntu-24.04 AS ubt +FROM scratch AS res + COPY --from=ubt /usr/share/themes/Greybird /usr/share/themes/Greybird + COPY --from=ubt /usr/share/themes/Greybird-compact /usr/share/themes/Greybird-compact + COPY --from=ubt /usr/share/themes/Greybird-dark /usr/share/themes/Greybird-dark + COPY --from=ubt /usr/share/icons/Papirus /usr/share/icons/Papirus + COPY --from=ubt /usr/share/icons/Papirus-Bunsen-bluegrey /usr/share/icons/Papirus-Bunsen-bluegrey + COPY --from=ubt /usr/share/icons/Papirus-Bunsen-grey /usr/share/icons/Papirus-Bunsen-grey + COPY --from=ubt /usr/share/locale /usr/share/locale + COPY --from=ubt /usr/share/fonts/DejaVuSansMono /usr/share/fonts/DejaVuSansMono + COPY --from=ubt /usr/share/fonts/truetype/wqy /usr/share/fonts/truetype/wqy + COPY --from=ubt /etc/fonts /etc/fonts + #COPY --from=ubt /usr/share/ + + # ref headless//br-deb12 #29.15M @23.10.14 FROM debian:${VER}-slim ARG TYPE=core @@ -205,6 +221,9 @@ COPY --from=rootfs /rootfs/files2 / RUN \ bash /xconf.sh core; exit 0; +# HEADLESS2 +COPY --from=res / / + EXPOSE 10089/tcp 10081/tcp 10022/tcp CMD ["bash", "-c", "exec /entry.sh"] ENV \