up :+rootfs cp, +env

infrastlabs · Oct 22, 2023 · e7e65f3 · e7e65f3
1 parent 7e26b70
commit e7e65f3
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/ubt/Dockerfile.deb12 b/ubt/Dockerfile.deb12
@@ -187,25 +187,25 @@ RUN xx-verify --static /tmp/tigervnc-install/usr/bin/Xvnc; \
 # RUN upx /tmp/tigervnc-install/usr/bin/Xvnc; \
 #   upx /tmp/tigervnc-install/usr/bin/vncpasswd
 
-# RUN rm -rf /rootfs; mkdir -p /rootfs${TARGETPATH}/bin /rootfs${TARGETPATH}/share/X11; \
-#   \cp -a /tmp/tigervnc-install/usr/bin/Xvnc /rootfs${TARGETPATH}/bin/; \
-#   \cp -a /tmp/tigervnc-install/usr/bin/vncpasswd /rootfs${TARGETPATH}/bin/; \
-#   \cp -a /tmp/xkb-install/usr/share/X11/xkb /rootfs${TARGETPATH}/share/X11/xkb; \
-#   \cp -a /tmp/xkbcomp-install/usr/bin/xkbcomp /rootfs${TARGETPATH}/bin/; \
-#   #\cp -a /tmp/xdpyprobe/xdpyprobe /rootfs${TARGETPATH}/bin/; \
-#   \cp -a /tmp/logs /rootfs/
-
-# # validate
-# RUN du -sh /rootfs; \
-#   /rootfs/usr/bin/Xvnc -version; \
-#   find /rootfs -type f |sort
-
-# # deb12
-# RUN apt.sh \
-#   # --enable-xx ##还是需要libGL.so.1
-#   libjpeg62-turbo openssl \
-#   x11-xkb-utils xkb-data \
-#   \
-#   libgl1 libxau6 libxdmcp6 \
-#   libpixman-1-0 \
-#   libxfont2
+RUN rm -rf /rootfs; mkdir -p /rootfs${TARGETPATH}/bin /rootfs${TARGETPATH}/share/X11; \
+  \cp -a /tmp/tigervnc-install/usr/bin/Xvnc /rootfs${TARGETPATH}/bin/; \
+  \cp -a /tmp/tigervnc-install/usr/bin/vncpasswd /rootfs${TARGETPATH}/bin/; \
+  \cp -a /tmp/xkb-install/usr/share/X11/xkb /rootfs${TARGETPATH}/share/X11/xkb; \
+  \cp -a /tmp/xkbcomp-install/usr/bin/xkbcomp /rootfs${TARGETPATH}/bin/; \
+  #\cp -a /tmp/xdpyprobe/xdpyprobe /rootfs${TARGETPATH}/bin/; \
+  \cp -a /tmp/logs /rootfs/
+
+# validate
+RUN du -sh /rootfs; \
+  /rootfs/usr/bin/Xvnc -version; \
+  find /rootfs -type f |sort
+
+# deb12
+RUN apt.sh \
+  # --enable-xx ##还是需要libGL.so.1
+  libjpeg62-turbo openssl \
+  x11-xkb-utils xkb-data \
+  \
+  libgl1 libxau6 libxdmcp6 \
+  libpixman-1-0 \
+  libxfont2