dist/x4: COPY --from=rootfs /rootfs/res_ubt_share /

infrastlabs · Oct 31, 2024 · dea566a · dea566a
1 parent 33901fb
commit dea566a
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 80 deletions.
diff --git a/distros/src/Dockerfile.apk-alpine b/distros/src/Dockerfile.apk-alpine
@@ -5,19 +5,19 @@ FROM ${REPO}infrastlabs/x11-base:rootfs AS rootfs
 
 # 20.04> 24.04: betterThemeView
 # TODO: FROM --platform=linux/amd64
-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/
+# 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 kube-cmd/src/Dockerfile
 # FROM alpine:3.13.12
@@ -206,14 +206,15 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
 
 
 # HEADLESS
+COPY --from=rootfs /rootfs/res_ubt_share /
 COPY --from=rootfs /rootfs/files1 /
 COPY --from=rootfs /rootfs/files2 /
 RUN \
   bash /xconf.sh core; bash /xconf.sh app; \
   exit 0;
 
 # HEADLESS2
-COPY --from=res / /
+# COPY --from=res / /
 
 EXPOSE 10089/tcp 10081/tcp 10022/tcp
 CMD ["bash", "-c", "exec /entry.sh"]

diff --git a/distros/src/Dockerfile.apt-debian b/distros/src/Dockerfile.apt-debian
@@ -3,19 +3,19 @@ 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/
+# 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
@@ -218,13 +218,14 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
 
 
 # HEADLESS
+COPY --from=rootfs /rootfs/res_ubt_share /
 COPY --from=rootfs /rootfs/files1 /
 COPY --from=rootfs /rootfs/files2 /
 RUN \
   bash /xconf.sh core; exit 0;
 
 # HEADLESS2
-COPY --from=res / /
+# COPY --from=res / /
 
 EXPOSE 10089/tcp 10081/tcp 10022/tcp
 CMD ["bash", "-c", "exec /entry.sh"]

diff --git a/distros/src/Dockerfile.apt-ubuntu b/distros/src/Dockerfile.apt-ubuntu
@@ -226,14 +226,14 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
   exit 0
 
 
-# FONT, THEME, ICON
-# font-ttf: @win:msyh.zip> fonts-wqy-microhei
-RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
-  apt.sh \
-  greybird-gtk-theme \
-  fonts-wqy-microhei language-pack-gnome-zh-hans; \
-  \
-  rm -f /usr/share/backgrounds/greybird.svg;
+# # FONT, THEME, ICON
+# # font-ttf: @win:msyh.zip> fonts-wqy-microhei
+# RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
+#   apt.sh \
+#   greybird-gtk-theme \
+#   fonts-wqy-microhei language-pack-gnome-zh-hans; \
+#   \
+#   rm -f /usr/share/backgrounds/greybird.svg;
 
 
 ###########################################################################
@@ -257,33 +257,34 @@ RUN \
 #   # KDE环境: pavucontrol图标丑出天际
 #   rm -f /home/headless/Desktop/pavucontrol.desktop;
 
-# 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; \
-  apt.sh \
-  papirus-icon-theme; \
-  \
-  # 清理ubt自带图标, keep项: hicolor 
-  # locolor gnome bloom
-  cd /usr/share/icons && rm -rf Humanity* ubuntu-mono* LoginIcons Tango; \
-  \
-  wget https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bunsen-papirus-icon-theme_10.3-2_all.deb; \
-  dpkg -i bunsen-papirus-icon-theme_10.3-2_all.deb; rm -f bunsen-papirus-icon-theme_10.3-2_all.deb; \
-  cd /usr/share/icons && rm -rf Papirus-Bunsen-Dark-bluegrey Papirus-Bunsen-Dark-grey Papirus-Dark Papirus-Light ePapirus; \
-  \
-  # Papirus left: 16x(clipit:21M) 64x(desktop:21M)
-  cd /usr/share/icons/Papirus && rm -rf 18x* 22x* 24x* 32x*  48x* 64x* ; \
-  ls -lh /usr/share/icons/Papirus; \
-  \
-  dpkg -l |grep bunsen && exit 0 || exit 1;
+# # 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; \
+#   apt.sh \
+#   papirus-icon-theme; \
+#   \
+#   # 清理ubt自带图标, keep项: hicolor 
+#   # locolor gnome bloom
+#   cd /usr/share/icons && rm -rf Humanity* ubuntu-mono* LoginIcons Tango; \
+#   \
+#   wget https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bunsen-papirus-icon-theme_10.3-2_all.deb; \
+#   dpkg -i bunsen-papirus-icon-theme_10.3-2_all.deb; rm -f bunsen-papirus-icon-theme_10.3-2_all.deb; \
+#   cd /usr/share/icons && rm -rf Papirus-Bunsen-Dark-bluegrey Papirus-Bunsen-Dark-grey Papirus-Dark Papirus-Light ePapirus; \
+#   \
+#   # Papirus left: 16x(clipit:21M) 64x(desktop:21M)
+#   cd /usr/share/icons/Papirus && rm -rf 18x* 22x* 24x* 32x*  48x* 64x* ; \
+#   ls -lh /usr/share/icons/Papirus; \
+#   \
+#   dpkg -l |grep bunsen && exit 0 || exit 1;
 
 
 # 拆分包体与配置项两块，免频繁变动基础包
 # HEADLESS
+COPY --from=rootfs /rootfs/res_ubt_share /
 COPY --from=rootfs /rootfs/files1 /
 COPY --from=rootfs /rootfs/files2 /
 RUN \

diff --git a/distros/src/Dockerfile.zyp-opensuse b/distros/src/Dockerfile.zyp-opensuse
@@ -2,26 +2,26 @@ ARG REPO=
 ARG VER=15.5
 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/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
-  # locale_ubt: /usr/sbin/locale-gen,update-locale; /etc/default/locale
-  COPY --from=ubt /usr/share/locale /usr/share/locale
-  # COPY --from=ubt /usr/share/i18n /usr/share/i18n
-  COPY --from=ubt /usr/sbin/locale-gen /usr/sbin/locale-gen
-  COPY --from=ubt /usr/sbin/update-locale /usr/sbin/update-locale
-  COPY --from=ubt /etc/locale.gen /etc/locale.gen
-  COPY --from=ubt /etc/default/locale /etc/default/locale
-  #COPY --from=ubt /usr/share/
+# # 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/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
+#   # locale_ubt: /usr/sbin/locale-gen,update-locale; /etc/default/locale
+#   COPY --from=ubt /usr/share/locale /usr/share/locale
+#   # COPY --from=ubt /usr/share/i18n /usr/share/i18n
+#   COPY --from=ubt /usr/sbin/locale-gen /usr/sbin/locale-gen
+#   COPY --from=ubt /usr/sbin/update-locale /usr/sbin/update-locale
+#   COPY --from=ubt /etc/locale.gen /etc/locale.gen
+#   COPY --from=ubt /etc/default/locale /etc/default/locale
+#   #COPY --from=ubt /usr/share/
 
 FROM opensuse/leap:${VER}
 ARG TARGETPLATFORM
@@ -125,14 +125,15 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
 
 
 # HEADLESS
+COPY --from=rootfs /rootfs/res_ubt_share /
 COPY --from=rootfs /rootfs/files1 /
 COPY --from=rootfs /rootfs/files2 /
 RUN \
   bash /xconf.sh core; bash /xconf.sh app; \
   exit 0;
 
 # HEADLESS2
-COPY --from=res / /
+# COPY --from=res / /
 
 EXPOSE 10089/tcp 10081/tcp 10022/tcp
 CMD ["bash", "-c", "exec /entry.sh"]