Skip to content

Commit

Permalink
dist/ubt VER
Browse files Browse the repository at this point in the history
dist/ubt arg at top

dist/ubt /etc/apt/apt.conf.d/skip-gpg-check-ig

dist/ubt fix

dist/ubt # ex-ubt-2404: netcat

# ubt2404-drop: libasound2

dist/ubt # tint2
  • Loading branch information
huapox committed Jun 26, 2024
1 parent 9ac15a1 commit 20db4a0
Showing 1 changed file with 20 additions and 6 deletions.
26 changes: 20 additions & 6 deletions distros/src/Dockerfile.apt-ubuntu
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
ARG REPO=
ARG VER=focal
FROM ${REPO}infrastlabs/x11-base:rootfs AS rootfs
FROM ubuntu:20.04
FROM ubuntu:${VER}
ARG VER=focal
ENV \
DEBIAN_FRONTEND=noninteractive \
LOCALE_INCLUDE="zh_CN zh_HK zh_TW en en_AU fr fr_CA pt pt_BR es ar cs de it ru nl tr is sv uk ja ko th vi"
# LOCALE_INCLUDE="en"
ARG TARGETPLATFORM
ARG TYPE=core
RUN echo "Acquire {\n\
APT::Get::Allow-Unauthenticated \"true\";\n\
GPG::Ignore \"true\";\n\
AllowInsecureRepositories \"true\";\n\
AllowDowngradeToInsecureRepositories \"true\";\n\
}" > /etc/apt/apt.conf.d/skip-gpg-check-ig;
RUN export DOMAIN="mirrors.ustc.edu.cn"; \
test -z "$(echo $TARGETPLATFORM |grep arm)" && target=ubuntu || target=ubuntu-ports; \
echo "deb http://${DOMAIN}/$target focal main restricted universe multiverse" > /etc/apt/sources.list \
&& echo "deb http://${DOMAIN}/$target focal-updates main restricted universe multiverse">> /etc/apt/sources.list; \
echo "deb http://${DOMAIN}/$target ${VER} main restricted universe multiverse" > /etc/apt/sources.list \
&& echo "deb http://${DOMAIN}/$target ${VER}-updates main restricted universe multiverse">> /etc/apt/sources.list; \
\
# default:echo -e;
echo "path-exclude /usr/share/doc/*\n\
Expand All @@ -31,10 +39,11 @@ path-exclude /usr/share/lintian/*\n\
# lame sox libsox-fmt-mp3
# dropbear-bin dropbear-run openssh-sftp-server
# bash-completion
# ex-ubt-2404: netcat
RUN \
apt.sh wget ca-certificates \
curl \
htop rsync tree tmux lrzsz psmisc fuse net-tools netcat iputils-ping \
htop rsync tree tmux lrzsz psmisc fuse net-tools iputils-ping \
procps sudo iproute2 iptables zip unzip xz-utils vim-tiny \
openssh-sftp-server lftp jq \
lame
Expand Down Expand Up @@ -76,14 +85,18 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
rm -f /usr/lib/x86_64-linux-gnu/libLLVM-12.so.1; \
rm -f /usr/lib/aarch64-linux-gnu/libLLVM-12.so.1;

# ubt2404-drop: libasound2
# 2.573 Package libasound2 is a virtual package provided by:
# 2.573 liboss4-salsa-asound2 4.2-build2020-1ubuntu3
# 2.573 libasound2t64 1.2.11-1build2 (= 1.2.11-1build2)
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
mkdir -p /usr/share/X11/xkb; \
apt.sh \
# firefox #esr/115.1>> libdbus-glib-1-2
libxtst6 libdbus-glib-1-2 \
# 163music v1.2.1
# RUN apt.sh \
libharfbuzz0b libpangocairo-1.0-0 libgdk-pixbuf2.0-0 libasound2 \
libharfbuzz0b libpangocairo-1.0-0 libgdk-pixbuf2.0-0 \
# wps2019 11.1.0.11719
# RUN apt.sh \
libfreetype6 libcups2 libglib2.0-0 libglu1-mesa libsm6 libxrender1 libfontconfig1 libxext6 libxcb1 \
Expand Down Expand Up @@ -135,9 +148,10 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
exit 0

# XFCE4
# tint2
# plank rofi clipit pnmixer lxappearance thunar \
RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
apt.sh tint2 \
apt.sh \
# 2536 kB #18.9 MB > 14.3 MB
xfwm4 xfdesktop4 \
xfce4-notifyd xfce4-settings xfce4-session
Expand Down

0 comments on commit 20db4a0

Please sign in to comment.