Skip to content

Commit

Permalink
compile: top apt-ins
Browse files Browse the repository at this point in the history
  • Loading branch information
sam#gemmi-win10 committed Oct 14, 2023
1 parent 8477bb0 commit 147734a
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions deb12/src/Dockerfile.compile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}') && \
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 147734a

Please sign in to comment.