Bot Updating Package Versions

2026-02-20 08:39:58 +08:00 · 2021-11-25 07:36:59 +01:00 · 2021-11-18 07:34:07 +01:00 · 2021-11-11 07:38:13 +01:00 · 2021-11-04 07:34:05 +01:00 · 2021-10-28 08:37:11 +02:00
23 changed files with 1144 additions and 195 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,20 @@
+# This file is globally distributed to all container image projects from
+# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+# trim_trailing_whitespace may cause unintended issues and should not be globally set true
+trim_trailing_whitespace = false
+
+[{Dockerfile*,**.yml}]
+indent_style = space
+indent_size = 2
+
+[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
+indent_style = space
+indent_size = 4
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -0,0 +1,123 @@
+# Contributing to baseimage-rdesktop
+
+## Gotchas
+
+* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
+* Read, and fill the Pull Request template
+  * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
+  * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
+* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
+
+## Common files
+
+| File | Use case |
+| :----: | --- |
+| `Dockerfile` | Dockerfile used to build amd64 images |
+| `Dockerfile.aarch64` | Dockerfile used to build 64bit ARM architectures |
+| `Dockerfile.armhf` | Dockerfile used to build 32bit ARM architectures |
+| `Jenkinsfile` | This file is a product of our builder and should not be edited directly. This is used to build the image |
+| `jenkins-vars.yml` | This file is used to generate the `Jenkinsfile` mentioned above, it only affects the build-process |
+| `package_versions.txt` | This file is generated as a part of the build-process and should not be edited directly. It lists all the installed packages and their versions |
+| `README.md` | This file is a product of our builder and should not be edited directly. This displays the readme for the repository and image registries |
+| `readme-vars.yml` | This file is used to generate the `README.md` |
+
+## Readme
+
+If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-baseimage-rdesktop/edit/bionic/readme-vars.yml).
+
+These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
+Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io)
+
+### Fixing typos or clarify the text in the readme
+
+There are variables for multiple parts of the readme, the most common ones are:
+
+| Variable | Description |
+| :----: | --- |
+| `project_blurb` | This is the short excerpt shown above the project logo. |
+| `app_setup_block` | This is the text that shows up under "Application Setup" if enabled |
+
+### Parameters
+
+The compose and run examples are also generated from these variables.
+
+We have a [reference file](https://github.com/linuxserver/docker-jenkins-builder/blob/master/vars/_container-vars-blank) in our Jenkins Builder.
+
+These are prefixed with `param_` for required parameters, or `opt_param` for optional parameters, except for `cap_add`.
+Remember to enable param, if currently disabled. This differs between parameters, and can be seen in the reference file.
+
+Devices, environment variables, ports and volumes expects its variables in a certain way.
+
+### Devices
+
+```yml
+param_devices:
+  - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
+opt_param_devices:
+  - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
+```
+
+### Environment variables
+
+```yml
+param_env_vars:
+  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
+opt_param_env_vars:
+  - { env_var: "VERSION", env_value: "latest", desc: "Supported values are LATEST, PLEXPASS or a specific version number." }
+```
+
+### Ports
+
+```yml
+param_ports:
+  - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" }
+opt_param_ports:
+  - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" }
+```
+
+### Volumes
+
+```yml
+param_volumes:
+  - { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
+opt_param_volumes:
+  - { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
+```
+
+### Testing template changes
+
+After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/linuxserver/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR.
+
+## Dockerfiles
+
+We use multiple Dockerfiles in our repos, this is because sometimes some CPU architectures needs different packages to work.
+If you are proposing additional packages to be added, ensure that you added the packages to all the Dockerfiles in alphabetical order.
+
+### Testing your changes
+
+```bash
+git clone https://github.com/linuxserver/docker-baseimage-rdesktop.git
+cd docker-baseimage-rdesktop
+docker build \
+  --no-cache \
+  --pull \
+  -t linuxserver/baseimage-rdesktop:latest .
+```
+
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+
+```bash
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
+```
+
+Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
+
+## Update the changelog
+
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-baseimage-rdesktop/tree/bionic/root), add an entry to the changelog
+
+```yml
+changelogs:
+  - { date: "DD.MM.YY:", desc: "Added some love to templates" }
+```
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1 +1,2 @@
+github: linuxserver
 open_collective: linuxserver
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -0,0 +1,13 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Discord chat support
+    url: https://discord.gg/YWrKVTn
+    about: Realtime support / chat with the community and the team.
+
+  - name: Discourse discussion forum
+    url: https://discourse.linuxserver.io
+    about: Post on our community forum.
+
+  - name: Documentation
+    url: https://docs.linuxserver.io
+    about: Documentation - information about all of our containers.
--- a/.github/ISSUE_TEMPLATE/issue.bug.md
+++ b/.github/ISSUE_TEMPLATE/issue.bug.md
@ -1,9 +1,14 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
 [linuxserverurl]: https://linuxserver.io
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]

-If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support.
+<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->

-<!--- Provide a general summary of the issue in the Title above -->
+<!--- Provide a general summary of the bug in the Title above -->

 ------------------------------

@ -22,9 +27,10 @@ If you are new to Docker or this application our issue tracker is **ONLY** used
 4.

 ## Environment
-**OS:**      
-**CPU architecture:** x86_64/arm32/arm64      
-**How docker service was installed:**      
+**OS:**
+**CPU architecture:** x86_64/arm32/arm64
+**How docker service was installed:**
+<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
 <!--- Providing context helps us come up with a solution that is most useful in the real world -->

 ## Command used to create docker container (run/create/compose/screenshot)
--- a/.github/ISSUE_TEMPLATE/issue.feature.md
+++ b/.github/ISSUE_TEMPLATE/issue.feature.md
@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+[linuxserverurl]: https://linuxserver.io
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
+
+<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
+
+<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
+<!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
+
+<!--- Provide a general summary of the request in the Title above -->
+
+------------------------------
+
+## Desired Behavior
+<!--- Tell us what should happen -->
+
+## Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+## Alternatives Considered
+<!--- Tell us what other options you have tried or considered -->
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -2,11 +2,11 @@

 [linuxserverurl]: https://linuxserver.io
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-	
+

 <!--- Before submitting a pull request please check the following -->

-<!---  If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR  --> 
+<!---  If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR  -->
 <!---  Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
 <!---  That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message   -->
 <!---  You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
@ -21,7 +21,11 @@

 ------------------------------

-We welcome all PR’s though this doesn’t guarantee it will be accepted.
+ - [ ] I have read the [contributing](https://github.com/linuxserver/docker-baseimage-rdesktop/blob/bionic/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+
+------------------------------
+
+<!--- We welcome all PR’s though this doesn’t guarantee it will be accepted. -->

 ## Description:
 <!--- Describe your changes in detail -->
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@ -0,0 +1,16 @@
+name: External Trigger Main
+
+on:
+  workflow_dispatch:
+
+jobs:
+  external-trigger-bionic:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.3
+
+      - name: External Trigger
+        if: github.ref == 'refs/heads/bionic'
+        run: |
+          echo "**** No external release, exiting ****"
+          exit 0
--- a/.github/workflows/external_trigger_scheduler.yml
+++ b/.github/workflows/external_trigger_scheduler.yml
@ -0,0 +1,43 @@
+name: External Trigger Scheduler
+
+on:
+  schedule:
+    - cron:  '32 * * * *'
+  workflow_dispatch:
+
+jobs:
+  external-trigger-scheduler:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.3
+        with:
+          fetch-depth: '0'
+
+      - name: External Trigger Scheduler
+        run: |
+          echo "**** Branches found: ****"
+          git for-each-ref --format='%(refname:short)' refs/remotes
+          echo "**** Pulling the yq docker image ****"
+          docker pull ghcr.io/linuxserver/yq
+          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+          do
+            br=$(echo "$br" | sed 's|origin/||g')
+            echo "**** Evaluating branch ${br} ****"
+            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-rdesktop/${br}/jenkins-vars.yml \
+              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
+            if [ "$br" == "$ls_branch" ]; then
+              echo "**** Branch ${br} appears to be live; checking workflow. ****"
+              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-rdesktop/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
+                echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
+                curl -iX POST \
+                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
+                  -H "Accept: application/vnd.github.v3+json" \
+                  -d "{\"ref\":\"refs/heads/${br}\"}" \
+                  https://api.github.com/repos/linuxserver/docker-baseimage-rdesktop/actions/workflows/external_trigger.yml/dispatches
+              else
+                echo "**** Workflow doesn't exist; skipping trigger. ****"
+              fi
+            else
+              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
+            fi
+          done
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@ -0,0 +1,13 @@
+name: Greetings
+
+on: [pull_request_target, issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-baseimage-rdesktop/blob/bionic/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-baseimage-rdesktop/blob/bionic/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-baseimage-rdesktop/blob/bionic/.github/PULL_REQUEST_TEMPLATE.md)!'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/package_trigger.yml
+++ b/.github/workflows/package_trigger.yml
@ -0,0 +1,38 @@
+name: Package Trigger Main
+
+on:
+  workflow_dispatch:
+
+jobs:
+  package-trigger-bionic:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.3
+
+      - name: Package Trigger
+        if: github.ref == 'refs/heads/bionic'
+        run: |
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BASEIMAGE_RDESKTOP_BIONIC }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BASEIMAGE_RDESKTOP_BIONIC is set; skipping trigger. ****"
+            exit 0
+          fi
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-rdesktop/job/bionic/lastBuild/api/json | jq -r '.building') == "true" ]; then
+            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
+            exit 0
+          fi
+          echo "**** Package trigger running off of bionic branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BASEIMAGE_RDESKTOP_BIONIC\". ****"
+          response=$(curl -iX POST \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-rdesktop/job/bionic/buildWithParameters?PACKAGE_CHECK=true \
+            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+          echo "**** Jenkins job queue url: ${response%$'\r'} ****"
+          echo "**** Sleeping 10 seconds until job starts ****"
+          sleep 10
+          buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+          buildurl="${buildurl%$'\r'}"
+          echo "**** Jenkins job build url: ${buildurl} ****"
+          echo "**** Attempting to change the Jenkins job description ****"
+          curl -iX POST \
+            "${buildurl}submitDescription" \
+            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+            --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+            --data-urlencode "Submit=Submit"
--- a/.github/workflows/package_trigger_scheduler.yml
+++ b/.github/workflows/package_trigger_scheduler.yml
@ -0,0 +1,50 @@
+name: Package Trigger Scheduler
+
+on:
+  schedule:
+    - cron:  '04 6 * * 4'
+  workflow_dispatch:
+
+jobs:
+  package-trigger-scheduler:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.3
+        with:
+          fetch-depth: '0'
+
+      - name: Package Trigger Scheduler
+        run: |
+          echo "**** Branches found: ****"
+          git for-each-ref --format='%(refname:short)' refs/remotes
+          echo "**** Pulling the yq docker image ****"
+          docker pull ghcr.io/linuxserver/yq
+          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+          do
+            br=$(echo "$br" | sed 's|origin/||g')
+            echo "**** Evaluating branch ${br} ****"
+            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-rdesktop/${br}/jenkins-vars.yml \
+              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
+            if [ "${br}" == "${ls_branch}" ]; then
+              echo "**** Branch ${br} appears to be live; checking workflow. ****"
+              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-rdesktop/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
+                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
+                triggered_branches="${triggered_branches}${br} "
+                curl -iX POST \
+                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
+                  -H "Accept: application/vnd.github.v3+json" \
+                  -d "{\"ref\":\"refs/heads/${br}\"}" \
+                  https://api.github.com/repos/linuxserver/docker-baseimage-rdesktop/actions/workflows/package_trigger.yml/dispatches
+                sleep 30
+              else
+                echo "**** Workflow doesn't exist; skipping trigger. ****"
+              fi
+            else
+              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
+            fi
+          done
+          echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
+          echo "**** Notifying Discord ****"
+          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+            "description": "**Package Check Build(s) Triggered for baseimage-rdesktop** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-baseimage-rdesktop/activity/"' \n"}],
+            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@ -0,0 +1,23 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v3
+      with:
+        stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
+        stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
+        days-before-stale: 30
+        days-before-close: 365
+        exempt-issue-labels: 'awaiting-approval,work-in-progress'
+        exempt-pr-labels: 'awaiting-approval,work-in-progress'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+.jenkins-external
--- a/10
+++ b/10
@ -1,6 +1,7 @@
-FROM lsiobase/ubuntu:focal as buildstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic as buildstage

 ARG XRDP_PULSE_VERSION=v0.4
+ARG DEBIAN_FRONTEND="noninteractive"

 RUN \
 echo "**** install build deps ****" && \
@ -47,8 +48,11 @@ 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 lsiobase/ubuntu:focal
+FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic

 # set version label
 ARG BUILD_DATE
@ -58,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 ****" && \
@ -76,6 +81,7 @@ RUN \
 	libxfixes3 \
 	libxml2 \
 	libxrandr2 \
+	openssh-client \
 	pulseaudio \
 	software-properties-common \
 	sudo \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -1,6 +1,7 @@
-FROM lsiobase/ubuntu:arm64v8-focal as buildstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic as buildstage

 ARG XRDP_PULSE_VERSION=v0.4
+ARG DEBIAN_FRONTEND="noninteractive"

 RUN \
 echo "**** install build deps ****" && \
@ -47,8 +48,11 @@ 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 lsiobase/ubuntu:arm64v8-focal
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic

 # set version label
 ARG BUILD_DATE
@ -58,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 ****" && \
@ -76,6 +81,7 @@ RUN \
 	libxfixes3 \
 	libxml2 \
 	libxrandr2 \
+	openssh-client \
 	pulseaudio \
 	software-properties-common \
 	sudo \
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@ -1,6 +1,7 @@
-FROM lsiobase/ubuntu:arm32v7-focal as buildstage
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic as buildstage

 ARG XRDP_PULSE_VERSION=v0.4
+ARG DEBIAN_FRONTEND="noninteractive"

 RUN \
 echo "**** install build deps ****" && \
@ -47,8 +48,11 @@ 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 lsiobase/ubuntu:arm32v7-focal
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic

 # set version label
 ARG BUILD_DATE
@ -58,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 ****" && \
@ -76,6 +81,7 @@ RUN \
 	libxfixes3 \
 	libxml2 \
 	libxrandr2 \
+	openssh-client \
 	pulseaudio \
 	software-properties-common \
 	sudo \
@ -91,7 +97,7 @@ RUN \
 rm /xrdp.deb && \
 echo "**** install docker ****" && \
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
- add-apt-repository "deb [arch=arm] https://download.docker.com/linux/ubuntu bionic stable" && \
+ add-apt-repository "deb [arch=armhf] https://download.docker.com/linux/ubuntu bionic stable" && \
 apt-get update && \
 apt-get install -y --no-install-recommends \
 	docker-ce-cli && \
--- a/561
+++ b/561
@ -16,6 +16,7 @@ pipeline {
    GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
    GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
    GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
+    SCARF_TOKEN=credentials('scarf_api_key')
    BUILD_VERSION_ARG = 'XRDP_VERSION'
    LS_USER = 'linuxserver'
    LS_REPO = 'docker-baseimage-rdesktop'
@ -41,7 +42,7 @@ pipeline {
        script{
          env.EXIT_STATUS = ''
          env.LS_RELEASE = sh(
-            script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':focal 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':bionic 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
            returnStdout: true).trim()
          env.LS_RELEASE_NOTES = sh(
            script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@ -55,7 +56,7 @@ pipeline {
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
          env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
        }
        script{
          env.LS_RELEASE_NUMBER = sh(
@ -114,48 +115,69 @@ pipeline {
          env.EXT_RELEASE_CLEAN = sh(
            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
            returnStdout: true).trim()
+
+          env.SEMVER = (new Date()).format('YYYY.MM.dd')
+          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/
+          if (semver.find()) {
+            env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
+          } else {
+            semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/
+            if (semver.find()) {
+              if (semver[0][3]) {
+                env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
+              } else if (!semver[0][3] && !semver[0][4]) {
+                env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${(new Date()).format('YYYYMMdd')}"
+              }
+            }
+          }
+
+          println("SEMVER: ${env.SEMVER}")
        }
      }
    }
-    // If this is a master build use live docker endpoints
+    // If this is a bionic build use live docker endpoints
    stage("Set ENV live build"){
      when {
-        branch "master"
+        branch "bionic"
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
        script{
          env.IMAGE = env.DOCKERHUB_IMAGE
-          env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
-          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME
          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
+          env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-bionic-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-bionic-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-bionic-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'bionic-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          }
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.META_TAG = 'bionic-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.EXT_RELEASE_TAG = 'bionic-version-' + env.EXT_RELEASE_CLEAN
        }
      }
    }
    // If this is a dev build use dev docker endpoints
    stage("Set ENV dev build"){
      when {
-        not {branch "master"}
+        not {branch "bionic"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
        script{
          env.IMAGE = env.DEV_DOCKERHUB_IMAGE
-          env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
-          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME
          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
+          env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          }
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.META_TAG = 'bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.EXT_RELEASE_TAG = 'bionic-version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
        }
      }
@ -168,15 +190,17 @@ pipeline {
      steps {
        script{
          env.IMAGE = env.PR_DOCKERHUB_IMAGE
-          env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
-          env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
+          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME
          env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
+          env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
          if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
          } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
          }
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.META_TAG = 'bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.EXT_RELEASE_TAG = 'bionic-version-' + env.EXT_RELEASE_CLEAN
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
        }
@ -189,24 +213,24 @@ pipeline {
      }
      steps {
        withCredentials([
-          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
-          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
+          string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'),
+          string(credentialsId: 'ci-tests-s3-secret-access-key', variable: 'S3_SECRET')
        ]) {
          script{
-            env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
+            env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
          }
          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
          sh '''#! /bin/bash
                set -e
-                docker pull lsiodev/spaces-file-upload:latest
+                docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest
                docker run --rm \
                -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \
                -e FILE_NAME="shellcheck-result.xml" \
                -e MIMETYPE="text/xml" \
                -v ${WORKSPACE}:/mnt \
-                -e SECRET_KEY=\"${DO_SECRET}\" \
-                -e ACCESS_KEY=\"${DO_KEY}\" \
-                -t lsiodev/spaces-file-upload:latest \
+                -e SECRET_KEY=\"${S3_SECRET}\" \
+                -e ACCESS_KEY=\"${S3_KEY}\" \
+                -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \
                python /upload.py'''
        }
      }
@ -214,7 +238,7 @@ pipeline {
    // Use helper containers to render templated files
    stage('Update-Templates') {
      when {
-        branch "master"
+        branch "bionic"
        environment name: 'CHANGE_ID', value: ''
        expression {
          env.CONTAINER_NAME != null
@ -224,20 +248,67 @@ pipeline {
        sh '''#! /bin/bash
              set -e
              TEMPDIR=$(mktemp -d)
-              docker pull linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
-              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then
+              docker pull ghcr.io/linuxserver/jenkins-builder:latest
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=bionic -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+              # Stage 1 - Jenkinsfile update
+              if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f bionic
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
+                git add Jenkinsfile
+                git commit -m 'Bot Updating Templated Files'
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Updating Jenkinsfile"
+                rm -Rf ${TEMPDIR}
+                exit 0
+              else
+                echo "Jenkinsfile is up to date."
+              fi
+              # Stage 2 - Delete old templates
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md"
+              for i in ${OLD_TEMPLATES}; do
+                if [[ -f "${i}" ]]; then
+                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
+                fi
+              done
+              if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
+                mkdir -p ${TEMPDIR}/repo
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                cd ${TEMPDIR}/repo/${LS_REPO}
+                git checkout -f bionic
+                for i in ${TEMPLATES_TO_DELETE}; do
+                  git rm "${i}"
+                done
+                git commit -m 'Bot Updating Templated Files'
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Deleting old templates"
+                rm -Rf ${TEMPDIR}
+                exit 0
+              else
+                echo "No templates to delete"
+              fi
+              # Stage 3 - Update templates
+              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
+              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
+              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
+              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
+                mkdir -p ${TEMPDIR}/repo
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                cd ${TEMPDIR}/repo/${LS_REPO}
+                git checkout -f bionic
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
-                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
+                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
                cd ${TEMPDIR}/repo/${LS_REPO}/
+                if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
+                  echo ".jenkins-external" >> .gitignore
+                  git add .gitignore
+                fi
                git add ${TEMPLATED_FILES}
                git commit -m 'Bot Updating Templated Files'
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
@ -247,8 +318,8 @@ pipeline {
              fi
              mkdir -p ${TEMPDIR}/gitbook
              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
-              if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
+              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
                cd ${TEMPDIR}/gitbook/docker-documentation/
                git add images/docker-${CONTAINER_NAME}.md
                git commit -m 'Bot Updating Documentation'
@ -265,7 +336,7 @@ pipeline {
    // Exit the build if the Templated files were just updated
    stage('Template-exit') {
      when {
-        branch "master"
+        branch "bionic"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'FILES_UPDATED', value: 'true'
        expression {
@ -298,85 +369,174 @@ pipeline {
             "visibility":"public"}' '''
      } 
    }
+    /* #######################
+           Scarf.sh package registry
+       ####################### */
+    // Add package to Scarf.sh and set permissions
+    stage("Scarf.sh package registry"){
+      when {
+        branch "bionic"
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps{
+        sh '''#! /bin/bash
+              set -e
+              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/baseimage-rdesktop") | .uuid')
+              if [ -z "${PACKAGE_UUID}" ]; then
+                echo "Adding package to Scarf.sh"
+                PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \
+                  -H "Authorization: Bearer ${SCARF_TOKEN}" \
+                  -H "Content-Type: application/json" \
+                  -d '{"name":"linuxserver/baseimage-rdesktop",\
+                       "shortDescription":"example description",\
+                       "libraryType":"docker",\
+                       "website":"https://github.com/linuxserver/docker-baseimage-rdesktop",\
+                       "backendUrl":"https://ghcr.io/linuxserver/baseimage-rdesktop",\
+                       "publicUrl":"https://lscr.io/linuxserver/baseimage-rdesktop"}' \
+                  | jq -r .uuid)
+              else
+                echo "Package already exists on Scarf.sh"
+              fi
+              echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}"
+              curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \
+                -H "Authorization: Bearer ${SCARF_TOKEN}" \
+                -H "Content-Type: application/json" \
+                -d '[{"userQuery":"Spad","permissionLevel":"admin"},\
+                     {"userQuery":"roxedus","permissionLevel":"admin"},\
+                     {"userQuery":"nemchik","permissionLevel":"admin"},\
+                     {"userQuery":"driz","permissionLevel":"admin"},\
+                     {"userQuery":"aptalca","permissionLevel":"admin"},\
+                     {"userQuery":"saarg","permissionLevel":"admin"},\
+                     {"userQuery":"Stark","permissionLevel":"admin"}]'
+           '''
+      } 
+    }
    /* ###############
       Build Container
       ############### */
    // Build Docker container for push to LS Repo
    stage('Build-Single') {
      when {
-        environment name: 'MULTIARCH', value: 'false'
+        expression {
+          env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true'
+        }
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \
-        --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+        echo "Running on node: ${NODE_NAME}"
+        sh "docker build \
+          --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
+          --label \"org.opencontainers.image.authors=linuxserver.io\" \
+          --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-rdesktop/packages\" \
+          --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-baseimage-rdesktop\" \
+          --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-baseimage-rdesktop\" \
+          --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
+          --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
+          --label \"org.opencontainers.image.vendor=linuxserver.io\" \
+          --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
+          --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
+          --label \"org.opencontainers.image.title=Baseimage-rdesktop\" \
+          --label \"org.opencontainers.image.description=baseimage-rdesktop image by linuxserver.io\" \
+          --no-cache --pull -t ${IMAGE}:${META_TAG} \
+          --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
      }
    }
    // Build MultiArch Docker containers for push to LS Repo
    stage('Build-Multi') {
      when {
-        environment name: 'MULTIARCH', value: 'true'
+        allOf {
+          environment name: 'MULTIARCH', value: 'true'
+          expression { params.PACKAGE_CHECK == 'false' }
+        }
        environment name: 'EXIT_STATUS', value: ''
      }
      parallel {
        stage('Build X86') {
          steps {
-            sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
-            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+            echo "Running on node: ${NODE_NAME}"
+            sh "docker build \
+              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
+              --label \"org.opencontainers.image.authors=linuxserver.io\" \
+              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-rdesktop/packages\" \
+              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-baseimage-rdesktop\" \
+              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-baseimage-rdesktop\" \
+              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
+              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
+              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
+              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
+              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
+              --label \"org.opencontainers.image.title=Baseimage-rdesktop\" \
+              --label \"org.opencontainers.image.description=baseimage-rdesktop image by linuxserver.io\" \
+              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
+              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
          }
        }
        stage('Build ARMHF') {
          agent {
-            label 'X86-64-MULTI'
+            label 'ARMHF'
          }
          steps {
-            withCredentials([
-              [
-                $class: 'UsernamePasswordMultiBinding',
-                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-                usernameVariable: 'DOCKERUSER',
-                passwordVariable: 'DOCKERPASS'
-              ]
-            ]) {
-              echo 'Logging into DockerHub'
-              sh '''#! /bin/bash
-                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                 '''
-              sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
-                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-              sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-              sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-              sh '''docker rmi \
-                    ${IMAGE}:arm32v7-${META_TAG} \
-                    lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
+            echo "Running on node: ${NODE_NAME}"
+            echo 'Logging into Github'
+            sh '''#! /bin/bash
+                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+               '''
+            sh "docker build \
+              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
+              --label \"org.opencontainers.image.authors=linuxserver.io\" \
+              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-rdesktop/packages\" \
+              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-baseimage-rdesktop\" \
+              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-baseimage-rdesktop\" \
+              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
+              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
+              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
+              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
+              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
+              --label \"org.opencontainers.image.title=Baseimage-rdesktop\" \
+              --label \"org.opencontainers.image.description=baseimage-rdesktop image by linuxserver.io\" \
+              --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
+              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+            sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+            retry(5) {
+              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
            }
+            sh '''docker rmi \
+                  ${IMAGE}:arm32v7-${META_TAG} \
+                  ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
          }
        }
        stage('Build ARM64') {
          agent {
-            label 'X86-64-MULTI'
+            label 'ARM64'
          }
          steps {
-            withCredentials([
-              [
-                $class: 'UsernamePasswordMultiBinding',
-                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-                usernameVariable: 'DOCKERUSER',
-                passwordVariable: 'DOCKERPASS'
-              ]
-            ]) {
-              echo 'Logging into DockerHub'
-              sh '''#! /bin/bash
-                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                 '''
-              sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
-                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-              sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-              sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-              sh '''docker rmi \
-                    ${IMAGE}:arm64v8-${META_TAG} \
-                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
+            echo "Running on node: ${NODE_NAME}"
+            echo 'Logging into Github'
+            sh '''#! /bin/bash
+                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+               '''
+            sh "docker build \
+              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
+              --label \"org.opencontainers.image.authors=linuxserver.io\" \
+              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-rdesktop/packages\" \
+              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-baseimage-rdesktop\" \
+              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-baseimage-rdesktop\" \
+              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
+              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
+              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
+              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
+              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
+              --label \"org.opencontainers.image.title=Baseimage-rdesktop\" \
+              --label \"org.opencontainers.image.description=baseimage-rdesktop image by linuxserver.io\" \
+              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
+              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+            retry(5) {
+              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
            }
+            sh '''docker rmi \
+                  ${IMAGE}:arm64v8-${META_TAG} \
+                  ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
          }
        }
      }
@ -384,7 +544,7 @@ pipeline {
    // Take the image we just built and dump package versions for comparison
    stage('Update-packages') {
      when {
-        branch "master"
+        branch "bionic"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@ -392,7 +552,7 @@ pipeline {
        sh '''#! /bin/bash
              set -e
              TEMPDIR=$(mktemp -d)
-              if [ "${MULTIARCH}" == "true" ]; then
+              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
                LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
              else
                LOCAL_CONTAINER=${IMAGE}:${META_TAG}
@ -407,12 +567,21 @@ pipeline {
                  apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
                  chmod 777 /tmp/package_versions.txt'
+              elif [ "${DIST_IMAGE}" == "fedora" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  rpm -qa > /tmp/package_versions.txt && \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              elif [ "${DIST_IMAGE}" == "arch" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  pacman -Q > /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
              fi
              NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
              echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
              if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f bionic
                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                cd ${TEMPDIR}/${LS_REPO}/
                wait
@ -436,7 +605,7 @@ pipeline {
    // Exit the build if the package file was just updated
    stage('PACKAGE-exit') {
      when {
-        branch "master"
+        branch "bionic"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
@ -450,7 +619,7 @@ pipeline {
    // Exit the build if this is just a package check and there are no changes to push
    stage('PACKAGECHECK-exit') {
      when {
-        branch "master"
+        branch "bionic"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
@ -475,20 +644,20 @@ pipeline {
      }
      steps {
        withCredentials([
-          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
-          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
+          string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'),
+          string(credentialsId: 'ci-tests-s3-secret-access-key	', variable: 'S3_SECRET')
        ]) {
          script{
-            env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
+            env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
          }
          sh '''#! /bin/bash
                set -e
-                docker pull lsiodev/ci:latest
+                docker pull ghcr.io/linuxserver/ci:latest
                if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
-                  docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                fi
                docker run --rm \
                --shm-size=1gb \
@ -500,15 +669,15 @@ pipeline {
                -e PORT=\"${CI_PORT}\" \
                -e SSL=\"${CI_SSL}\" \
                -e BASE=\"${DIST_IMAGE}\" \
-                -e SECRET_KEY=\"${DO_SECRET}\" \
-                -e ACCESS_KEY=\"${DO_KEY}\" \
+                -e SECRET_KEY=\"${S3_SECRET}\" \
+                -e ACCESS_KEY=\"${S3_KEY}\" \
                -e DOCKER_ENV=\"${CI_DOCKERENV}\" \
                -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                -e WEB_AUTH=\"${CI_AUTH}\" \
                -e WEB_PATH=\"${CI_WEBPATH}\" \
                -e DO_REGION="ams3" \
                -e DO_BUCKET="lsio-ci" \
-                -t lsiodev/ci:latest \
+                -t ghcr.io/linuxserver/ci:latest \
                python /ci/ci.py'''
        }
      }
@ -537,22 +706,32 @@ pipeline {
            passwordVariable: 'QUAYPASS'
          ]
        ]) {
+          retry(5) {
+            sh '''#! /bin/bash
+                  set -e
+                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
+                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:bionic
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+                    docker push ${PUSHIMAGE}:bionic
+                    docker push ${PUSHIMAGE}:${META_TAG}
+                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
+                    docker push ${PUSHIMAGE}:${SEMVER}
+                  done
+               '''
+          }
          sh '''#! /bin/bash
-                set -e
-                echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
-                echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
-                  docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                  docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:focal
-                  docker push ${PUSHIMAGE}:focal
-                  docker push ${PUSHIMAGE}:${META_TAG}
-                done
-                for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
+                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
                  docker rmi \
                  ${DELETEIMAGE}:${META_TAG} \
-                  ${DELETEIMAGE}:focal || :
+                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:bionic \
+                  ${DELETEIMAGE}:${SEMVER} || :
                done
             '''
        }
@ -579,58 +758,82 @@ pipeline {
            passwordVariable: 'QUAYPASS'
          ]
        ]) {
+          retry(5) {
+            sh '''#! /bin/bash
+                  set -e
+                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                  if [ "${CI}" == "false" ]; then
+                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
+                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                  fi
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                    docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
+                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
+                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-bionic
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-bionic
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-bionic
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-bionic
+                    docker push ${MANIFESTIMAGE}:arm32v7-bionic
+                    docker push ${MANIFESTIMAGE}:arm64v8-bionic
+                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
+                    docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+                    docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    docker manifest push --purge ${MANIFESTIMAGE}:bionic || :
+                    docker manifest create ${MANIFESTIMAGE}:bionic ${MANIFESTIMAGE}:amd64-bionic ${MANIFESTIMAGE}:arm32v7-bionic ${MANIFESTIMAGE}:arm64v8-bionic
+                    docker manifest annotate ${MANIFESTIMAGE}:bionic ${MANIFESTIMAGE}:arm32v7-bionic --os linux --arch arm
+                    docker manifest annotate ${MANIFESTIMAGE}:bionic ${MANIFESTIMAGE}:arm64v8-bionic --os linux --arch arm64 --variant v8
+                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
+                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
+                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
+                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
+                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
+                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
+                    docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
+                    docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
+                    docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
+                    docker manifest push --purge ${MANIFESTIMAGE}:bionic
+                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
+                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
+                    docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
+                  done
+               '''
+          }
          sh '''#! /bin/bash
-                set -e
-                echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
-                echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                if [ "${CI}" == "false" ]; then
-                  docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
-                  docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
-                fi
-                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do
-                  docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                  docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                  docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                  docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-focal
-                  docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-focal
-                  docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-focal
-                  docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
-                  docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                  docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                  docker push ${MANIFESTIMAGE}:amd64-focal
-                  docker push ${MANIFESTIMAGE}:arm32v7-focal
-                  docker push ${MANIFESTIMAGE}:arm64v8-focal
-                  docker manifest push --purge ${MANIFESTIMAGE}:focal || :
-                  docker manifest create ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:amd64-focal ${MANIFESTIMAGE}:arm32v7-focal ${MANIFESTIMAGE}:arm64v8-focal
-                  docker manifest annotate ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:arm32v7-focal --os linux --arch arm
-                  docker manifest annotate ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:arm64v8-focal --os linux --arch arm64 --variant v8
-                  docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
-                  docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                  docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
-                  docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
-                  docker manifest push --purge ${MANIFESTIMAGE}:focal
-                  docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
-                done
-                for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
-                  docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
-                  docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
-                  docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:focal
-                  docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
-                  docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-focal
-                  docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-focal
-                  docker push ${LEGACYIMAGE}:amd64-${META_TAG}
-                  docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
-                  docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
-                  docker push ${LEGACYIMAGE}:focal
-                  docker push ${LEGACYIMAGE}:${META_TAG}
-                  docker push ${LEGACYIMAGE}:arm32v7-focal
-                  docker push ${LEGACYIMAGE}:arm64v8-focal
+                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
+                  docker rmi \
+                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
+                  ${DELETEIMAGE}:arm32v7-bionic \
+                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:arm32v7-${SEMVER} \
+                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
+                  ${DELETEIMAGE}:arm64v8-bionic \
+                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:arm64v8-${SEMVER} || :
                done
+                docker rmi \
+                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
+                ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
             '''
        }
      }
@ -638,7 +841,7 @@ pipeline {
    // If this is a public release tag it in the LS Github
    stage('Github-Tag-Push-Release') {
      when {
-        branch "master"
+        branch "bionic"
        expression {
          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
        }
@ -646,21 +849,21 @@ pipeline {
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}"
+        echo "Pushing New tag for current commit ${META_TAG}"
        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
-        -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
+        -d '{"tag":"'${META_TAG}'",\
             "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to bionic",\
             "type": "commit",\
             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
        echo "Pushing New release for Tag"
        sh '''#! /bin/bash
              echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json
-              echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
-                     "target_commitish": "master",\
-                     "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**OS Changes:**\\n\\n' > start
-              printf '","draft": false,"prerelease": false}' >> releasebody.json
+              echo '{"tag_name":"'${META_TAG}'",\
+                     "target_commitish": "bionic",\
+                     "name": "'${META_TAG}'",\
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**OS Changes:**\\n\\n' > start
+              printf '","draft": false,"prerelease": true}' >> releasebody.json
              paste -d'\\0' start releasebody.json > releasebody.json.done
              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
      }
@ -681,14 +884,20 @@ pipeline {
          ]
        ]) {
          sh '''#! /bin/bash
-                docker pull lsiodev/readme-sync
+                set -e
+                TEMPDIR=$(mktemp -d)
+                docker pull ghcr.io/linuxserver/jenkins-builder:latest
+                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
+                docker pull ghcr.io/linuxserver/readme-sync
                docker run --rm=true \
                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
                  -e DOCKER_REPOSITORY=${IMAGE} \
                  -e GIT_BRANCH=master \
-                  lsiodev/readme-sync bash -c 'node sync' '''
+                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
+                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
+                rm -Rf ${TEMPDIR} '''
        }
      }
    }
--- a/README.md
+++ b/README.md
@ -1,3 +1,6 @@
+<!-- DO NOT EDIT THIS FILE MANUALLY  -->
+<!-- Please read the https://github.com/linuxserver/docker-baseimage-rdesktop/blob/bionic/.github/CONTRIBUTING.md -->
+
 [linuxserverurl]: https://linuxserver.io
 [forumurl]: https://forum.linuxserver.io
 [ircurl]: https://www.linuxserver.io/irc/
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@ -3,10 +3,9 @@
 # jenkins variables
 project_name: docker-baseimage-rdesktop
 external_type: os
-release_type: stable
-release_tag: focal
-ls_branch: master
-use_qemu: true
+release_type: prerelease
+release_tag: bionic
+ls_branch: bionic
 repo_vars:
  - BUILD_VERSION_ARG = 'XRDP_VERSION'
  - LS_USER = 'linuxserver'
--- a/package_versions.txt
+++ b/package_versions.txt
@ -0,0 +1,324 @@
+adduser3.116ubuntu1
+apt1.6.14
+apt-transport-https1.6.14
+apt-utils1.6.14
+base-files10.1ubuntu2.11
+base-passwd3.5.44
+bash4.4.18-2ubuntu1.2
+bsdmainutils11.1.2ubuntu1
+bsdutils1:2.31.1-0.4ubuntu3.7
+bzip21.0.6-8.1ubuntu0.2
+ca-certificates20210119~18.04.2
+coreutils8.28-1ubuntu1
+cpp4:7.4.0-1ubuntu2.3
+cpp-77.5.0-3ubuntu1~18.04
+curl7.58.0-2ubuntu3.16
+dash0.5.8-2.10
+dbus1.12.2-1ubuntu1.2
+dbus-x111.12.2-1ubuntu1.2
+dconf-gsettings-backend0.26.0-2ubuntu3
+dconf-service0.26.0-2ubuntu3
+debconf1.5.66ubuntu1
+debianutils4.8.4
+diffutils1:3.6-1
+dirmngr2.2.4-1ubuntu1.4
+distro-info-data0.37ubuntu0.13
+docker-ce-cli5:20.10.11~3-0~ubuntu-bionic
+dpkg1.19.0.5ubuntu2.3
+e2fsprogs1.44.1-1ubuntu1.3
+fdisk2.31.1-0.4ubuntu3.7
+findutils4.6.0+git+20170828-2
+fontconfig-config2.12.6-0ubuntu2
+fonts-dejavu-core2.37-1
+gawk1:4.1.4+dfsg-1build1
+gcc-7-base7.5.0-3ubuntu1~18.04
+gcc-8-base8.4.0-1ubuntu1~18.04
+gir1.2-glib-2.01.56.1-1
+glib-networking2.56.0-1ubuntu0.1
+glib-networking-common2.56.0-1ubuntu0.1
+glib-networking-services2.56.0-1ubuntu0.1
+gnupg22.2.4-1ubuntu1.4
+gnupg2.2.4-1ubuntu1.4
+gnupg-l10n2.2.4-1ubuntu1.4
+gnupg-utils2.2.4-1ubuntu1.4
+gpg2.2.4-1ubuntu1.4
+gpg-agent2.2.4-1ubuntu1.4
+gpgconf2.2.4-1ubuntu1.4
+gpgsm2.2.4-1ubuntu1.4
+gpgv2.2.4-1ubuntu1.4
+gpg-wks-client2.2.4-1ubuntu1.4
+gpg-wks-server2.2.4-1ubuntu1.4
+grep3.1-2build1
+groff-base1.22.3-10
+gsettings-desktop-schemas3.28.0-1ubuntu1
+gzip1.6-5ubuntu1.1
+hostname3.20
+init-system-helpers1.51
+iso-codes3.79-1
+keyboard-configuration1.178ubuntu2.9
+krb5-locales1.16-2ubuntu0.2
+libacl12.2.52-3build1
+libapparmor12.12-4ubuntu5.1
+libapt-inst2.01.6.14
+libapt-pkg5.01.6.14
+libasn1-8-heimdal7.5.0+dfsg-1
+libasound21.1.3-5ubuntu0.6
+libasound2-data1.1.3-5ubuntu0.6
+libasound2-plugins1.1.1-1ubuntu1
+libassuan02.5.1-2
+libasyncns00.8-6
+libattr11:2.4.47-2build1
+libaudit11:2.8.2-1ubuntu1.1
+libaudit-common1:2.8.2-1ubuntu1.1
+libblkid12.31.1-0.4ubuntu3.7
+libbsd00.8.7-1ubuntu0.1
+libbz2-1.01.0.6-8.1ubuntu0.2
+libc62.27-3ubuntu1.4
+libcap21:2.25-1.2
+libcap-ng00.7.7-3.1
+libc-bin2.27-3ubuntu1.4
+libcom-err21.44.1-1ubuntu1.3
+libcurl47.58.0-2ubuntu3.16
+libdb5.35.3.28-13.1ubuntu1.1
+libdbus-1-31.12.2-1ubuntu1.2
+libdconf10.26.0-2ubuntu3
+libdebconfclient00.213ubuntu1
+libdrm22.4.101-2~18.04.1
+libdrm-amdgpu12.4.101-2~18.04.1
+libdrm-common2.4.101-2~18.04.1
+libdrm-intel12.4.101-2~18.04.1
+libdrm-nouveau22.4.101-2~18.04.1
+libdrm-radeon12.4.101-2~18.04.1
+libedit23.1-20170329-1
+libegl11.0.0-2ubuntu2.3
+libegl1-mesa20.0.8-0ubuntu1~18.04.1
+libegl-mesa020.0.8-0ubuntu1~18.04.1
+libelf10.170-0.4ubuntu0.1
+libepoxy01.4.3-1
+libexpat12.2.5-3ubuntu0.2
+libext2fs21.44.1-1ubuntu1.3
+libfdisk12.31.1-0.4ubuntu3.7
+libffi63.2.1-8
+libflac81.3.2-1
+libfontconfig12.12.6-0ubuntu2
+libfontenc11:1.1.3-1
+libfreetype62.8.1-2ubuntu2.1
+libfuse22.9.7-1ubuntu1
+libgbm120.0.8-0ubuntu1~18.04.1
+libgcc11:8.4.0-1ubuntu1~18.04
+libgcrypt201.8.1-4ubuntu1.3
+libgdbm51.14.1-6
+libgirepository-1.0-11.56.1-1
+libgl11.0.0-2ubuntu2.3
+libgl1-mesa-dri20.0.8-0ubuntu1~18.04.1
+libglapi-mesa20.0.8-0ubuntu1~18.04.1
+libglib2.0-02.56.4-0ubuntu0.18.04.8
+libglvnd01.0.0-2ubuntu2.3
+libglx01.0.0-2ubuntu2.3
+libglx-mesa020.0.8-0ubuntu1~18.04.1
+libgmp102:6.1.2+dfsg-2
+libgnutls303.5.18-1ubuntu1.5
+libgpg-error01.27-6
+libgssapi3-heimdal7.5.0+dfsg-1
+libgssapi-krb5-21.16-2ubuntu0.2
+libhcrypto4-heimdal7.5.0+dfsg-1
+libheimbase1-heimdal7.5.0+dfsg-1
+libheimntlm0-heimdal7.5.0+dfsg-1
+libhogweed43.4.1-0ubuntu0.18.04.1
+libhx509-5-heimdal7.5.0+dfsg-1
+libice62:1.0.9-2
+libicu6060.2-3ubuntu3.2
+libidn2-02.0.4-1.1ubuntu0.2
+libisl190.19-1
+libjack-jackd2-01.9.12~dfsg-2
+libjpeg88c-2ubuntu8
+libjpeg-turbo81.5.2-0ubuntu5.18.04.4
+libjson-glib-1.0-01.4.2-3ubuntu0.18.04.1
+libjson-glib-1.0-common1.4.2-3ubuntu0.18.04.1
+libk5crypto31.16-2ubuntu0.2
+libkeyutils11.5.9-9.2ubuntu2
+libkmod224-1ubuntu3.5
+libkrb5-26-heimdal7.5.0+dfsg-1
+libkrb5-31.16-2ubuntu0.2
+libkrb5support01.16-2ubuntu0.2
+libksba81.3.5-2
+libldap-2.4-22.4.45+dfsg-1ubuntu1.10
+libldap-common2.4.45+dfsg-1ubuntu1.10
+libllvm101:10.0.0-4ubuntu1~18.04.2
+liblocale-gettext-perl1.07-3build2
+libltdl72.4.6-2
+liblz4-10.0~r131-2ubuntu3.1
+liblzma55.2.2-1.3
+libmount12.31.1-0.4ubuntu3.7
+libmpc31.1.0-1
+libmpdec22.4.2-1ubuntu1
+libmpfr64.0.1-1
+libncurses56.1-1ubuntu1.18.04
+libncursesw56.1-1ubuntu1.18.04
+libnettle63.4.1-0ubuntu0.18.04.1
+libnghttp2-141.30.0-1ubuntu1
+libnpth01.5-3
+libogg01.3.2-1
+libopus01.1.2-1ubuntu1
+liborc-0.4-01:0.4.28-1
+libp11-kit00.23.9-2ubuntu0.1
+libpam0g1.1.8-3.6ubuntu2.18.04.3
+libpam-modules1.1.8-3.6ubuntu2.18.04.3
+libpam-modules-bin1.1.8-3.6ubuntu2.18.04.3
+libpam-runtime1.1.8-3.6ubuntu2.18.04.3
+libpciaccess00.14-1
+libpcre32:8.39-9
+libpipeline11.5.0-1
+libpixman-1-00.34.0-2
+libpng16-161.6.34-1ubuntu0.18.04.2
+libprocps62:3.3.12-3ubuntu1.2
+libproxy1v50.4.15-1ubuntu0.2
+libpsl50.19.1-5build1
+libpthread-stubs0-dev0.3-4
+libpulse01:11.1-1ubuntu7.11
+libpulsedsp1:11.1-1ubuntu7.11
+libpython3.6-minimal3.6.9-1~18.04ubuntu1.4
+libpython3.6-stdlib3.6.9-1~18.04ubuntu1.4
+libpython3-stdlib3.6.7-1~18.04
+libreadline77.0-3
+libroken18-heimdal7.5.0+dfsg-1
+librtmp12.4+20151223.gitfa8646d.1-1
+libsamplerate00.1.9-1
+libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.3
+libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.3
+libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.3
+libseccomp22.5.1-1ubuntu1~18.04.1
+libselinux12.7-2build2
+libsemanage12.7-2build2
+libsemanage-common2.7-2build2
+libsensors41:3.4.0-4
+libsepol12.7-1
+libsigsegv22.12-1
+libsm62:1.2.2-1
+libsmartcols12.31.1-0.4ubuntu3.7
+libsnapd-glib11.58-0ubuntu0.18.04.0
+libsndfile11.0.28-4ubuntu0.18.04.2
+libsoup2.4-12.62.1-1ubuntu0.4
+libspeexdsp11.2~rc1.2-1ubuntu2
+libsqlite3-03.22.0-1ubuntu0.4
+libss21.44.1-1ubuntu1.3
+libssl1.0.01.0.2n-1ubuntu5.7
+libssl1.11.1.1-1ubuntu2.1~18.04.13
+libstdc++68.4.0-1ubuntu1~18.04
+libsystemd0237-3ubuntu10.52
+libtasn1-64.13-2
+libtdb11.3.15-2
+libtinfo56.1-1ubuntu1.18.04
+libudev1237-3ubuntu10.52
+libunistring20.9.9-0ubuntu2
+libuuid12.31.1-0.4ubuntu3.7
+libvorbis0a1.3.5-4.2
+libvorbisenc21.3.5-4.2
+libwayland-client01.16.0-1ubuntu1.1~18.04.3
+libwayland-server01.16.0-1ubuntu1.1~18.04.3
+libwebrtc-audio-processing10.3-1
+libwind0-heimdal7.5.0+dfsg-1
+libwrap07.6.q-27
+libx11-62:1.6.4-3ubuntu0.4
+libx11-data2:1.6.4-3ubuntu0.4
+libx11-dev2:1.6.4-3ubuntu0.4
+libx11-xcb12:1.6.4-3ubuntu0.4
+libxau61:1.0.8-1ubuntu1
+libxau-dev1:1.0.8-1ubuntu1
+libxaw72:1.0.13-1
+libxcb11.13-2~ubuntu18.04
+libxcb1-dev1.13-2~ubuntu18.04
+libxcb-dri2-01.13-2~ubuntu18.04
+libxcb-dri3-01.13-2~ubuntu18.04
+libxcb-glx01.13-2~ubuntu18.04
+libxcb-present01.13-2~ubuntu18.04
+libxcb-shape01.13-2~ubuntu18.04
+libxcb-sync11.13-2~ubuntu18.04
+libxcb-xfixes01.13-2~ubuntu18.04
+libxcomposite11:0.4.4-2
+libxcursor11:1.1.15-1
+libxdamage11:1.1.4-3
+libxdmcp61:1.1.2-3
+libxdmcp-dev1:1.1.2-3
+libxext62:1.3.3-1
+libxfixes31:5.0.3-1
+libxfont21:2.0.3-1
+libxft22.3.2-1
+libxi62:1.7.9-1
+libxinerama12:1.1.3-1
+libxkbfile11:1.0.9-2
+libxml22.9.4+dfsg1-6.1ubuntu1.4
+libxmu62:1.1.2-2
+libxmuu12:1.1.2-2
+libxpm41:3.5.12-1
+libxrandr22:1.5.1-1
+libxrender11:0.9.10-1
+libxshmfence11.3-1
+libxt61:1.1.5-1
+libxtst62:1.2.3-1
+libxv12:1.0.11-1
+libxxf86dga12:1.1.4-1
+libxxf86vm11:1.1.4-1
+libzstd11.3.3+dfsg-2ubuntu1.2
+locales2.27-3ubuntu1.4
+login1:4.5-1ubuntu2
+lsb-base9.20170808ubuntu1
+lsb-release9.20170808ubuntu1
+man-db2.8.3-2ubuntu0.1
+mawk1.3.3-17ubuntu3
+mime-support3.60ubuntu1
+mount2.31.1-0.4ubuntu3.7
+multiarch-support2.27-3ubuntu1.4
+ncurses-base6.1-1ubuntu1.18.04
+ncurses-bin6.1-1ubuntu1.18.04
+openssh-client1:7.6p1-4ubuntu0.5
+openssl1.1.1-1ubuntu2.1~18.04.13
+passwd1:4.5-1ubuntu2
+perl-base5.26.1-6ubuntu0.5
+pinentry-curses1.1.0-1
+procps2:3.3.12-3ubuntu1.2
+publicsuffix20180223.1310-1
+pulseaudio1:11.1-1ubuntu7.11
+pulseaudio-utils1:11.1-1ubuntu7.11
+python33.6.7-1~18.04
+python3.63.6.9-1~18.04ubuntu1.4
+python3.6-minimal3.6.9-1~18.04ubuntu1.4
+python3-apt1.6.5ubuntu0.7
+python3-dbus1.2.6-1
+python3-gi3.26.1-2ubuntu1
+python3-minimal3.6.7-1~18.04
+python3-software-properties0.96.24.32.18
+python-apt-common1.6.5ubuntu0.7
+readline-common7.0-3
+sed4.4-2
+sensible-utils0.0.12
+software-properties-common0.96.24.32.18
+ssl-cert1.0.39
+sudo1.8.21p2-3ubuntu1.4
+sysvinit-utils2.88dsf-59.10ubuntu1
+tar1.29b-2ubuntu0.2
+tzdata2021e-0ubuntu0.18.04
+ubuntu-keyring2018.09.18.1~18.04.2
+ucf3.0038
+udev237-3ubuntu10.52
+util-linux2.31.1-0.4ubuntu3.7
+x11-apps7.7+6ubuntu1
+x11-common1:7.7+19ubuntu7.1
+x11proto-core-dev2018.4-4
+x11proto-dev2018.4-4
+x11-session-utils7.7+2build1
+x11-utils7.7+3build1
+x11-xkb-utils7.7+3ubuntu0.18.04.1
+x11-xserver-utils7.7+7build1
+xfonts-base1:1.0.4+nmu1
+xfonts-encodings1:1.0.4-2
+xfonts-utils1:7.7+6
+xkb-data2.23.1-1ubuntu1.18.04.1
+xorg-sgml-doctools1:1.11-1
+xorgxrdp0.9.5-2
+xrdp0.9.5-2
+xserver-common2:1.19.6-1ubuntu4.9
+xserver-xorg-core2:1.19.6-1ubuntu4.9
+xtrans-dev1.3.5-1
+xutils1:7.7+19ubuntu7.1
+zlib1g1:1.2.11.dfsg-0ubuntu2
--- a/root/etc/cont-init.d/13-keygen
+++ b/root/etc/cont-init.d/13-keygen
@ -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
--- a/root/startpulse.sh
+++ b/root/startpulse.sh
@ -0,0 +1,8 @@
+#!/bin/bash
+while :
+do
+    if [[ ! `/usr/bin/pulseaudio --check` ]]; then
+        /usr/bin/pulseaudio --start
+    fi
+    sleep 10
+done
Author	SHA1	Message	Date
LinuxServer-CI	92191e4764	Bot Updating Package Versions	2021-11-25 07:36:59 +01:00
LinuxServer-CI	78d585f6e5	Bot Updating Package Versions	2021-11-18 07:34:07 +01:00
LinuxServer-CI	0e838f80ea	Bot Updating Package Versions	2021-11-11 07:38:13 +01:00
LinuxServer-CI	08d2917672	Bot Updating Package Versions	2021-11-04 07:34:05 +01:00
LinuxServer-CI	6a9f1e0a06	Bot Updating Package Versions	2021-10-28 08:37:11 +02:00
LinuxServer-CI	6b551858b9	Bot Updating Package Versions	2021-10-21 08:36:34 +02:00
LinuxServer-CI	5f8371a670	Bot Updating Package Versions	2021-10-14 08:36:16 +02:00
LinuxServer-CI	73b325d65a	Bot Updating Package Versions	2021-10-07 08:38:19 +02:00
LinuxServer-CI	cc15348eaa	Bot Updating Templated Files	2021-10-07 08:26:33 +02:00
LinuxServer-CI	c4ebe30f79	Bot Updating Package Versions	2021-09-27 21:25:38 +02:00
thelamer	013aeb1de7	adding pulse wrapper to bionic base	2021-09-27 12:07:04 -07:00
LinuxServer-CI	4891cca64c	Bot Updating Package Versions	2021-09-23 08:34:27 +02:00
LinuxServer-CI	f354c0e467	Bot Updating Package Versions	2021-09-16 08:35:17 +02:00
LinuxServer-CI	85776f2f13	Bot Updating Package Versions	2021-09-02 08:45:09 +02:00
LinuxServer-CI	5bc503d78b	Bot Updating Templated Files	2021-09-02 08:26:26 +02:00
LinuxServer-CI	d88c45c064	Bot Updating Templated Files	2021-08-26 08:26:09 +02:00
LinuxServer-CI	85c70372d0	Bot Updating Package Versions	2021-08-19 08:38:03 +02:00
LinuxServer-CI	41680a9304	Bot Updating Package Versions	2021-08-12 08:36:34 +02:00
LinuxServer-CI	170f830543	Bot Updating Package Versions	2021-08-05 08:37:14 +02:00
LinuxServer-CI	894f098f72	Bot Updating Package Versions	2021-07-29 08:36:00 +02:00
LinuxServer-CI	46db7501bd	Bot Updating Package Versions	2021-07-22 08:47:07 +02:00
LinuxServer-CI	c54a419739	Bot Updating Package Versions	2021-07-08 07:32:46 +00:00
LinuxServer-CI	65b16dfb78	Bot Updating Templated Files	2021-07-08 06:29:12 +00:00
LinuxServer-CI	3039c2ebde	Bot Updating Templated Files	2021-07-08 06:27:33 +00:00
LinuxServer-CI	10dc9af98c	Bot Updating Package Versions	2021-07-01 06:59:55 +00:00
LinuxServer-CI	fceac77940	Bot Updating Package Versions	2021-06-24 06:52:18 +00:00
LinuxServer-CI	c549807caa	Bot Updating Package Versions	2021-06-17 07:34:13 +00:00
LinuxServer-CI	41517b5ee3	Bot Updating Package Versions	2021-06-10 14:23:50 +00:00
LinuxServer-CI	b838773def	Bot Updating Package Versions	2021-06-03 08:34:27 +00:00
LinuxServer-CI	e462d180ec	Bot Updating Package Versions	2021-05-27 07:28:07 +00:00
LinuxServer-CI	468f513758	Bot Updating Package Versions	2021-05-20 03:12:53 -04:00
LinuxServer-CI	e17baede47	Bot Updating Package Versions	2021-05-13 08:05:18 +01:00
LinuxServer-CI	ee98e7bebd	Bot Updating Package Versions	2021-04-25 05:52:17 +01:00
aptalca	b7dec8f4f5	Merge pull request #6 from linuxserver/improvements-bionic add compose, key generation, and ssh client to base	2021-04-25 00:06:39 -04:00
thelamer	4fb21082f2	add compose, key generation, and ssh client to base	2021-04-24 16:28:03 -07:00
LinuxServer-CI	256160f80e	Bot Updating Package Versions	2021-04-22 08:15:06 +01:00
LinuxServer-CI	447f62e551	Bot Updating Templated Files	2021-04-22 06:37:51 +00:00
LinuxServer-CI	2eb91c33d5	Bot Updating Templated Files	2021-04-22 07:35:53 +01:00
LinuxServer-CI	ac4da0a7f5	Bot Updating Package Versions	2021-04-15 07:56:42 +01:00
LinuxServer-CI	5c139aef7a	Bot Updating Package Versions	2021-04-08 08:03:34 +01:00
LinuxServer-CI	cdb327912c	Bot Updating Package Versions	2021-04-01 08:41:18 +01:00
LinuxServer-CI	43e484cfc9	Bot Updating Package Versions	2021-03-25 07:04:14 +00:00
LinuxServer-CI	3e7bea0ba5	Bot Updating Package Versions	2021-03-18 07:09:57 +00:00
LinuxServer-CI	527c203d40	Bot Updating Package Versions	2021-03-11 06:58:29 +00:00
LinuxServer-CI	e6e21835c9	Bot Updating Package Versions	2021-03-04 02:14:40 -05:00
LinuxServer-CI	c98490308e	Bot Updating Package Versions	2021-02-25 07:05:47 +00:00
LinuxServer-CI	9813d42a6c	Bot Updating Templated Files	2021-02-18 06:29:18 +00:00
LinuxServer-CI	de63b6d649	Bot Updating Templated Files	2021-02-18 06:28:12 +00:00
LinuxServer-CI	a55c63ac10	Bot Updating Package Versions	2021-02-11 07:03:53 +00:00
LinuxServer-CI	c1aa17182b	Bot Updating Package Versions	2021-02-04 06:56:17 +00:00
LinuxServer-CI	06afae021f	Bot Updating Package Versions	2021-01-28 03:52:55 -05:00
LinuxServer-CI	9ff9d61c7c	Bot Updating Package Versions	2021-01-21 02:23:36 -05:00
LinuxServer-CI	cd69e3f65c	Bot Updating Package Versions	2021-01-16 11:27:28 +00:00
LinuxServer-CI	9f897e45b9	Bot Updating Templated Files	2021-01-16 10:46:06 +00:00
LinuxServer-CI	9aafba1545	Bot Updating Package Versions	2021-01-09 06:07:11 -05:00
LinuxServer-CI	7e093aeb55	Bot Updating Package Versions	2020-12-19 10:56:14 +00:00
LinuxServer-CI	a8a8f5f7cc	Bot Updating Templated Files	2020-12-19 10:18:54 +00:00
LinuxServer-CI	7e1f8532e8	Bot Updating Templated Files	2020-12-19 10:17:29 +00:00
LinuxServer-CI	b6787c8694	Bot Updating Package Versions	2020-12-12 10:54:49 +00:00
LinuxServer-CI	47046ea136	Bot Updating Package Versions	2020-12-03 01:53:20 +00:00
aptalca	5452663f7b	Merge pull request #2 from linuxserver/bionic-wf add trigger workflows	2020-12-02 20:17:44 -05:00
aptalca	2ca0a7bca2	add trigger workflows	2020-12-02 17:18:44 -05:00
LinuxServer-CI	e9deb7df8e	Bot Updating Package Versions	2020-11-27 22:09:13 +00:00
LinuxServer-CI	5224c39203	Bot Updating Package Versions	2020-11-20 22:06:29 +00:00
LinuxServer-CI	1918e6fb95	Bot Updating Package Versions	2020-11-01 19:26:16 -05:00
LinuxServer-CI	6eff0ee821	Bot Updating Templated Files	2020-11-01 18:54:30 -05:00
thelamer	696eb4e7d0	update baseimages	2020-11-01 15:53:22 -08:00
LinuxServer-CI	a973ccd8c2	Bot Updating Package Versions	2020-10-30 22:06:07 +00:00
LinuxServer-CI	1d28e93bd4	Bot Updating Package Versions	2020-10-23 21:04:58 +00:00
LinuxServer-CI	96bb212f01	Bot Updating Package Versions	2020-10-16 17:03:53 -04:00
LinuxServer-CI	697422f562	Bot Updating Templated Files	2020-10-09 20:33:31 +00:00
LinuxServer-CI	ac378f43ba	Bot Updating Templated Files	2020-10-09 20:32:13 +00:00
LinuxServer-CI	9a0b4007c2	Bot Updating Package Versions	2020-09-25 20:50:59 +00:00
LinuxServer-CI	56e507ac00	Bot Updating Package Versions	2020-09-18 20:50:25 +00:00
LinuxServer-CI	792c2576a7	Bot Updating Package Versions	2020-09-11 17:01:03 -04:00
LinuxServer-CI	67a7e6c552	Bot Updating Package Versions	2020-09-04 21:01:16 +00:00
LinuxServer-CI	fbdde873f7	Bot Updating Package Versions	2020-08-21 21:07:18 +00:00
LinuxServer-CI	bfd24e534b	Bot Updating Templated Files	2020-08-21 20:32:32 +00:00
LinuxServer-CI	295fddec13	Bot Updating Package Versions	2020-08-14 21:05:38 +00:00
LinuxServer-CI	03fe7dac32	Bot Updating Package Versions	2020-08-07 21:07:30 +00:00
LinuxServer-CI	ee5d76e253	Bot Updating Templated Files	2020-08-07 22:33:04 +02:00
LinuxServer-CI	f606c97135	Bot Updating Templated Files	2020-08-07 20:32:14 +00:00
LinuxServer-CI	83de2cee53	Bot Updating Package Versions	2020-07-31 17:08:27 -04:00
LinuxServer-CI	83017ec293	Bot Updating Package Versions	2020-07-24 20:59:42 +00:00
LinuxServer-CI	474653802b	Bot Updating Package Versions	2020-07-17 21:06:05 +00:00
LinuxServer-CI	55a93380a6	Bot Updating Package Versions	2020-07-10 21:05:42 +00:00
LinuxServer-CI	a771d10578	Bot Updating Package Versions	2020-07-03 17:29:02 -04:00
LinuxServer-CI	b1c8a9bcd5	Bot Updating Package Versions	2020-06-26 17:31:08 -04:00
LinuxServer-CI	d080e4babf	Bot Updating Package Versions	2020-06-19 21:00:39 +00:00
LinuxServer-CI	f9960e8657	Bot Updating Package Versions	2020-06-12 21:05:32 +00:00
LinuxServer-CI	3723304ab1	Bot Updating Package Versions	2020-06-05 17:29:19 -04:00
LinuxServer-CI	3b1a4fb757	Bot Updating Package Versions	2020-05-29 17:04:35 -04:00
LinuxServer-CI	6d09b87b4b	Bot Updating Package Versions	2020-05-28 19:17:38 +00:00
LinuxServer-CI	d8bcdbede2	Bot Updating Templated Files	2020-05-28 18:55:04 +00:00
LinuxServer-CI	ae44672b2d	Bot Updating Package Versions	2020-05-22 17:30:50 -04:00
LinuxServer-CI	e1e16a844d	Bot Updating Package Versions	2020-05-15 21:36:15 +00:00
LinuxServer-CI	908c85cef9	Bot Updating Package Versions	2020-05-01 23:29:59 +02:00
LinuxServer-CI	70bc4411b5	Bot Updating Templated Files	2020-05-01 22:32:08 +02:00
LinuxServer-CI	37b6d51306	Bot Updating Package Versions	2020-04-24 21:27:36 +00:00
LinuxServer-CI	6421898638	Bot Updating Package Versions	2020-04-10 17:04:41 -04:00
LinuxServer-CI	14ccd60477	Bot Updating Package Versions	2020-03-27 21:59:35 +00:00
LinuxServer-CI	e7c8e745a5	Bot Updating Package Versions	2020-03-20 22:08:17 +00:00
LinuxServer-CI	e5d8063236	Bot Updating Package Versions	2020-03-13 22:23:48 +00:00
LinuxServer-CI	41e8cefb1f	Bot Updating Package Versions	2020-03-06 22:38:49 +00:00
LinuxServer-CI	e60c318640	Bot Updating Package Versions	2020-02-23 09:24:02 +00:00
thelamer	3e6b87a0a7	need noninteractive for buildstage	2020-02-23 00:35:01 -08:00
thelamer	84e4b38901	bugfixes from focal branch	2020-02-22 22:55:31 -08:00
thelamer	a448e5463e	adding bionic branch	2020-02-22 21:04:14 -08:00