Skip to content

Commit

Permalink
core: dockerfile> FROM infrastlabs/x11-base:deb12-rootfs as bin2; cor…
Browse files Browse the repository at this point in the history
…e: # ibus,flameshot

--
dockerfile infrastlabs/docker-headless:core-compile2 as bin

dockerfile: wget --no-check-certificate

FROM infrastlabs/x11-base:rootfs as bin2

RUN mkdir -p /usr/local/tigervnc/bin; ln -s /usr/bin/Xvnc /usr/local/tigervnc/bin/Xvnc

core: # ibus,flameshot

up

up

f

f2
  • Loading branch information
huapox authored and sam#gemmi-win10 committed Oct 20, 2024
1 parent 04ec3b8 commit 4928021
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions ubt-core/src/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
FROM infrastlabs/docker-headless:core-compile as bin
FROM infrastlabs/docker-headless:core-compile2 as bin
FROM infrastlabs/x11-base:deb12-rootfs as bin2
# FROM infrastlabs/x11-base:deb12-rootfs as bin2
FROM ubuntu:20.04 as files1
COPY --from=bin /rootfs /rootfs/
COPY --from=bin2 /rootfs /rootfs/

FROM ubuntu:20.04 as files2
ARG TARGETPLATFORM
Expand Down Expand Up @@ -67,7 +70,7 @@ RUN apt.sh \
language-pack-gnome-zh-hans papirus-icon-theme greybird-gtk-theme; \
rm -f /usr/share/backgrounds/greybird.svg; \
\
wget https://gitee.com/infrastlabs/docker-headless/raw/dev/_doc/assets/bunsen-papirus-icon-theme_10.3-2_all.deb; \
wget --no-check-certificate 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; \
\
Expand All @@ -77,8 +80,9 @@ RUN apt.sh \
\
dpkg -l |grep bunsen && exit 0 || exit 1;

RUN apt.sh ibus ibus-gtk ibus-gtk3 ibus-rime librime-data-wubi \
flameshot
# ibus,flameshot
# RUN apt.sh ibus ibus-gtk ibus-gtk3 ibus-rime librime-data-wubi \
# flameshot
# firefox> midori > ?
# RUN apt.sh midori

Expand All @@ -92,7 +96,9 @@ COPY --from=files2 /rootfs /rootfs/conf
# RUN bash /xconf.sh

RUN \
echo "cp -a /rootfs/bin/* /; \n\
echo "\n\
rm -f /usr/bin/Xvnc /usr/bin/vncpasswd; \n\
cp -a /rootfs/bin/* /; \n\
cp -a /rootfs/conf/* /; \n\
bash /etc/skel/.fluxbox/fluxbox.sh; \n\
bash /xconf.sh;\n\
Expand Down

0 comments on commit 4928021

Please sign in to comment.