From 147734a38a5b0e6f16b6b012ce86776f9bedc51a Mon Sep 17 00:00:00 2001
From: sam#gemmi-win10 <sam@china.gz>
Date: Sat, 14 Oct 2023 16:58:55 +0800
Subject: [PATCH] compile: top apt-ins

---
 deb12/src/Dockerfile.compile | 62 ++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/deb12/src/Dockerfile.compile b/deb12/src/Dockerfile.compile
index feb3c2c..d5e2313 100644
--- a/deb12/src/Dockerfile.compile
+++ b/deb12/src/Dockerfile.compile
@@ -30,24 +30,40 @@ RUN apt.sh \
   htop rsync tree tmux lrzsz wget psmisc openssl net-tools \
   curl sudo iputils-ping procps iproute2 iptables ca-certificates \
   zip unzip xz-utils
-# BUILD_common 81M
-RUN apt.sh \
-  git autoconf libtool pkg-config gcc g++ make \
-  autoconf m4 intltool build-essential dpkg-dev \
-  build-essential check
+# BUILD_common 81M ###########
+    RUN apt.sh \
+      git autoconf libtool pkg-config gcc g++ make \
+      autoconf m4 intltool build-essential dpkg-dev \
+      build-essential check
+# BUILD_xrdp ###########
+    # deb12.out: python-libxml2 
+    RUN apt.sh \
+      git autoconf libtool pkg-config gcc g++ make  libssl-dev libpam0g-dev \
+      libjpeg-dev libx11-dev libxfixes-dev libxrandr-dev  flex bison libxml2-dev \
+      intltool xsltproc xutils-dev g++ xutils libfuse-dev \
+      libmp3lame-dev nasm libpixman-1-dev xserver-xorg-dev
+    RUN apt.sh \
+      libfdk-aac-dev libopus-dev
+# BUILD_pulseaudio ###########
+    # deb-src
+    # ARG TARGETPLATFORM
+    RUN export DOMAIN="mirrors.ustc.edu.cn"; \
+      test -z "$(echo $TARGETPLATFORM |grep arm)" && target=ubuntu || target=ubuntu-ports; \
+      echo "deb-src http://$DOMAIN/debian bookworm main contrib non-free" >> /etc/apt/sources.list; \
+      echo "deb-src http://$DOMAIN/debian bookworm-updates main contrib non-free">> /etc/apt/sources.list; \
+      cat /etc/apt/sources.list;
+    # RUN apt update && apt install -qy
+    RUN apt.sh pulseaudio libpulse-dev \
+      autoconf m4 intltool build-essential dpkg-dev
+# BUILD_tigervnc ###########
+    # RUN apt update; apt install -y --no-install-recommends \
+    # 25.6M
+    RUN apt.sh ca-certificates fakeroot devscripts devscripts binutils wget;
 
 WORKDIR /opt
 
 ###xrdp, xorgxrdp###############################################
-# deb12.out: python-libxml2 
 FROM stage-base as stage-xrdp
-RUN apt.sh \
-    git autoconf libtool pkg-config gcc g++ make  libssl-dev libpam0g-dev \
-    libjpeg-dev libx11-dev libxfixes-dev libxrandr-dev  flex bison libxml2-dev \
-    intltool xsltproc xutils-dev g++ xutils libfuse-dev \
-    libmp3lame-dev nasm libpixman-1-dev xserver-xorg-dev
-RUN apt.sh \
-  libfdk-aac-dev libopus-dev
 #0.9.5 > 0.9.16 > 0.9.19(thunar@gemmi-deb11卡死)
 ENV ver="0.9.16"
 # https://hub.fastgit.org/neutrinolabs/xrdp/wiki/Building-on-Debian-8
@@ -86,14 +102,6 @@ make install;
 FROM stage-base as stage-pulsexrdp
 #### pulseaudio-module-xrdp >> pulseaudio ver: 10.0
 # RUN git submodule update --init --recursive
-
-# deb-src
-RUN export DOMAIN="mirrors.ustc.edu.cn"; \
- test -z "$(echo $TARGETPLATFORM |grep arm)" && target=ubuntu || target=ubuntu-ports; \
- echo "deb-src http://$DOMAIN/debian bookworm main contrib non-free" >> /etc/apt/sources.list; \
- echo "deb-src http://$DOMAIN/debian bookworm-updates main contrib non-free">> /etc/apt/sources.list;
-RUN apt update && apt install -qy pulseaudio libpulse-dev \
-  autoconf m4 intltool build-essential dpkg-dev
 RUN apt update && apt build-dep -q -y pulseaudio && \
   cd /opt && apt source pulseaudio && \
   pulseaudio=$(pulseaudio --version | awk '{print $2}') && \
@@ -115,21 +123,11 @@ RUN cd /opt && git clone --branch v0.5 https://gitee.com/g-system/pulseaudio-mod
 ###tigervnc###############################################
 # ref: https://github.com/abcdesktopio/tigervnc/blob/main/Dockerfile
 FROM stage-base as stage-tiger
-ARG TARGETPLATFORM
-# DEB-SRC
-RUN export DOMAIN="mirrors.ustc.edu.cn"; \
- test -z "$(echo $TARGETPLATFORM |grep arm)" && target=ubuntu || target=ubuntu-ports; \
- echo "deb-src http://$DOMAIN/debian bookworm main contrib non-free" >> /etc/apt/sources.list; \
- echo "deb-src http://$DOMAIN/debian bookworm-updates main contrib non-free">> /etc/apt/sources.list; \
- cat /etc/apt/sources.list;
 # INSTALL dev, dep and sources
 RUN apt update; \
-  # 25.6M
-  apt install -y --no-install-recommends ca-certificates fakeroot devscripts devscripts binutils wget; \
   # 129 MB 
   apt build-dep -y tigervnc 
 
-
 # SRC
 ADD src/arm /src/arm
 WORKDIR /src/arm
@@ -178,6 +176,8 @@ RUN cp /build/tigervnc-1.12.0/unix/vncpasswd/vncpasswd /usr/local/tigervnc/bin/
 # swrast_dri.so # /usr/lib/dri/swrast_dri.so
 # ln -s /usr/lib/x86_64-linux-gnu/dri /usr/lib/dri
 
+
+
 ###merge: xrdp, pulse, tigervnc###############################################
 # 11.9M
 # FROM scratch