From abaa9ca6748d574c1e8e5bf04d613985d638e53b Mon Sep 17 00:00:00 2001 From: thespad Date: Sat, 23 Aug 2025 17:03:22 +0100 Subject: [PATCH 1/2] Remove old compose injection --- .editorconfig | 0 .github/CONTRIBUTING.md | 0 .github/ISSUE_TEMPLATE/config.yml | 0 .github/ISSUE_TEMPLATE/issue.bug.yml | 0 .github/ISSUE_TEMPLATE/issue.feature.yml | 0 .github/workflows/greetings.yml | 0 .github/workflows/permissions.yml | 0 Dockerfile | 15 +++++---------- Dockerfile.aarch64 | 17 ++++++----------- README.md | 4 ---- readme-vars.yml | 4 ---- 11 files changed, 11 insertions(+), 29 deletions(-) mode change 100755 => 100644 .editorconfig mode change 100755 => 100644 .github/CONTRIBUTING.md mode change 100755 => 100644 .github/ISSUE_TEMPLATE/config.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.bug.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.feature.yml mode change 100755 => 100644 .github/workflows/greetings.yml mode change 100755 => 100644 .github/workflows/permissions.yml diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml old mode 100755 new mode 100644 diff --git a/Dockerfile b/Dockerfile index 332ae91..ca0fdfa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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' \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 665e86d..1c62862 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -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' \ diff --git a/README.md b/README.md index 72ba76d..65aa9be 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/readme-vars.yml b/readme-vars.yml index 1b8029a..4ace51b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -41,10 +41,6 @@ full_custom_readme: | | Distro | Current Tag | | :----: | --- | - | Alpine | alpine320 | - | Arch | arch | - | Debian | debianbookworm | - | Fedora | fedora40 | | Ubuntu | ubuntunoble | # PRoot Apps From c3864bdd1e6f8639a8458d699c78f6c1d883be66 Mon Sep 17 00:00:00 2001 From: thespad Date: Sat, 23 Aug 2025 18:07:14 +0100 Subject: [PATCH 2/2] Fix stupid package typo --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ca0fdfa..0365706 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,7 +79,7 @@ RUN \ apt-transport-https \ ca-certificates \ dbus-x11 \ - docker-ce-cli && \ + docker-ce-cli \ docker-compose-plugin \ fonts-noto-color-emoji \ fonts-noto-core \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1c62862..c3065e0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -79,7 +79,7 @@ RUN \ apt-transport-https \ ca-certificates \ dbus-x11 \ - docker-ce-cli && \ + docker-ce-cli \ docker-compose-plugin \ fonts-noto-color-emoji \ fonts-noto-core \