crichardson/docker-xubuntu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added bash-completion and small fixes

Browse Source
This commit is contained in:
Héctor Molinero Fernández
2019-06-16 15:03:00 +02:00
parent 996c007105
commit ec0bfbcc56
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Dockerfile.m4
View File

@@ -21,6 +21,8 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
autoconf \ autoconf \
automake \ automake \
bash \
bash-completion \
bison \ bison \
build-essential \ build-essential \
ca-certificates \ ca-certificates \
@@ -162,18 +164,18 @@ RUN checkinstall --default --pkgname=xorgxrdp --pkgversion=0 --pkgrelease=0
# Build XRDP PulseAudio module # Build XRDP PulseAudio module
ARG XRDP_PULSEAUDIO_TREEISH=v0.3 ARG XRDP_PULSEAUDIO_TREEISH=v0.3
ARG XRDP_PULSEAUDIO_REMOTE=https://github.com/neutrinolabs/pulseaudio-module-xrdp.git ARG XRDP_PULSEAUDIO_REMOTE=https://github.com/neutrinolabs/pulseaudio-module-xrdp.git
WORKDIR /tmp/
RUN apt-get update
RUN apt-get build-dep -y pulseaudio
RUN apt-get source pulseaudio && mv ./pulseaudio-*/ ./pulseaudio/
WORKDIR /tmp/pulseaudio/
RUN ./configure
WORKDIR /tmp/xrdp-pulseaudio/ WORKDIR /tmp/xrdp-pulseaudio/
RUN git clone "${XRDP_PULSEAUDIO_REMOTE}" ./ RUN git clone "${XRDP_PULSEAUDIO_REMOTE}" ./
RUN git checkout "${XRDP_PULSEAUDIO_TREEISH}" RUN git checkout "${XRDP_PULSEAUDIO_TREEISH}"
RUN git submodule update --init --recursive RUN git submodule update --init --recursive
RUN apt-get update
RUN apt-get build-dep -y pulseaudio
RUN apt-get source pulseaudio
WORKDIR ./pulseaudio-11.1/
RUN ./configure
WORKDIR ../
RUN ./bootstrap RUN ./bootstrap
RUN ./configure PULSE_DIR="$(pwd)"/pulseaudio-11.1/ RUN ./configure PULSE_DIR=/tmp/pulseaudio/
RUN make -j"$(nproc)" RUN make -j"$(nproc)"
RUN checkinstall --default --pkgname=xrdp-pulseaudio --pkgversion=0 --pkgrelease=0 RUN checkinstall --default --pkgname=xrdp-pulseaudio --pkgversion=0 --pkgrelease=0
@@ -195,6 +197,7 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
apt-utils \ apt-utils \
atril \ atril \
bash \ bash \
bash-completion \
ca-certificates \ ca-certificates \
curl \ curl \
dbus \ dbus \
@@ -202,6 +205,7 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
desktop-file-utils \ desktop-file-utils \
dialog \ dialog \
engrampa \ engrampa \
exo-utils \
file \ file \
firefox \ firefox \
fonts-dejavu \ fonts-dejavu \
@@ -221,6 +225,7 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
libavcodec-extra \ libavcodec-extra \
libcanberra-gtk-module \ libcanberra-gtk-module \
libcanberra-gtk3-module \ libcanberra-gtk3-module \
libexo-1-0 \
libfdk-aac1 \ libfdk-aac1 \
libgl1-mesa-dri \ libgl1-mesa-dri \
libgl1-mesa-glx \ libgl1-mesa-glx \