Skip to content

Commit aab6570

Browse files
change to kali-rolling
1 parent 4862054 commit aab6570

File tree

1 file changed

+15
-21
lines changed

1 file changed

+15
-21
lines changed

Dockerfile

+15-21
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
FROM ubuntu:20.04 AS builder
1+
FROM kalilinux/kali-rolling AS builder
22
MAINTAINER Daniel Guerra
33

44
# Install packages
55

66
ENV DEBIAN_FRONTEND=noninteractive
7-
RUN sed -i "s/# deb-src/deb-src/g" /etc/apt/sources.list
7+
ARG DEBIAN_VERSION_FOR_MIRORR="bookworm"
8+
RUN echo "deb-src http://http.kali.org/kali kali-rolling main non-free contrib" | tee -a /etc/apt/sources.list
9+
RUN echo "deb http://ftp.debian.org/debian $DEBIAN_VERSION_FOR_MIRORR main" >> /etc/apt/sources.list.d/debian-$DEBIAN_VERSION_FOR_MIRORR.list
810
RUN apt-get -y update && apt-get -yy dist-upgrade
911
ENV BUILD_DEPS="git autoconf pkg-config libssl-dev libpam0g-dev \
1012
libx11-dev libxfixes-dev libxrandr-dev nasm xsltproc flex \
1113
bison libxml2-dev dpkg-dev libcap-dev libxkbfile-dev"
12-
RUN apt-get -yy install sudo apt-utils software-properties-common $BUILD_DEPS
14+
ENV BUILD_DEPS2="liblirc-dev"
15+
RUN apt-get -yy install sudo apt-utils software-properties-common $BUILD_DEPS $BUILD_DEPS2
1316

1417

1518
# Build xrdp
@@ -21,7 +24,7 @@ RUN mv /tmp/pulseaudio-* /tmp/pulseaudio-11.1
2124
WORKDIR /tmp/pulseaudio-11.1
2225
RUN dpkg-buildpackage -rfakeroot -uc -b
2326
WORKDIR /tmp
24-
RUN git clone --branch v0.10.0 --recursive https://github.com/neutrinolabs/xrdp.git
27+
RUN git clone --branch devel --recursive https://github.com/neutrinolabs/xrdp.git
2528
WORKDIR /tmp/xrdp
2629
RUN ./bootstrap
2730
RUN ./configure
@@ -36,17 +39,17 @@ RUN make
3639
RUN mkdir -p /tmp/so
3740
RUN cp src/.libs/*.so /tmp/so
3841

39-
FROM ubuntu:20.04
40-
42+
FROM kalilinux/kali-rolling
4143
ARG ADDITIONAL_PACKAGES=""
4244
ENV ADDITIONAL_PACKAGES=${ADDITIONAL_PACKAGES}
4345
ENV TZ="Etc/UTC"
4446
ENV DEBIAN_FRONTEND=noninteractive
45-
RUN apt update && apt install -y software-properties-common apt-utils
46-
RUN apt -y dist-upgrade && apt install -y \
47+
COPY --from=builder /etc/apt/sources.list.d/debian*.list /etc/apt/sources.list.d/
48+
RUN apt update && apt -y dist-upgrade && apt install -y \
4749
ca-certificates \
4850
crudini \
49-
firefox \
51+
dbus-x11 \
52+
kali-desktop-xfce \
5053
less \
5154
locales \
5255
openssh-server \
@@ -55,19 +58,9 @@ RUN apt -y dist-upgrade && apt install -y \
5558
supervisor \
5659
uuid-runtime \
5760
vim \
58-
vlc \
5961
wget \
6062
xauth \
6163
xautolock \
62-
xfce4 \
63-
xfce4-clipman-plugin \
64-
xfce4-cpugraph-plugin \
65-
xfce4-netload-plugin \
66-
xfce4-screenshooter \
67-
xfce4-taskmanager \
68-
xfce4-terminal \
69-
xfce4-xkb-plugin \
70-
dbus-x11 \
7164
xorgxrdp \
7265
xprintidle \
7366
xrdp \
@@ -89,8 +82,9 @@ RUN cp /etc/X11/xrdp/xorg.conf /etc/X11 && \
8982
sed -i "s/console/anybody/g" /etc/X11/Xwrapper.config && \
9083
sed -i "s/xrdp\/xorg/xorg/g" /etc/xrdp/sesman.ini && \
9184
locale-gen en_US.UTF-8 && \
92-
echo "pulseaudio -D --enable-memfd=True" > /etc/skel/.Xsession && \
93-
echo "xfce4-session" >> /etc/skel/.Xsession && \
85+
echo "#!/bin/sh" > /usr/bin/start-pulseaudio-x11 && \
86+
echo "pulseaudio -D --enable-memfd=True" >> /usr/bin/start-pulseaudio-x11 && \
87+
echo "xfce4-session" >> /etc/skel/.Xclients && \
9488
cp -r /etc/ssh /ssh_orig && \
9589
rm -rf /etc/ssh/* && \
9690
rm -rf /etc/xrdp/rsakeys.ini /etc/xrdp/*.pem && \

0 commit comments

Comments
 (0)