LAB-linuxserver/docker-baseimage-rdesktop
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-baseimage-rdesktop.git synced 2026-02-20 08:39:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from linuxserver/improvements-bionic

Browse Source 
add compose, key generation, and ssh client to base
This commit is contained in:
aptalca 2021-04-25 00:06:39 -04:00 committed by GitHub
commit b7dec8f4f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -48,6 +48,9 @@ RUN \
debuild -b -uc -us && \
cp -ax ../xrdp_*.deb /buildout/xrdp.deb
# docker compose
FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose
# runtime stage
FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
@ -59,6 +62,7 @@ LABEL maintainer="thelamer"
# copy over libs and installers from build stage
COPY --from=buildstage /buildout/ /
COPY --from=compose /usr/local/bin/docker-compose /usr/local/bin/docker-compose
RUN \
echo "**** install deps ****" && \
@ -77,6 +81,7 @@ RUN \
libxfixes3 \
libxml2 \
libxrandr2 \
openssh-client \
pulseaudio \
software-properties-common \
sudo \

5
Dockerfile.aarch64
View File

@ -48,6 +48,9 @@ RUN \
debuild -b -uc -us && \
cp -ax ../xrdp_*.deb /buildout/xrdp.deb
# docker compose
FROM ghcr.io/linuxserver/docker-compose:arm64v8-latest as compose
# runtime stage
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
@ -59,6 +62,7 @@ LABEL maintainer="thelamer"
# copy over libs and installers from build stage
COPY --from=buildstage /buildout/ /
COPY --from=compose /usr/local/bin/docker-compose /usr/local/bin/docker-compose
RUN \
echo "**** install deps ****" && \
@ -77,6 +81,7 @@ RUN \
libxfixes3 \
libxml2 \
libxrandr2 \
openssh-client \
pulseaudio \
software-properties-common \
sudo \

5
Dockerfile.armhf
View File

@ -48,6 +48,9 @@ RUN \
debuild -b -uc -us && \
cp -ax ../xrdp_*.deb /buildout/xrdp.deb
# docker compose
FROM ghcr.io/linuxserver/docker-compose:arm32v7-latest as compose
# runtime stage
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
@ -59,6 +62,7 @@ LABEL maintainer="thelamer"
# copy over libs and installers from build stage
COPY --from=buildstage /buildout/ /
COPY --from=compose /usr/local/bin/docker-compose /usr/local/bin/docker-compose
RUN \
echo "**** install deps ****" && \
@ -77,6 +81,7 @@ RUN \
libxfixes3 \
libxml2 \
libxrandr2 \
openssh-client \
pulseaudio \
software-properties-common \
sudo \

12
root/etc/cont-init.d/13-keygen Normal file
View File

@ -0,0 +1,12 @@
#!/usr/bin/with-contenv bash
if [ ! -f "/keylock" ]; then
cd /etc/xrdp
xrdp-keygen xrdp
rm -f /etc/xrdp/*.pem
openssl req -x509 -nodes -days 3650 -newkey rsa:2048 \
-keyout /etc/xrdp/key.pem \
-out /etc/xrdp/cert.pem \
-subj "/C=US/ST=CA/L=Carlsbad/O=Linuxserver.io/OU=LSIO Server/CN=*"
touch /keylock
fi