Skip to content

Commit 6e770c2

Browse files
author
sam#gemmi-win10
committed
Dockerfile.x11base.dbg: notes, add
1 parent f5dbd36 commit 6e770c2

File tree

1 file changed

+86
-56
lines changed

1 file changed

+86
-56
lines changed

‎build/Dockerfile.x11base.dbg‎

Lines changed: 86 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -66,30 +66,30 @@ RUN \
6666

6767

6868
##APP################################################
69-
# MESA-LLVM img: 362MB> 398MB
70-
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
71-
# VIDEO: 30.5 MB
72-
# libllvm12 已包含 # libgl1-mesa-glx >libgl1-mesa-dri ##ex: mesa-utils
73-
apt.sh libgl1-mesa-glx libglu1-mesa; \
74-
\
75-
# LLVM(定制版这里删调它,除gnome,cinna其它de无影响); clear big lib: 88M (qt: flameshot,sogoupinyin) > img: -27M
76-
rm -f /usr/lib/x86_64-linux-gnu/libLLVM-12.so.1; \
77-
rm -f /usr/lib/aarch64-linux-gnu/libLLVM-12.so.1;
78-
79-
# ubt2404-drop: libasound2
80-
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
81-
mkdir -p /usr/share/X11/xkb; \
82-
apt.sh \
83-
# firefox #esr/115.1>> libdbus-glib-1-2
84-
libxtst6 libdbus-glib-1-2 \
85-
# 163music v1.2.1
86-
libharfbuzz0b libpangocairo-1.0-0 libgdk-pixbuf2.0-0 \
87-
# wps2019 11.1.0.11719
88-
libfreetype6 libcups2 libglib2.0-0 libglu1-mesa libsm6 libxrender1 libfontconfig1 libxext6 libxcb1 \
89-
# vscode 1.88.1 ##libgtk-3-0: 16M; img: 362MB> 398MB > 475MB
90-
libnss3 libatk1.0-0 libatk-bridge2.0-0 libgtk-3-0 libgbm1; \
91-
# err: ubt1604
92-
exit 0
69+
# # MESA-LLVM img: 362MB> 398MB
70+
# RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
71+
# # VIDEO: 30.5 MB
72+
# # libllvm12 已包含 # libgl1-mesa-glx >libgl1-mesa-dri ##ex: mesa-utils
73+
# apt.sh libgl1-mesa-glx libglu1-mesa; \
74+
# \
75+
# # LLVM(定制版这里删调它,除gnome,cinna其它de无影响); clear big lib: 88M (qt: flameshot,sogoupinyin) > img: -27M
76+
# rm -f /usr/lib/x86_64-linux-gnu/libLLVM-12.so.1; \
77+
# rm -f /usr/lib/aarch64-linux-gnu/libLLVM-12.so.1;
78+
79+
# # ubt2404-drop: libasound2
80+
# RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
81+
# mkdir -p /usr/share/X11/xkb; \
82+
# apt.sh \
83+
# # firefox #esr/115.1>> libdbus-glib-1-2
84+
# libxtst6 libdbus-glib-1-2 \
85+
# # 163music v1.2.1
86+
# libharfbuzz0b libpangocairo-1.0-0 libgdk-pixbuf2.0-0 \
87+
# # wps2019 11.1.0.11719
88+
# libfreetype6 libcups2 libglib2.0-0 libglu1-mesa libsm6 libxrender1 libfontconfig1 libxext6 libxcb1 \
89+
# # vscode 1.88.1 ##libgtk-3-0: 16M; img: 362MB> 398MB > 475MB
90+
# libnss3 libatk1.0-0 libatk-bridge2.0-0 libgtk-3-0 libgbm1; \
91+
# # err: ubt1604
92+
# exit 0
9393

9494
# LOC 87.4 MB
9595
# strip: binutils; xrdp-chansrv: libfdk-aac1 libopus0
@@ -101,17 +101,17 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
101101
apt-utils x11-xkb-utils xdg-utils; \
102102
exit 0
103103

104-
# AUD img: 546MB[239M]> 560MB
105-
# INPUT img: 546MB[239M]> 658MB[252M]
106-
# librime-data-wubi> rime-data-wubi
107-
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
108-
apt.sh \
109-
# Audio 39.8 MB
110-
pavucontrol \
111-
\
112-
# \12.3 MB (默认不含输入法: IBus/Fcitx)
113-
ibus ibus-gtk ibus-gtk3 ibus-rime librime-data-wubi; \
114-
exit 0
104+
# # AUD img: 546MB[239M]> 560MB
105+
# # INPUT img: 546MB[239M]> 658MB[252M]
106+
# # librime-data-wubi> rime-data-wubi
107+
# RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
108+
# apt.sh \
109+
# # Audio 39.8 MB
110+
# pavucontrol \
111+
# \
112+
# # \12.3 MB (默认不含输入法: IBus/Fcitx)
113+
# ibus ibus-gtk ibus-gtk3 ibus-rime librime-data-wubi; \
114+
# exit 0
115115

116116
# ubt icon-theme clear;
117117
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
@@ -120,19 +120,19 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
120120
cd /usr/share/icons && rm -rf Humanity* ubuntu-mono* LoginIcons Tango; \
121121
exit 0
122122

123-
# MISC2 arandr
124-
# flameshot: none@1604,1404
125-
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
126-
test "14.04" == "${VER}" && exit 0; \
127-
test "16.04" == "${VER}" && exit 0; \
128-
apt.sh \
129-
# tumbler gnupg \
130-
# # \20.5 MB
131-
flameshot; \
132-
# flameshot_qt;
133-
strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5; \
134-
strip --remove-section=.note.ABI-tag /usr/lib/aarch64-linux-gnu/libQt5Core.so.5; \
135-
exit 0
123+
# # MISC2 arandr
124+
# # flameshot: none@1604,1404
125+
# RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
126+
# test "14.04" == "${VER}" && exit 0; \
127+
# test "16.04" == "${VER}" && exit 0; \
128+
# apt.sh \
129+
# # tumbler gnupg \
130+
# # # \20.5 MB
131+
# flameshot; \
132+
# # flameshot_qt;
133+
# strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5; \
134+
# strip --remove-section=.note.ABI-tag /usr/lib/aarch64-linux-gnu/libQt5Core.so.5; \
135+
# exit 0
136136

137137
# XFCE4
138138
# tint2
@@ -149,15 +149,15 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
149149
# pnmixer> pasystray
150150
# xrandr @x11-xserver-utils
151151
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
152-
apt.sh thunar dunst clipit pasystray \
153-
pcmanfm lxappearance \
154-
sakura geany ristretto gnome-system-monitor; \
152+
apt.sh thunar dunst clipit \
153+
# pasystray pcmanfm lxappearance gnome-system-monitor \
154+
sakura geany ristretto ; \
155155
# misc2
156156
\
157157
# link: sakura, thunar
158158
# ln -s /usr/bin/thunar /usr/bin/pcmanfm; \
159-
mv /usr/bin/st /usr/bin/st00; ln -s /usr/bin/sakura /usr/bin/st; \
160-
test "14.04" == "${VER}" && exit 0; \
159+
# mv /usr/bin/st /usr/bin/st00; ln -s /usr/bin/sakura /usr/bin/st; \
160+
# test "14.04" == "${VER}" && exit 0; \
161161
apt.sh plank engrampa; \
162162
exit 0
163163

@@ -176,10 +176,40 @@ RUN \
176176
exit 0
177177

178178
# firefox: ubt2204+>> @snap: snap install firefox
179-
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
180-
match1=$(echo "${VER}" |grep -E "22.04$|24.04$"); \
181-
test -z "$match1" && apt.sh firefox; \
179+
# RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
180+
# match1=$(echo "${VER}" |grep -E "22.04$|24.04$"); \
181+
# test -z "$match1" && apt.sh firefox; \
182+
# exit 0
183+
184+
185+
# qemu,libvirt
186+
RUN apt.sh \
187+
qemu-system-x86 qemu-system-arm qemu-system-ppc qemu-utils ipxe-qemu \
188+
libvirt-daemon-system libvirt-clients virtinst \
189+
bridge-utils seabios vgabios dnsmasq \
190+
supervisor dropbear git;
191+
# ubt24-none: qemu-efi gconf2
192+
RUN \
193+
test "24.04" != "${VER}" && apt.sh gconf2 qemu-efi; \
182194
exit 0
195+
# virter-v0.24.0
196+
RUN \
197+
case ${TARGETPLATFORM} in \
198+
"linux/amd64") arch=amd64 ;; \
199+
"linux/arm64") arch=arm64 ;; \
200+
"linux/arm/v7") arch=arm ;; \
201+
"linux/ppc64le") arch=ppc64le ;; \
202+
"linux/arm/v6") arch=NONE_armel ;; \
203+
"linux/386") arch=NONE_i386 ;; \
204+
esac; \
205+
file=virter-linux-$arch; \
206+
# https://github.com/infrastlabs/fk-virter/releases/download/v24.12/virter-linux-amd64 #none: xx-upx.tar.gz ([email protected])
207+
test -s $file || wget -O $file https://github.com/infrastlabs/fk-virter/releases/download/v24.12/$file; \
208+
chmod +x $file; mv $file /bin/virter;
209+
RUN \
210+
sed -i 's/#user = "root"/user = "root"/' /etc/libvirt/qemu.conf; \
211+
sed -i 's/#group = "root"/group = "root"/' /etc/libvirt/qemu.conf; \
212+
exit 0;
183213

184214
# 拆分包体与配置项两块，免频繁变动基础包
185215
# HEADLESS

0 commit comments

Comments
 (0)