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

Remove old compose injection

Browse Source
This commit is contained in:
thespad 2025-08-23 17:03:22 +01:00
parent 94927f7ed5
commit abaa9ca674
No known key found for this signature in database
11 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.editorconfig Executable file → Normal file
View File

0
.github/CONTRIBUTING.md vendored Executable file → Normal file
View File

0
.github/ISSUE_TEMPLATE/config.yml vendored Executable file → Normal file
View File

0
.github/ISSUE_TEMPLATE/issue.bug.yml vendored Executable file → Normal file
View File

0
.github/ISSUE_TEMPLATE/issue.feature.yml vendored Executable file → Normal file
View File

0
.github/workflows/greetings.yml vendored Executable file → Normal file
View File

0
.github/workflows/permissions.yml vendored Executable file → Normal file
View File

15
Dockerfile
View File

@ -47,9 +47,6 @@ 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:noble
@ -61,7 +58,6 @@ 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
#Add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker
ENV NVIDIA_DRIVER_CAPABILITIES=all \
@ -72,6 +68,9 @@ RUN \
sed -i \
'/locale/d' \
/etc/dpkg/dpkg.cfg.d/excludes && \
echo "**** add docker repos ****" && \
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | tee /usr/share/keyrings/docker.asc >/dev/null && \
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker.asc] https://download.docker.com/linux/ubuntu noble stable" > /etc/apt/sources.list.d/docker.list && \
echo "**** install deps ****" && \
ldconfig && \
apt-get update && \
@ -80,6 +79,8 @@ RUN \
apt-transport-https \
ca-certificates \
dbus-x11 \
docker-ce-cli && \
docker-compose-plugin \
fonts-noto-color-emoji \
fonts-noto-core \
gawk \
@ -115,12 +116,6 @@ RUN \
zlib1g && \
dpkg -i /xrdp.deb && \
rm /xrdp.deb && \
echo "**** install docker ****" && \
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | tee /usr/share/keyrings/docker.asc >/dev/null && \
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker.asc] https://download.docker.com/linux/ubuntu noble stable" > /etc/apt/sources.list.d/docker.list && \
apt-get update && \
apt-get install -y --no-install-recommends \
docker-ce-cli && \
echo "**** openbox tweaks ****" && \
sed -i \
-e 's/NLIMC/NLMC/g' \

17
Dockerfile.aarch64
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble as buildstage
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble AS buildstage
ARG XRDP_PULSE_VERSION=v0.7
ARG DEBIAN_FRONTEND="noninteractive"
@ -47,9 +47,6 @@ 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-noble
@ -61,7 +58,6 @@ 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
#Add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker
ENV NVIDIA_DRIVER_CAPABILITIES=all \
@ -72,6 +68,9 @@ RUN \
sed -i \
'/locale/d' \
/etc/dpkg/dpkg.cfg.d/excludes && \
echo "**** add docker repos ****" && \
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | tee /usr/share/keyrings/docker.asc >/dev/null && \
echo "deb [arch=arm64 signed-by=/usr/share/keyrings/docker.asc] https://download.docker.com/linux/ubuntu noble stable" > /etc/apt/sources.list.d/docker.list && \
echo "**** install deps ****" && \
ldconfig && \
apt-get update && \
@ -80,6 +79,8 @@ RUN \
apt-transport-https \
ca-certificates \
dbus-x11 \
docker-ce-cli && \
docker-compose-plugin \
fonts-noto-color-emoji \
fonts-noto-core \
gawk \
@ -115,12 +116,6 @@ RUN \
zlib1g && \
dpkg -i /xrdp.deb && \
rm /xrdp.deb && \
echo "**** install docker ****" && \
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | tee /usr/share/keyrings/docker.asc >/dev/null && \
echo "deb [arch=arm64 signed-by=/usr/share/keyrings/docker.asc] https://download.docker.com/linux/ubuntu noble stable" > /etc/apt/sources.list.d/docker.list && \
apt-get update && \
apt-get install -y --no-install-recommends \
docker-ce-cli && \
echo "**** openbox tweaks ****" && \
sed -i \
-e 's/NLIMC/NLMC/g' \

4
README.md
View File

@ -37,10 +37,6 @@ All base images are built for x86_64 and aarch64 platforms.
| Distro | Current Tag |
| :----: | --- |
| Alpine | alpine320 |
| Arch | arch |
| Debian | debianbookworm |
| Fedora | fedora40 |
| Ubuntu | ubuntunoble |
# PRoot Apps

4
readme-vars.yml
View File

@ -41,10 +41,6 @@ full_custom_readme: |
| Distro | Current Tag |
| :----: | --- |
| Alpine | alpine320 |
| Arch | arch |
| Debian | debianbookworm |
| Fedora | fedora40 |
| Ubuntu | ubuntunoble |
# PRoot Apps