diff --git a/rootfs/src/Dockerfile b/rootfs/src/Dockerfile index 3176583..88185de 100644 --- a/rootfs/src/Dockerfile +++ b/rootfs/src/Dockerfile @@ -150,9 +150,9 @@ FROM registry.cn-shenzhen.aliyuncs.com/infrasync/library-alpine:3.13.12 AS files # FROM --platform=linux/amd64 registry.cn-shenzhen.aliyuncs.com/infrastlabs/x11-base:app-ubuntu-24.04 AS ubt # 20.04[alpine_font_毛刺] 22.04[alpine_font_毛刺] 24.04 FROM --platform=linux/amd64 ubuntu:24.04 as ubt -ARG TARGETPLATFORM -ARG TYPE=app -ARG VER=24.04 +# ARG TARGETPLATFORM +# ARG TYPE=app +# ARG VER=24.04 ENV \ DEBIAN_FRONTEND=noninteractive \ LOCALE_INCLUDE="zh_CN zh_HK zh_TW en en_AU fr fr_CA pt pt_BR es ar cs de it ru nl tr is sv uk ja ko th vi" @@ -164,14 +164,15 @@ RUN echo "Acquire {\n\ AllowDowngradeToInsecureRepositories \"true\";\n\ }" > /etc/apt/apt.conf.d/skip-gpg-check-ig; RUN export DOMAIN="mirrors.ustc.edu.cn"; \ - case ${VER} in \ - "14.04") V2=trusty ;; \ - "16.04") V2=xenial ;; \ - "18.04") V2=bionic ;; \ - "20.04") V2=focal ;; \ - "22.04") V2=jammy ;; \ - "24.04") V2=noble ;; \ - esac; \ + # case ${VER} in \ + # "14.04") V2=trusty ;; \ + # "16.04") V2=xenial ;; \ + # "18.04") V2=bionic ;; \ + # "20.04") V2=focal ;; \ + # "22.04") V2=jammy ;; \ + # "24.04") V2=noble ;; \ + # esac; \ + V2=noble; \ # test -z "$(echo $TARGETPLATFORM |grep arm)" && target=ubuntu || target=ubuntu-ports; \ target=ubuntu; \ echo "deb http://${DOMAIN}/$target ${V2} main restricted universe multiverse" > /etc/apt/sources.list \ @@ -196,8 +197,8 @@ path-exclude /usr/share/lintian/*\n\ # FONT, THEME, ICON # font-ttf: @win:msyh.zip> fonts-wqy-microhei # fonts-dejavu: fonts-dejavu-core fonts-dejavu-extra fonts-dejavu-mono -RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\ - apt.sh \ +# RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\ +RUN apt.sh \ curl wget tzdata locales \ greybird-gtk-theme \ fonts-dejavu fonts-wqy-microhei language-pack-gnome-zh-hans; \ @@ -207,11 +208,11 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\ # split papirus-icon-theme: none@1604,1404 # bunsen-papirus-icon-theme> papirus-icon-theme; ERR: 14.04 16.04 1804? -RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\ - test "14.04" == "${VER}" && exit 0; \ - test "16.04" == "${VER}" && exit 0; \ - test "18.04" == "${VER}" && exit 0; \ - echo a.123; \ +# RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\ +# test "14.04" == "${VER}" && exit 0; \ +# test "16.04" == "${VER}" && exit 0; \ +# test "18.04" == "${VER}" && exit 0; \ +RUN echo a.123; \ apt.sh \ papirus-icon-theme; \ \