dockerfile.x11base: sortMerge; only apt.sh tzdata locales

Author: sam#gemmi-win10

build/Dockerfile.x11base

@@ -4,23 +4,6 @@ FROM registry.cn-shenzhen.aliyuncs.com/infrastlabs/x11-base:core-ubuntu-${VER}
 ARG TARGETPLATFORM
 ARG VER=20.04
 
-# qemu,libvirt
-RUN apt.sh \
-    qemu-system-x86 qemu-system-arm qemu-system-ppc qemu-utils ipxe-qemu \
-    libvirt-daemon-system libvirt-clients virtinst \
-    bridge-utils seabios vgabios dnsmasq \
-    supervisor dropbear git; 
-# ubt24-none: qemu-efi gconf2
-RUN \
-  test "24.04" != "${VER}" && apt.sh gconf2 qemu-efi; \
-  exit 0
-# RUN \
-#   # xz-utils vim wget openssh-server 
-#   apt.sh \
-#   # fonts-noto fonts-noto-core fonts-noto-mono \
-#   supervisor dropbear git
-
-
 # tini,gosu
 # https://github.com/krallin/tini/releases/download/v0.19.0/tini-static-muslc-amd64
 # https://github.com/tianon/gosu/releases/download/1.11/gosu-$arch
@@ -40,29 +23,6 @@ RUN \
   chmod +x $file; mv $file /bin/virter;
 
 
-RUN \
-  sed -i 's/#user = "root"/user = "root"/' /etc/libvirt/qemu.conf; \
-  sed -i 's/#group = "root"/group = "root"/' /etc/libvirt/qemu.conf; \
-  exit 0;
-
-
-##virt-manager#############
-RUN \
-  # gobject-introspection: for dev-run ./virt-manager
-  apt.sh virt-manager gobject-introspection; \
-  cd /usr/local; \
-  git clone https://gitee.com/g-system/fk-virt-manager; 
-
-# LOC 87.4 MB
-# strip: binutils
-RUN \
-  # test "app" != "$TYPE" && exit 0 || echo appInstall;\
-  # LOCALE 15.0 MB 
-  apt.sh tzdata locales binutils dconf-cli \
-  dbus-x11 at-spi2-core gtk2-engines-pixbuf \
-  # 343 kB
-  apt-utils x11-xkb-utils xdg-utils; \
-  exit 0
 # ICON
 RUN \
   # test "app" != "$TYPE" && exit 0 || echo appInstall;\
@@ -103,14 +63,11 @@ RUN \
 # COPY --from=rootfs /rootfs/res_ubt_share /
 # COPY --from=rootfs /rootfs/files1 /
 # COPY --from=rootfs /rootfs/files2 /
-RUN \
-  # [librsvg2-common]>> OK有效:免icons配置不生效<flux/openbox,xfce4>
-  apt.sh librsvg2-common; \
-  \
-  # curl -o /xconf.sh -k -fSL https://gitee.com/infrastlabs/docker-x11base/raw/dev/rootfs/src/xconf.sh; \
-  # bash /xconf.sh core; \
-  # export TYPE=app; bash /xconf.sh app; \
-  exit 0;
+# RUN \
+#   curl -o /xconf.sh -k -fSL https://gitee.com/infrastlabs/docker-x11base/raw/dev/rootfs/src/xconf.sh; \
+#   bash /xconf.sh core; \
+#   export TYPE=app; bash /xconf.sh app; \
+#   exit 0;
 
 # EXPOSE 10089/tcp 10081/tcp 10022/tcp
 # CMD ["bash", "-c", "exec /entry.sh"]
@@ -148,6 +105,51 @@ RUN \
 #   sed -i "s^/bin/ash^/bin/bash^g" /etc/passwd; \
 #   echo "root:root" |chpasswd;
 
+
+
+# qemu,libvirt
+RUN apt.sh \
+    qemu-system-x86 qemu-system-arm qemu-system-ppc qemu-utils ipxe-qemu \
+    libvirt-daemon-system libvirt-clients virtinst \
+    bridge-utils seabios vgabios dnsmasq \
+    supervisor dropbear git; 
+# ubt24-none: qemu-efi gconf2
+RUN \
+  test "24.04" != "${VER}" && apt.sh gconf2 qemu-efi; \
+  exit 0
+# RUN \
+#   # xz-utils vim wget openssh-server 
+#   apt.sh \
+#   # fonts-noto fonts-noto-core fonts-noto-mono \
+#   supervisor dropbear git
+RUN \
+  sed -i 's/#user = "root"/user = "root"/' /etc/libvirt/qemu.conf; \
+  sed -i 's/#group = "root"/group = "root"/' /etc/libvirt/qemu.conf; \
+  exit 0;
+
+
+##virt-manager#############
+RUN \
+  # gobject-introspection: for dev-run ./virt-manager
+  apt.sh virt-manager gobject-introspection; \
+  cd /usr/local; \
+  git clone https://gitee.com/g-system/fk-virt-manager; 
+
+# LOC 87.4 MB
+# strip: binutils
+RUN \
+  # test "app" != "$TYPE" && exit 0 || echo appInstall;\
+  # LOCALE 15.0 MB 
+  apt.sh tzdata locales \
+  # dbus-x11 at-spi2-core gtk2-engines-pixbuf \
+  # 343 kB
+  # apt-utils x11-xkb-utils xdg-utils \
+  # binutils dconf-cli \
+  ; \
+  # [librsvg2-common]>> OK有效:免icons配置不生效<flux/openbox,xfce4>
+  apt.sh librsvg2-common; \
+  exit 0
+
 ENV \
   TERM=xterm \
   SHELL=/bin/bash \