From 31c793a2079a5a85bdd9de4129b22bde60eb0cc2 Mon Sep 17 00:00:00 2001 From: Michael Trip Date: Tue, 21 Oct 2025 08:49:52 +0200 Subject: [PATCH] removing old versions of unmaintained desktops --- .github/workflows/debian-mate-build.yml | 4 +- .../workflows/fedora-mate-build-aarch64.yml | 88 ----------- .github/workflows/fedora-mate-build.yml | 88 ----------- .github/workflows/fedora-xfce-build.yml | 138 ------------------ .github/workflows/ubuntu-xfce-build.yml | 79 ---------- .vscode/settings.json | 3 - mate/Dockerfile | 78 ---------- mate/Dockerfile.aarch64 | 67 --------- mate/root/etc/cont-init.d/60-create-user | 37 ----- mate/usr/bin/exo-open | 7 - mate/usr/local/bin/wrapped-chromium | 10 -- ubuntu-xfce/Dockerfile | 64 -------- .../root/etc/cont-init.d/60-create-user | 37 ----- xfce/Dockerfile | 68 --------- xfce/root/etc/cont-init.d/60-create-user | 37 ----- xfce/usr/bin/exo-open | 7 - xfce/usr/local/bin/wrapped-chromium | 10 -- 17 files changed, 2 insertions(+), 820 deletions(-) delete mode 100644 .github/workflows/fedora-mate-build-aarch64.yml delete mode 100644 .github/workflows/fedora-mate-build.yml delete mode 100644 .github/workflows/fedora-xfce-build.yml delete mode 100644 .github/workflows/ubuntu-xfce-build.yml delete mode 100644 .vscode/settings.json delete mode 100644 mate/Dockerfile delete mode 100644 mate/Dockerfile.aarch64 delete mode 100755 mate/root/etc/cont-init.d/60-create-user delete mode 100755 mate/usr/bin/exo-open delete mode 100755 mate/usr/local/bin/wrapped-chromium delete mode 100644 ubuntu-xfce/Dockerfile delete mode 100755 ubuntu-xfce/root/etc/cont-init.d/60-create-user delete mode 100644 xfce/Dockerfile delete mode 100755 xfce/root/etc/cont-init.d/60-create-user delete mode 100755 xfce/usr/bin/exo-open delete mode 100755 xfce/usr/local/bin/wrapped-chromium diff --git a/.github/workflows/debian-mate-build.yml b/.github/workflows/debian-mate-build.yml index 1ce61ff..2dd72f1 100644 --- a/.github/workflows/debian-mate-build.yml +++ b/.github/workflows/debian-mate-build.yml @@ -1,4 +1,4 @@ -name: Ubuntu MATE build +name: Debian MATE build # This workflow uses actions that are not certified by GitHub. # They are provided by a third-party and are governed by @@ -12,7 +12,7 @@ on: branches: [ "main" ] paths: - "debian-mate/Dockerfile" - - ".github/workflows/ubuntu-mate-build.yml" + - ".github/workflows/debian-mate-build.yml" # Publish semver tags as releases. tags: [ 'v*.*.*' ] pull_request: diff --git a/.github/workflows/fedora-mate-build-aarch64.yml b/.github/workflows/fedora-mate-build-aarch64.yml deleted file mode 100644 index 04d6333..0000000 --- a/.github/workflows/fedora-mate-build-aarch64.yml +++ /dev/null @@ -1,88 +0,0 @@ -name: Fedora MATE build aarch64 - -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -on: - schedule: - - cron: '0 3 * * *' - push: - branches: [ "main" ] - paths: - - "mate/Dockerfile.aarch64" - - ".github/workflows/fedora-mate-build-aarch64.yml" - # Publish semver tags as releases. - tags: [ 'v*.*.*' ] - pull_request: - branches: [ "main" ] - -env: - # Use docker.io for Docker Hub if empty - REGISTRY: ghcr.io - # github.repository as / - IMAGE_NAME: ${{ github.repository }}/containerdesk-mate-aarch64 - -jobs: - - - build_mate: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - # This is used to complete the identity challenge - # with sigstore/fulcio when running outside of PRs. - id-token: write - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - # Workaround: https://github.com/docker/build-push-action/issues/461 - - name: Setup Docker buildx - uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf - - # Login against a Docker registry except on PR - # https://github.com/docker/login-action - - name: Log into registry ${{ env.REGISTRY }} - if: github.event_name != 'pull_request' - uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - # Extract metadata (tags, labels) for Docker - # https://github.com/docker/metadata-action - - name: Extract Docker metadata - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - # Build and push Docker image with Buildx (don't push on PR) - # https://github.com/docker/build-push-action - - name: Build and push Docker image - id: build-and-push - uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a - with: - context: ./mate - file: ./mate/Dockerfile.aarch64 - platforms: linux/arm64 - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max - - # keepalive-job: - # name: Keepalive Workflow - # runs-on: ubuntu-latest - # permissions: - # actions: write - # steps: - # - uses: actions/checkout@v4 - # - uses: liskin/gh-workflow-keepalive@v1 diff --git a/.github/workflows/fedora-mate-build.yml b/.github/workflows/fedora-mate-build.yml deleted file mode 100644 index c3da639..0000000 --- a/.github/workflows/fedora-mate-build.yml +++ /dev/null @@ -1,88 +0,0 @@ -name: Fedora MATE build - -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -on: - schedule: - - cron: '0 3 * * *' - push: - branches: [ "main" ] - paths: - - "mate/Dockerfile" - - ".github/workflows/fedora-mate-build.yml" - # Publish semver tags as releases. - tags: [ 'v*.*.*' ] - pull_request: - branches: [ "main" ] - -env: - # Use docker.io for Docker Hub if empty - REGISTRY: ghcr.io - # github.repository as / - IMAGE_NAME: ${{ github.repository }}/containerdesk-mate - -jobs: - - - build_mate: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - # This is used to complete the identity challenge - # with sigstore/fulcio when running outside of PRs. - id-token: write - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - # Workaround: https://github.com/docker/build-push-action/issues/461 - - name: Setup Docker buildx - uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf - - # Login against a Docker registry except on PR - # https://github.com/docker/login-action - - name: Log into registry ${{ env.REGISTRY }} - if: github.event_name != 'pull_request' - uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - # Extract metadata (tags, labels) for Docker - # https://github.com/docker/metadata-action - - name: Extract Docker metadata - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - # Build and push Docker image with Buildx (don't push on PR) - # https://github.com/docker/build-push-action - - name: Build and push Docker image - id: build-and-push - uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a - with: - context: ./mate - file: ./mate/Dockerfile - platforms: linux/amd64 - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max - - # keepalive-job: - # name: Keepalive Workflow - # runs-on: ubuntu-latest - # permissions: - # actions: write - # steps: - # - uses: actions/checkout@v4 - # - uses: liskin/gh-workflow-keepalive@v1 diff --git a/.github/workflows/fedora-xfce-build.yml b/.github/workflows/fedora-xfce-build.yml deleted file mode 100644 index cb21624..0000000 --- a/.github/workflows/fedora-xfce-build.yml +++ /dev/null @@ -1,138 +0,0 @@ -name: Fedora XFCE build - -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -on: - schedule: - - cron: '0 3 * * *' - push: - branches: [ "main" ] - # Publish semver tags as releases. - tags: [ 'v*.*.*' ] - paths: - - "xfce/Dockerfile" - - ".github/workflows/fedora-xfce-build.yml" - pull_request: - branches: [ "main" ] - -env: - # Use docker.io for Docker Hub if empty - REGISTRY: ghcr.io - # github.repository as / - IMAGE_NAME: ${{ github.repository }}/containerdesk-xfce - -jobs: - - # build_mate: - - # runs-on: ubuntu-latest - # permissions: - # contents: read - # packages: write - # # This is used to complete the identity challenge - # # with sigstore/fulcio when running outside of PRs. - # id-token: write - - # steps: - # - name: Checkout repository - # uses: actions/checkout@v3 - - # # Workaround: https://github.com/docker/build-push-action/issues/461 - # - name: Setup Docker buildx - # uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf - - # # Login against a Docker registry except on PR - # # https://github.com/docker/login-action - # - name: Log into registry ${{ env.REGISTRY }} - # if: github.event_name != 'pull_request' - # uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c - # with: - # registry: ${{ env.REGISTRY }} - # username: ${{ github.actor }} - # password: ${{ secrets.GITHUB_TOKEN }} - - # # Extract metadata (tags, labels) for Docker - # # https://github.com/docker/metadata-action - # - name: Extract Docker metadata - # id: meta - # uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - # with: - # images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - # # Build and push Docker image with Buildx (don't push on PR) - # # https://github.com/docker/build-push-action - # - name: Build and push Docker image - # id: build-and-push - # uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a - # with: - # context: ./mate - # file: ./mate/Dockerfile - # platforms: linux/arm64,linux/amd64 - # push: ${{ github.event_name != 'pull_request' }} - # tags: ${{ steps.meta.outputs.tags }}-mate - # labels: ${{ steps.meta.outputs.labels }} - # cache-from: type=gha - # cache-to: type=gha,mode=max - - build_xfce: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - # This is used to complete the identity challenge - # with sigstore/fulcio when running outside of PRs. - id-token: write - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - # Workaround: https://github.com/docker/build-push-action/issues/461 - - name: Setup Docker buildx - uses: docker/setup-buildx-action@v2 - - # Login against a Docker registry except on PR - # https://github.com/docker/login-action - - name: Log into registry ${{ env.REGISTRY }} - if: github.event_name != 'pull_request' - uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - # Extract metadata (tags, labels) for Docker - # https://github.com/docker/metadata-action - - name: Extract Docker metadata - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - # Build and push Docker image with Buildx (don't push on PR) - # https://github.com/docker/build-push-action - - name: Build and push Docker image - id: build-and-push - uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a - with: - context: ./xfce - file: ./xfce/Dockerfile - platforms: linux/amd64 - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max - - # keepalive-job: - # name: Keepalive Workflow - # runs-on: ubuntu-latest - # permissions: - # actions: write - # steps: - # - uses: actions/checkout@v4 - # - uses: liskin/gh-workflow-keepalive@v1 diff --git a/.github/workflows/ubuntu-xfce-build.yml b/.github/workflows/ubuntu-xfce-build.yml deleted file mode 100644 index d6b4b1a..0000000 --- a/.github/workflows/ubuntu-xfce-build.yml +++ /dev/null @@ -1,79 +0,0 @@ -name: Ubuntu MATE build - -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -on: - schedule: - - cron: '0 3 * * *' - push: - branches: [ "main" ] - paths: - - "ubuntu-xfce/Dockerfile" - - ".github/workflows/ubuntu-xfce-build.yml" - # Publish semver tags as releases. - tags: [ 'v*.*.*' ] - pull_request: - branches: [ "main" ] - -env: - # Use docker.io for Docker Hub if empty - REGISTRY: ghcr.io - # github.repository as / - IMAGE_NAME: ${{ github.repository }}/containerdesk-ubuntu-xfce - - -jobs: - - build_xfce: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - # This is used to complete the identity challenge - # with sigstore/fulcio when running outside of PRs. - id-token: write - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - # Workaround: https://github.com/docker/build-push-action/issues/461 - - name: Setup Docker buildx - uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf - - # Login against a Docker registry except on PR - # https://github.com/docker/login-action - - name: Log into registry ${{ env.REGISTRY }} - if: github.event_name != 'pull_request' - uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - # Extract metadata (tags, labels) for Docker - # https://github.com/docker/metadata-action - - name: Extract Docker metadata - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - # Build and push Docker image with Buildx (don't push on PR) - # https://github.com/docker/build-push-action - - name: Build and push Docker image - id: build-and-push - uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a - with: - context: ./ubuntu-xfce - file: ./ubuntu-xfce/Dockerfile - platforms: linux/amd64 - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 9d14cfb..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "ansible.python.interpreterPath": "/bin/python" -} \ No newline at end of file diff --git a/mate/Dockerfile b/mate/Dockerfile deleted file mode 100644 index 82766d5..0000000 --- a/mate/Dockerfile +++ /dev/null @@ -1,78 +0,0 @@ -FROM ghcr.io/linuxserver/rdesktop:fedora-mate - -# set version label -ARG BUILD_DATE -ARG VERSION -ARG TARGETARCH -ARG SEABIRD_VERSION=0.6.0 -ARG K9S_VERSION=0.50.9 -LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="Michael Trip" -WORKDIR /tmp - -RUN dnf install -y wget curl -RUN \ - case ${TARGETARCH} in \ - "amd64") DOWNLOAD_ARCH=linux-amd64 ;; \ - "arm64") DOWNLOAD_ARCH=linux-arm64 ;; \ - esac \ - && curl -L https://github.com/freelensapp/freelens/releases/download/v1.5.3/Freelens-1.5.3-${DOWNLOAD_ARCH}.rpm --output /tmp/freelens.rpm - -RUN curl -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz -RUN curl -L https://github.com/getseabird/seabird/releases/download/v${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.tar.gz - -RUN echo "**** import Microsoft GPG key ****" \ - && rpm --import https://packages.microsoft.com/keys/microsoft.asc - -RUN echo "**** add VS Code repo ****" \ - && echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/yum.repos.d/vscode.repo - -RUN echo "**** install packages ****" \ - && dnf install -y --setopt=install_weak_deps=False --best \ - terminator \ - tilix \ - caja \ - caja-sendto \ - caja-actions \ - caja-schemas \ - kubernetes-client \ - libreoffice \ - pluma \ - neofetch \ - adwaita-gtk2-theme \ - adwaita-icon-theme \ - papirus-icon-theme \ - pop-gtk2-theme \ - pop-gtk3-theme \ - gtksourceview5 \ - libvterm \ - vte291-gtk4 \ - thunderbird \ - firefox \ - code - -RUN echo "**** install freelens ****" \ - && dnf localinstall -y /tmp/freelens.rpm - -RUN echo "**** extract k9s ****" \ - && tar -zxvf /tmp/k9s.tar.gz - -RUN echo "**** extract seabird ****" \ - && tar -zxvf /tmp/seabird.tar.gz - -RUN echo "**** move k9s and seabird to /usr/local/bin ****" \ - && mv /tmp/k9s /usr/local/bin \ - && mv /tmp/seabird /usr/local/bin - -RUN echo "**** cleanup ****" \ - && dnf autoremove -y \ - && dnf clean all \ - && rm -rf /config/.cache /tmp/* - -# add local files -COPY /root / - -# ports and volumes -EXPOSE 3389 -VOLUME /home -VOLUME /config diff --git a/mate/Dockerfile.aarch64 b/mate/Dockerfile.aarch64 deleted file mode 100644 index 3bd9a6f..0000000 --- a/mate/Dockerfile.aarch64 +++ /dev/null @@ -1,67 +0,0 @@ -FROM ghcr.io/linuxserver/rdesktop:arm64v8-fedora-mate - -# set version label -ARG BUILD_DATE -ARG VERSION -ARG TARGETARCH -ARG SEABIRD_VERSION=0.5.1 -ARG K9S_VERSION=0.32.5 - -LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="Michael Trip" -WORKDIR /tmp - -RUN dnf install -y wget curl -# RUN \ - # case ${TARGETARCH} in \ - # "amd64") DOWNLOAD_ARCH=x86_64 ;; \ - # "arm64") DOWNLOAD_ARCH=aarch64 ;; \ - # esac \ - # && curl -L https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.${DOWNLOAD_ARCH}.rpm --output /tmp/openlens.rpm -# -RUN curl -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz -RUN curl -L https://github.com/getseabird/seabird/releases/download/v${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.tar.gz -RUN \ - echo "**** install packages ****" && \ - rpm --import https://packages.microsoft.com/keys/microsoft.asc && \ - echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/yum.repos.d/vscode.repo && \ - dnf install -y --setopt=install_weak_deps=False --best \ - terminator \ - caja \ - caja-sendto \ - caja-actions \ - caja-schemas \ - tilix \ - kubernetes-client \ - libreoffice \ - pluma \ - neofetch \ - adwaita-gtk2-theme \ - adwaita-icon-theme \ - papirus-icon-theme \ - pop-gtk2-theme \ - pop-gtk3-theme \ - gtksourceview5 \ - libvterm \ - vte291-gtk4 \ - thunderbird \ - firefox \ - code && \ - # dnf localinstall -y /tmp/openlens.rpm && \ - tar -zxvf /tmp/k9s.tar.gz && \ - tar -zxvf /tmp/seabird.tar.gz && \ - mv /tmp/k9s /usr/local/bin && \ - echo "**** cleanup ****" && \ - dnf autoremove -y && \ - dnf clean all && \ - rm -rf \ - /config/.cache \ - /tmp/* - -# add local files -COPY /root / - -# ports and volumes -EXPOSE 3389 -VOLUME /home -VOLUME /config diff --git a/mate/root/etc/cont-init.d/60-create-user b/mate/root/etc/cont-init.d/60-create-user deleted file mode 100755 index ec7405b..0000000 --- a/mate/root/etc/cont-init.d/60-create-user +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/with-contenv bash - - -echo "**** create ${USERNAME} user and make our folders ****" && \ -useradd -u 912 -U -d /home/${USERNAME} -s /bin/bash ${USERNAME} -usermod -G users,wheel ${USERNAME} -echo "${USERNAME}:${PASSWORD}" | chpasswd -mkdir -p /home/${USERNAME} -chown -R ${USERNAME}:${USERNAME} /home/${USERNAME} - -chmod 755 /etc -chmod 755 /etc/xrdp -chmod 755 /etc/xrdp/sesman.ini - -touch /home/${USERNAME}/lock.file - -# create .config dir -[[ ! -d /home/${USERNAME}/.config ]] && \ - mkdir -p /home/${USERNAME}/.config - - -cp /defaults/startwm.sh /home/${USERNAME}/startwm.sh -chmod +x /home/${USERNAME}/startwm.sh -chown -R ${USERNAME}:${USERAME} /home/${USERNAME} - -# permissions -PERM=$(stat -c '%U' /home/${USERNAME}/.config) -[[ "${PERM}" != "${USERNAME}" ]] && \ - chown -R ${USERNAME}:${USERNAME} /home/${USERNAME} - - -# set random password for abc user to prevent it from connecting - -RANDOM_PASS=`tr -dc A-Za-z0-9 packages.microsoft.gpg -RUN cp packages.microsoft.gpg /etc/apt/keyrings -RUN echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" > /etc/apt/sources.list.d/vscode.list -RUN DEBIAN_FRONTEND=noninteractive apt-get install apt-transport-https -y -RUN apt-get update -RUN DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ - vim \ - neofetch \ - libreoffice \ - thunderbird \ - pluma \ - tilix \ - terminator \ - code \ -# xfce4-themes - xdg-utils -RUN apt-get install -y /tmp/freelens.deb -RUN tar -zxvf /tmp/k9s.tar.gz -RUN tar -zxvf /tmp/seabird.tar.gz -RUN tar -zxvf /tmp/helm.tar.gz -RUN mv linux-${TARGETARCH}/helm /usr/local/bin/helm -RUN mv /tmp/k9s /usr/local/bin -RUN mv /tmp/seabird /usr/local/bin -RUN echo "**** cleanup ****" -RUN apt-get autoclean -RUN rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/* - -COPY /root / - -# ports and volumes -EXPOSE 3389 -VOLUME /home -VOLUME /config diff --git a/ubuntu-xfce/root/etc/cont-init.d/60-create-user b/ubuntu-xfce/root/etc/cont-init.d/60-create-user deleted file mode 100755 index 89b2aff..0000000 --- a/ubuntu-xfce/root/etc/cont-init.d/60-create-user +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/with-contenv bash - - -echo "**** create ${USERNAME} user and make our folders ****" && \ -useradd -u 912 -U -d /home/${USERNAME} -s /bin/bash ${USERNAME} -usermod -G users,sudo ${USERNAME} -echo "${USERNAME}:${PASSWORD}" | chpasswd -mkdir -p /home/${USERNAME} -chown -R ${USERNAME}:${USERNAME} /home/${USERNAME} - -chmod 755 /etc -chmod 755 /etc/xrdp -chmod 755 /etc/xrdp/sesman.ini - -touch /home/${USERNAME}/lock.file - -# create .config dir -[[ ! -d /home/${USERNAME}/.config ]] && \ - mkdir -p /home/${USERNAME}/.config - - -cp /defaults/startwm.sh /home/${USERNAME}/startwm.sh -chmod +x /home/${USERNAME}/startwm.sh -chown -R ${USERNAME}:${USERAME} /home/${USERNAME} - -# permissions -PERM=$(stat -c '%U' /home/${USERNAME}/.config) -[[ "${PERM}" != "${USERNAME}" ]] && \ - chown -R ${USERNAME}:${USERNAME} /home/${USERNAME} - - -# set random password for abc user to prevent it from connecting - -RANDOM_PASS=`tr -dc A-Za-z0-9 /etc/yum.repos.d/vscode.repo && \ - dnf install -y --setopt=install_weak_deps=False --best \ - terminator \ - tilix \ - kubernetes-client \ - libreoffice \ - pluma \ - neofetch \ - adwaita-gtk2-theme \ - adwaita-icon-theme \ - papirus-icon-theme \ - pop-gtk2-theme \ - pop-gtk3-theme \ - gtksourceview5 \ - libvterm \ - vte291-gtk4 \ - thunderbird \ - firefox \ - code && \ - dnf localinstall -y /tmp/openlens.rpm && \ - tar -zxvf /tmp/k9s.tar.gz && \ - tar -zxvf /tmp/seabird.tar.gz && \ - mv /tmp/k9s /usr/local/bin && \ - mv /tmp/seabird /usr/local/bin && \ - echo "**** cleanup ****" && \ - dnf autoremove -y && \ - dnf clean all && \ - rm -rf \ - /config/.cache \ - /tmp/* -# Remove this due to errors -RUN dnf -y remove xfce4-power-manager && rm -rf /etc/xdg/autostart/xfce-polkit.desktop && dnf clean all - - -# add local files -COPY /root / - - -# ports and volumes -EXPOSE 3389 -VOLUME /home -VOLUME /config diff --git a/xfce/root/etc/cont-init.d/60-create-user b/xfce/root/etc/cont-init.d/60-create-user deleted file mode 100755 index ec7405b..0000000 --- a/xfce/root/etc/cont-init.d/60-create-user +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/with-contenv bash - - -echo "**** create ${USERNAME} user and make our folders ****" && \ -useradd -u 912 -U -d /home/${USERNAME} -s /bin/bash ${USERNAME} -usermod -G users,wheel ${USERNAME} -echo "${USERNAME}:${PASSWORD}" | chpasswd -mkdir -p /home/${USERNAME} -chown -R ${USERNAME}:${USERNAME} /home/${USERNAME} - -chmod 755 /etc -chmod 755 /etc/xrdp -chmod 755 /etc/xrdp/sesman.ini - -touch /home/${USERNAME}/lock.file - -# create .config dir -[[ ! -d /home/${USERNAME}/.config ]] && \ - mkdir -p /home/${USERNAME}/.config - - -cp /defaults/startwm.sh /home/${USERNAME}/startwm.sh -chmod +x /home/${USERNAME}/startwm.sh -chown -R ${USERNAME}:${USERAME} /home/${USERNAME} - -# permissions -PERM=$(stat -c '%U' /home/${USERNAME}/.config) -[[ "${PERM}" != "${USERNAME}" ]] && \ - chown -R ${USERNAME}:${USERNAME} /home/${USERNAME} - - -# set random password for abc user to prevent it from connecting - -RANDOM_PASS=`tr -dc A-Za-z0-9