Skip to content

Commit

Permalink
dist/x3 COPY --from=rootfs /rootfs/res_ubt_share /
Browse files Browse the repository at this point in the history 
dist sort x3

dist/alpine: +3.6; #   apk add --no-cache gtk-murrine-engine; \
  • Loading branch information
@huapox
huapox committed Oct 31, 2024
1 parent 21817f6 commit 57ef5e7
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 74 deletions.
50 changes: 27 additions & 23 deletions distros/src/Dockerfile.apk-alpine
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ FROM ${REPO}infrastlabs/x11-base:rootfs AS rootfs

# 20.04> 24.04: betterThemeView
# TODO: FROM --platform=linux/amd64
FROM --platform=linux/amd64 registry.cn-shenzhen.aliyuncs.com/infrastlabs/x11-base:app-ubuntu-24.04 AS ubt
FROM scratch AS res
COPY --from=ubt /usr/share/themes/Greybird /usr/share/themes/Greybird
COPY --from=ubt /usr/share/themes/Greybird-compact /usr/share/themes/Greybird-compact
COPY --from=ubt /usr/share/themes/Greybird-dark /usr/share/themes/Greybird-dark
COPY --from=ubt /usr/share/icons/Papirus /usr/share/icons/Papirus
COPY --from=ubt /usr/share/icons/Papirus-Bunsen-bluegrey /usr/share/icons/Papirus-Bunsen-bluegrey
COPY --from=ubt /usr/share/icons/Papirus-Bunsen-grey /usr/share/icons/Papirus-Bunsen-grey
COPY --from=ubt /usr/share/locale /usr/share/locale
COPY --from=ubt /usr/share/fonts/DejaVuSansMono /usr/share/fonts/DejaVuSansMono
COPY --from=ubt /usr/share/fonts/truetype/wqy /usr/share/fonts/truetype/wqy
COPY --from=ubt /etc/fonts /etc/fonts
#COPY --from=ubt /usr/share/
# FROM --platform=linux/amd64 registry.cn-shenzhen.aliyuncs.com/infrastlabs/x11-base:app-ubuntu-24.04 AS ubt
# FROM scratch AS res
# COPY --from=ubt /usr/share/themes/Greybird /usr/share/themes/Greybird
# COPY --from=ubt /usr/share/themes/Greybird-compact /usr/share/themes/Greybird-compact
# COPY --from=ubt /usr/share/themes/Greybird-dark /usr/share/themes/Greybird-dark
# COPY --from=ubt /usr/share/icons/Papirus /usr/share/icons/Papirus
# COPY --from=ubt /usr/share/icons/Papirus-Bunsen-bluegrey /usr/share/icons/Papirus-Bunsen-bluegrey
# COPY --from=ubt /usr/share/icons/Papirus-Bunsen-grey /usr/share/icons/Papirus-Bunsen-grey
# COPY --from=ubt /usr/share/locale /usr/share/locale
# COPY --from=ubt /usr/share/fonts/DejaVuSansMono /usr/share/fonts/DejaVuSansMono
# COPY --from=ubt /usr/share/fonts/truetype/wqy /usr/share/fonts/truetype/wqy
# COPY --from=ubt /etc/fonts /etc/fonts
# #COPY --from=ubt /usr/share/

## ref kube-cmd/src/Dockerfile
# FROM alpine:3.13.12
Expand Down Expand Up @@ -81,7 +81,7 @@ RUN apk add --no-cache \
test "3.1" != "${VER}" && apk add --no-cache unzip; \
match1=$(echo "${VER}" |grep -E "3.1$|3.2$"); \
test -z "$match1" && apk add --no-cache shadow; \
match2=$(echo "${VER}" |grep -E "3.1$|3.2$|3.5$"); \
match2=$(echo "${VER}" |grep -E "3.1$|3.2$|3.5$|3.6$"); \
test -z "$match2" && apk add --no-cache busybox-extras; \
test "3.19" == "${VER}" && apk add --no-cache iputils-ping iproute2-ss; \
test "3.19" == "${VER}" && chmod u+s /bin/ping; \
Expand All @@ -96,7 +96,8 @@ RUN apk add --no-cache \
# v3.2: firefox (38.3.0-r0)
# v3.5/v3.8: none-firefox
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
test "3.5" == "${VER}" && exit 0; \
test "3.5" == "${VER}" && exit 0; \
test "3.6" == "${VER}" && exit 0; \
test "3.8" == "${VER}" && exit 0; \
apk add --no-cache firefox; \
exit 0;
Expand All @@ -117,8 +118,10 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall; \
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
apk add --no-cache \
git \
thunar geany ristretto; \
test "3.8" != "${VER}" && apk add --no-cache gnome-system-monitor; \
thunar geany ristretto xrandr ; \
# 3.5$|
match2=$(echo "${VER}" |grep -E "3.6$|3.8$"); \
test -z "$match2" && apk add --no-cache gnome-system-monitor; \
test "3.13" == "${VER}" && apk add --no-cache pavucontrol ; \
test "3.19" == "${VER}" && apk add --no-cache pavucontrol ; \
exit 0;
Expand All @@ -140,8 +143,8 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
# v3.13: +rofi clipit pnmixer lxappearance
# pnmixer> pasystray
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
test "3.13" == "${VER}" && apk add --no-cache rofi clipit pasystray xrandr lxappearance; \
test "3.19" == "${VER}" && apk add --no-cache sakura rofi clipit pasystray xrandr lxappearance; \
test "3.13" == "${VER}" && apk add --no-cache rofi clipit pasystray lxappearance; \
test "3.19" == "${VER}" && apk add --no-cache sakura rofi clipit pasystray lxappearance; \
exit 0;

# XFCE4
Expand Down Expand Up @@ -179,19 +182,20 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
# root@tenvm2:/# pkgsize |grep engine
# 0.11 Mbs gtk2-engines-pixbuf #ubt1404,only-this
# 0.27 Mbs gtk2-engines-murrine
RUN \
apk add --no-cache gtk-murrine-engine; \
exit 0;
# RUN \
# apk add --no-cache gtk-murrine-engine; \
# exit 0;

# HEADLESS
COPY --from=rootfs /rootfs/res_ubt_share /
COPY --from=rootfs /rootfs/files1 /
COPY --from=rootfs /rootfs/files2 /
RUN \
bash /xconf.sh core; bash /xconf.sh app; \
exit 0;

# HEADLESS2
COPY --from=res / /
# COPY --from=res / /

EXPOSE 10089/tcp 10081/tcp 10022/tcp
CMD ["bash", "-c", "exec /entry.sh"]
Expand Down
63 changes: 32 additions & 31 deletions distros/src/Dockerfile.apt-ubuntu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,42 +224,43 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
exit 0


# FONT, THEME, ICON
# font-ttf: @win:msyh.zip> fonts-wqy-microhei
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
apt.sh \
greybird-gtk-theme \
fonts-wqy-microhei language-pack-gnome-zh-hans; \
\
rm -f /usr/share/backgrounds/greybird.svg;
# # FONT, THEME, ICON
# # font-ttf: @win:msyh.zip> fonts-wqy-microhei
# RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
# apt.sh \
# greybird-gtk-theme \
# fonts-wqy-microhei language-pack-gnome-zh-hans; \
# \
# rm -f /usr/share/backgrounds/greybird.svg;

# split papirus-icon-theme: none@1604,1404
# bunsen-papirus-icon-theme> papirus-icon-theme; ERR: 14.04 16.04 1804?
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
test "14.04" == "${VER}" && exit 0; \
test "16.04" == "${VER}" && exit 0; \
test "18.04" == "${VER}" && exit 0; \
echo a.123; \
apt.sh \
papirus-icon-theme; \
\
# 清理ubt自带图标, keep项: hicolor
# locolor gnome bloom
cd /usr/share/icons && rm -rf Humanity* ubuntu-mono* LoginIcons Tango; \
\
wget 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; \
\
# Papirus left: 16x(clipit:21M) 64x(desktop:21M)
cd /usr/share/icons/Papirus && rm -rf 18x* 22x* 24x* 32x* 48x* 64x* ; \
ls -lh /usr/share/icons/Papirus; \
\
dpkg -l |grep bunsen && exit 0 || exit 1;
# # split papirus-icon-theme: none@1604,1404
# # bunsen-papirus-icon-theme> papirus-icon-theme; ERR: 14.04 16.04 1804?
# RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
# test "14.04" == "${VER}" && exit 0; \
# test "16.04" == "${VER}" && exit 0; \
# test "18.04" == "${VER}" && exit 0; \
# echo a.123; \
# apt.sh \
# papirus-icon-theme; \
# \
# # 清理ubt自带图标, keep项: hicolor
# # locolor gnome bloom
# cd /usr/share/icons && rm -rf Humanity* ubuntu-mono* LoginIcons Tango; \
# \
# wget 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; \
# \
# # Papirus left: 16x(clipit:21M) 64x(desktop:21M)
# cd /usr/share/icons/Papirus && rm -rf 18x* 22x* 24x* 32x* 48x* 64x* ; \
# ls -lh /usr/share/icons/Papirus; \
# \
# dpkg -l |grep bunsen && exit 0 || exit 1;


# 拆分包体与配置项两块，免频繁变动基础包
# HEADLESS
COPY --from=rootfs /rootfs/res_ubt_share /
COPY --from=rootfs /rootfs/files1 /
COPY --from=rootfs /rootfs/files2 /
RUN \
Expand Down
41 changes: 21 additions & 20 deletions distros/src/Dockerfile.zyp-opensuse
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ ARG VER=15.5
FROM ${REPO}infrastlabs/x11-base:rootfs AS rootfs

# 20.04> 24.04: betterThemeView
FROM --platform=linux/amd64 registry.cn-shenzhen.aliyuncs.com/infrastlabs/x11-base:app-ubuntu-24.04 AS ubt
FROM scratch AS res
COPY --from=ubt /usr/share/themes/Greybird /usr/share/themes/Greybird
COPY --from=ubt /usr/share/themes/Greybird-compact /usr/share/themes/Greybird-compact
COPY --from=ubt /usr/share/themes/Greybird-dark /usr/share/themes/Greybird-dark
COPY --from=ubt /usr/share/icons/Papirus /usr/share/icons/Papirus
COPY --from=ubt /usr/share/icons/Papirus-Bunsen-bluegrey /usr/share/icons/Papirus-Bunsen-bluegrey
COPY --from=ubt /usr/share/icons/Papirus-Bunsen-grey /usr/share/icons/Papirus-Bunsen-grey
COPY --from=ubt /usr/share/fonts/DejaVuSansMono /usr/share/fonts/DejaVuSansMono
COPY --from=ubt /usr/share/fonts/truetype/wqy /usr/share/fonts/truetype/wqy
COPY --from=ubt /etc/fonts /etc/fonts
# locale_ubt: /usr/sbin/locale-gen,update-locale; /etc/default/locale
COPY --from=ubt /usr/share/locale /usr/share/locale
# COPY --from=ubt /usr/share/i18n /usr/share/i18n
COPY --from=ubt /usr/sbin/locale-gen /usr/sbin/locale-gen
COPY --from=ubt /usr/sbin/update-locale /usr/sbin/update-locale
COPY --from=ubt /etc/locale.gen /etc/locale.gen
COPY --from=ubt /etc/default/locale /etc/default/locale
#COPY --from=ubt /usr/share/
# FROM --platform=linux/amd64 registry.cn-shenzhen.aliyuncs.com/infrastlabs/x11-base:app-ubuntu-24.04 AS ubt
# FROM scratch AS res
# COPY --from=ubt /usr/share/themes/Greybird /usr/share/themes/Greybird
# COPY --from=ubt /usr/share/themes/Greybird-compact /usr/share/themes/Greybird-compact
# COPY --from=ubt /usr/share/themes/Greybird-dark /usr/share/themes/Greybird-dark
# COPY --from=ubt /usr/share/icons/Papirus /usr/share/icons/Papirus
# COPY --from=ubt /usr/share/icons/Papirus-Bunsen-bluegrey /usr/share/icons/Papirus-Bunsen-bluegrey
# COPY --from=ubt /usr/share/icons/Papirus-Bunsen-grey /usr/share/icons/Papirus-Bunsen-grey
# COPY --from=ubt /usr/share/fonts/DejaVuSansMono /usr/share/fonts/DejaVuSansMono
# COPY --from=ubt /usr/share/fonts/truetype/wqy /usr/share/fonts/truetype/wqy
# COPY --from=ubt /etc/fonts /etc/fonts
# # locale_ubt: /usr/sbin/locale-gen,update-locale; /etc/default/locale
# COPY --from=ubt /usr/share/locale /usr/share/locale
# # COPY --from=ubt /usr/share/i18n /usr/share/i18n
# COPY --from=ubt /usr/sbin/locale-gen /usr/sbin/locale-gen
# COPY --from=ubt /usr/sbin/update-locale /usr/sbin/update-locale
# COPY --from=ubt /etc/locale.gen /etc/locale.gen
# COPY --from=ubt /etc/default/locale /etc/default/locale
# #COPY --from=ubt /usr/share/

FROM opensuse/leap:${VER}
ARG TARGETPLATFORM
Expand Down Expand Up @@ -126,14 +126,15 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\


# HEADLESS
COPY --from=rootfs /rootfs/res_ubt_share /
COPY --from=rootfs /rootfs/files1 /
COPY --from=rootfs /rootfs/files2 /
RUN \
bash /xconf.sh core; bash /xconf.sh app; \
exit 0;

# HEADLESS2
COPY --from=res / /
# COPY --from=res / /

EXPOSE 10089/tcp 10081/tcp 10022/tcp
CMD ["bash", "-c", "exec /entry.sh"]
Expand Down

0 comments on commit 57ef5e7

Please sign in to comment.