From 4928021363845a7d5cb515460ae7aaa792baade2 Mon Sep 17 00:00:00 2001
From: sam <huapox@126.com>
Date: Sun, 15 Oct 2023 17:41:52 +0800
Subject: [PATCH] core: dockerfile> FROM infrastlabs/x11-base:deb12-rootfs as
 bin2; core: # ibus,flameshot -- dockerfile
 infrastlabs/docker-headless:core-compile2 as bin

dockerfile: wget --no-check-certificate

FROM infrastlabs/x11-base:rootfs as bin2

RUN mkdir -p /usr/local/tigervnc/bin; ln -s /usr/bin/Xvnc /usr/local/tigervnc/bin/Xvnc

core: # ibus,flameshot

up

up

f

f2
---
 ubt-core/src/Dockerfile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/ubt-core/src/Dockerfile b/ubt-core/src/Dockerfile
index e646398..e46854c 100644
--- a/ubt-core/src/Dockerfile
+++ b/ubt-core/src/Dockerfile
@@ -1,6 +1,9 @@
-FROM infrastlabs/docker-headless:core-compile as bin
+FROM infrastlabs/docker-headless:core-compile2 as bin
+FROM infrastlabs/x11-base:deb12-rootfs as bin2
+# FROM infrastlabs/x11-base:deb12-rootfs as bin2
 FROM ubuntu:20.04 as files1
   COPY --from=bin /rootfs /rootfs/
+  COPY --from=bin2 /rootfs /rootfs/
 
 FROM ubuntu:20.04 as files2
   ARG TARGETPLATFORM
@@ -67,7 +70,7 @@ RUN apt.sh \
   language-pack-gnome-zh-hans papirus-icon-theme greybird-gtk-theme; \
   rm -f /usr/share/backgrounds/greybird.svg; \
   \
-  wget https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bunsen-papirus-icon-theme_10.3-2_all.deb; \
+  wget --no-check-certificate 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; \
   \
@@ -77,8 +80,9 @@ RUN apt.sh \
   \
   dpkg -l |grep bunsen && exit 0 || exit 1;
 
-RUN apt.sh ibus ibus-gtk ibus-gtk3 ibus-rime librime-data-wubi \
-  flameshot
+# ibus,flameshot
+# RUN apt.sh ibus ibus-gtk ibus-gtk3 ibus-rime librime-data-wubi \
+#   flameshot
 # firefox> midori > ?
 # RUN apt.sh midori
 
@@ -92,7 +96,9 @@ COPY --from=files2 /rootfs /rootfs/conf
 # RUN bash /xconf.sh
 
 RUN \
-  echo "cp -a /rootfs/bin/* /; \n\
+  echo "\n\
+rm -f /usr/bin/Xvnc /usr/bin/vncpasswd; \n\
+cp -a /rootfs/bin/* /; \n\
 cp -a /rootfs/conf/* /; \n\
 bash /etc/skel/.fluxbox/fluxbox.sh; \n\
 bash /xconf.sh;\n\