Bot Updating Package Versions

build on native

.github/CONTRIBUTING.md

@@ -0,0 +1,122 @@
+# Contributing to 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 or documentation in the README please file an issue
+  * 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-rdesktop/edit/master/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/images/docker-rdesktop)
+
+### 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
+
+```
+git clone https://github.com/linuxserver/docker-rdesktop.git
+cd docker-rdesktop
+docker build \
+  --no-cache \
+  --pull \
+  -t linuxserver/rdesktop:latest .
+```
+
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+```
+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 chagelog
+
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-rdesktop/tree/master/root), add an entry to the changelog
+
+```yml
+changelogs:
+  - { date: "DD.MM.YY:", desc: "Added some love to templates" }
+```

.github/FUNDING.yml

@@ -1 +1,2 @@
+github: linuxserver
 open_collective: linuxserver

.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/images/docker-rdesktop
+    about: Documentation - information about all of our containers.

.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)

.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 -->

.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 or documentation in 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-rdesktop/blob/master/.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 -->

.github/workflows/external_trigger.yml

@@ -0,0 +1,16 @@
+name: External Trigger Main
+
+on:
+  workflow_dispatch:
+
+jobs:
+  external-trigger-i3-focal:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.3
+
+      - name: External Trigger
+        if: github.ref == 'refs/heads/i3-focal'
+        run: |
+          echo "**** No external release, exiting ****"
+          exit 0

.github/workflows/external_trigger_scheduler.yml

@@ -0,0 +1,43 @@
+name: External Trigger Scheduler
+
+on:
+  schedule:
+    - cron:  '04 * * * *'
+  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-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-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-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

.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-rdesktop/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-rdesktop/blob/master/.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-rdesktop/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger.yml

@@ -0,0 +1,38 @@
+name: Package Trigger Main
+
+on:
+  workflow_dispatch:
+
+jobs:
+  package-trigger-i3-focal:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.3
+
+      - name: Package Trigger
+        if: github.ref == 'refs/heads/i3-focal'
+        run: |
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_RDESKTOP_I3_FOCAL }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_RDESKTOP_I3_FOCAL is set; skipping trigger. ****"
+            exit 0
+          fi
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-rdesktop/job/i3-focal/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 i3-focal branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_RDESKTOP_I3_FOCAL\". ****"
+          response=$(curl -iX POST \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-rdesktop/job/i3-focal/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"

.github/workflows/package_trigger_scheduler.yml

@@ -0,0 +1,50 @@
+name: Package Trigger Scheduler
+
+on:
+  schedule:
+    - cron:  '01 15 * * 6'
+  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-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-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-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 rdesktop** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-rdesktop/activity/"' \n"}],
+            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}

.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@v1
+      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 }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/rdesktop:focal
+FROM ghcr.io/linuxserver/baseimage-rdesktop:focal
 
 # set version label
 ARG BUILD_DATE
@@ -10,13 +10,11 @@ RUN \
  echo "**** install packages ****" && \
  apt-get update && \
  DEBIAN_FRONTEND=noninteractive \
- apt-get install --no-install-recommends -y \
+ apt-get install -y \
 	firefox \
-	terminator \
-	xfce4 \
-	xfce4-goodies \
-	xubuntu-default-settings \
-	xubuntu-icon-theme && \
+	i3 \
+	i3status \
+	terminator && \
  echo "**** cleanup ****" && \
  apt-get autoclean && \
  rm -rf \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM lsiobase/rdesktop:arm64v8-focal
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-focal
 
 # set version label
 ARG BUILD_DATE
@@ -10,13 +10,11 @@ RUN \
  echo "**** install packages ****" && \
  apt-get update && \
  DEBIAN_FRONTEND=noninteractive \
- apt-get install --no-install-recommends -y \
+ apt-get install -y \
 	firefox \
-	terminator \
-	xfce4 \
-	xfce4-goodies \
-	xubuntu-default-settings \
-	xubuntu-icon-theme && \
+	i3 \
+	i3status \
+	terminator && \
  echo "**** cleanup ****" && \
  apt-get autoclean && \
  rm -rf \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM lsiobase/rdesktop:arm32v7-focal
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-focal
 
 # set version label
 ARG BUILD_DATE
@@ -10,13 +10,11 @@ RUN \
  echo "**** install packages ****" && \
  apt-get update && \
  DEBIAN_FRONTEND=noninteractive \
- apt-get install --no-install-recommends -y \
+ apt-get install -y \
 	firefox \
-	terminator \
-	xfce4 \
-	xfce4-goodies \
-	xubuntu-default-settings \
-	xubuntu-icon-theme && \
+	i3 \
+	i3status \
+	terminator && \
  echo "**** cleanup ****" && \
  apt-get autoclean && \
  rm -rf \

Jenkinsfile

@@ -41,7 +41,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}':latest 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}':i3-focal 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 +55,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 ./.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/greetings.yml ./.github/workflows/stale.yml ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -117,45 +117,47 @@ pipeline {
         }
       }
     }
-    // If this is a master build use live docker endpoints
+    // If this is a i3-focal build use live docker endpoints
     stage("Set ENV live build"){
       when {
-        branch "master"
+        branch "i3-focal"
         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
           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-i3-focal-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-i3-focal-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-i3-focal-' + 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 = 'i3-focal-' + 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 = 'i3-focal-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.EXT_RELEASE_TAG = 'i3-focal-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 "i3-focal"}
         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
           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-i3-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-i3-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-i3-focal-' + 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 = 'i3-focal-' + 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 = 'i3-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.EXT_RELEASE_TAG = 'i3-focal-version-' + env.EXT_RELEASE_CLEAN
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
         }
       }
@@ -168,15 +170,16 @@ 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
           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-i3-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-i3-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-i3-focal-' + 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 = 'i3-focal-' + 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 = 'i3-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.EXT_RELEASE_TAG = 'i3-focal-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 +192,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 +217,7 @@ pipeline {
     // Use helper containers to render templated files
     stage('Update-Templates') {
       when {
-        branch "master"
+        branch "i3-focal"
         environment name: 'CHANGE_ID', value: ''
         expression {
           env.CONTAINER_NAME != null
@@ -224,8 +227,8 @@ 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 
+              docker pull ghcr.io/linuxserver/jenkins-builder:latest
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=i3-focal -v ${TEMPDIR}:/ansible/jenkins ghcr.io/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)
@@ -233,12 +236,15 @@ pipeline {
                 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 i3-focal
                 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
+                rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md
+                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
                 cd ${TEMPDIR}/repo/${LS_REPO}/
                 git add ${TEMPLATED_FILES}
+                git rm .github/ISSUE_TEMPLATE.md || :
                 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}
@@ -247,13 +253,30 @@ 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
+              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}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/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'
                 git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
               fi
+              mkdir -p ${TEMPDIR}/unraid 
+              git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
+              git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
+              if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
+                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml
+              fi
+              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                  echo "Image is on the ignore list, skipping Unraid template upload"
+                else
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  cd ${TEMPDIR}/unraid/templates/
+                  git add unraid/${CONTAINER_NAME}.xml
+                  git commit -m 'Bot Updating Unraid Template'
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
+                fi
+              fi
               rm -Rf ${TEMPDIR}'''
         script{
           env.FILES_UPDATED = sh(
@@ -265,7 +288,7 @@ pipeline {
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
-        branch "master"
+        branch "i3-focal"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'FILES_UPDATED', value: 'true'
         expression {
@@ -308,8 +331,9 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
+        echo "Running on node: ${NODE_NAME}"
         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} ."
+        --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
@@ -321,8 +345,9 @@ pipeline {
       parallel {
         stage('Build X86') {
           steps {
+            echo "Running on node: ${NODE_NAME}"
             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} ."
+            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
           }
         }
         stage('Build ARMHF') {
@@ -330,26 +355,20 @@ pipeline {
             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 --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') {
@@ -357,26 +376,20 @@ pipeline {
             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 --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 +397,7 @@ pipeline {
     // Take the image we just built and dump package versions for comparison
     stage('Update-packages') {
       when {
-        branch "master"
+        branch "i3-focal"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -412,7 +425,7 @@ pipeline {
               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 i3-focal
                 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                 cd ${TEMPDIR}/${LS_REPO}/
                 wait
@@ -436,12 +449,19 @@ pipeline {
     // Exit the build if the package file was just updated
     stage('PACKAGE-exit') {
       when {
-        branch "master"
+        branch "i3-focal"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
+        sh '''#! /bin/bash
+              echo "Packages were updated. Cleaning up the image and exiting."
+              if [ "${MULTIARCH}" == "true" ]; then
+                docker rmi ${IMAGE}:amd64-${META_TAG}
+              else
+                docker rmi ${IMAGE}:${META_TAG}
+              fi'''
         script{
           env.EXIT_STATUS = 'ABORTED'
         }
@@ -450,7 +470,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 "i3-focal"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'false'
         environment name: 'EXIT_STATUS', value: ''
@@ -459,6 +479,13 @@ pipeline {
         }
       }
       steps {
+        sh '''#! /bin/bash
+              echo "There are no package updates. Cleaning up the image and exiting."
+              if [ "${MULTIARCH}" == "true" ]; then
+                docker rmi ${IMAGE}:amd64-${META_TAG}
+              else
+                docker rmi ${IMAGE}:${META_TAG}
+              fi'''
         script{
           env.EXIT_STATUS = 'ABORTED'
         }
@@ -475,20 +502,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/lsiodev-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 +527,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/lsiodev-ci:latest \
                 python /ci/ci.py'''
         }
       }
@@ -529,30 +556,30 @@ pipeline {
             credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
             usernameVariable: 'DOCKERUSER',
             passwordVariable: 'DOCKERPASS'
-          ],
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            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
+                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
+                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:i3-focal
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
+                    docker push ${PUSHIMAGE}:i3-focal
+                    docker push ${PUSHIMAGE}:${META_TAG}
+                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
+                  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}:latest
-                  docker push ${PUSHIMAGE}:latest
-                  docker push ${PUSHIMAGE}:${META_TAG}
-                done
-                for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
+                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
                   docker rmi \
                   ${DELETEIMAGE}:${META_TAG} \
-                  ${DELETEIMAGE}:latest || :
+                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:i3-focal || :
                 done
              '''
         }
@@ -571,80 +598,73 @@ pipeline {
             credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
             usernameVariable: 'DOCKERUSER',
             passwordVariable: 'DOCKERPASS'
-          ],
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            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
+                  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}"; 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-i3-focal
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-i3-focal
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-i3-focal
+                    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 push ${MANIFESTIMAGE}:amd64-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-i3-focal
+                    docker push ${MANIFESTIMAGE}:arm32v7-i3-focal
+                    docker push ${MANIFESTIMAGE}:arm64v8-i3-focal
+                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    docker manifest push --purge ${MANIFESTIMAGE}:i3-focal || :
+                    docker manifest create ${MANIFESTIMAGE}:i3-focal ${MANIFESTIMAGE}:amd64-i3-focal ${MANIFESTIMAGE}:arm32v7-i3-focal ${MANIFESTIMAGE}:arm64v8-i3-focal
+                    docker manifest annotate ${MANIFESTIMAGE}:i3-focal ${MANIFESTIMAGE}:arm32v7-i3-focal --os linux --arch arm
+                    docker manifest annotate ${MANIFESTIMAGE}:i3-focal ${MANIFESTIMAGE}:arm64v8-i3-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}:${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}:i3-focal
+                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
+                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
+                  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-latest
-                  docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
-                  docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
-                  docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
-                  docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                  docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                  docker push ${MANIFESTIMAGE}:amd64-latest
-                  docker push ${MANIFESTIMAGE}:arm32v7-latest
-                  docker push ${MANIFESTIMAGE}:arm64v8-latest
-                  docker manifest push --purge ${MANIFESTIMAGE}:latest || :
-                  docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
-                  docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
-                  docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --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}:latest
-                  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}:latest
-                  docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
-                  docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
-                  docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
-                  docker push ${LEGACYIMAGE}:amd64-${META_TAG}
-                  docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
-                  docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
-                  docker push ${LEGACYIMAGE}:latest
-                  docker push ${LEGACYIMAGE}:${META_TAG}
-                  docker push ${LEGACYIMAGE}:arm32v7-latest
-                  docker push ${LEGACYIMAGE}:arm64v8-latest
-                done
-             '''
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
+                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
                   docker rmi \
                   ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-latest \
+                  ${DELETEIMAGE}:amd64-i3-focal \
+                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
                   ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-latest \
+                  ${DELETEIMAGE}:arm32v7-i3-focal \
+                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
                   ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-latest || :
+                  ${DELETEIMAGE}:arm64v8-i3-focal \
+                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
                 done
                 docker rmi \
-                lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
-                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
+                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
+                ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
              '''
         }
       }
@@ -652,7 +672,7 @@ pipeline {
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
-        branch "master"
+        branch "i3-focal"
         expression {
           env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
         }
@@ -664,17 +684,17 @@ pipeline {
         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}'",\
              "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 i3-focal",\
              "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",\
+                     "target_commitish": "i3-focal",\
                      "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
+              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'''
       }
@@ -695,14 +715,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/lsiodev-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/lsiodev-readme-sync bash -c 'node sync'
+                rm -Rf ${TEMPDIR} '''
         }
       }
     }

README.md

@@ -1,13 +1,16 @@
+<!-- DO NOT EDIT THIS FILE MANUALLY  -->
+<!-- Please read the CONTRIBUTING.md -->
+
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
-[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
-[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
-[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.")
-[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
-[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.")
-[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
+[![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
+[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
+[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.")
+[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
+[![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
+[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
 
-The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :-
+The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
 
  * regular and timely application updates
  * easy user mappings (PGID, PUID)
@@ -25,16 +28,15 @@ Find us at:
 
 # [linuxserver/rdesktop](https://github.com/linuxserver/docker-rdesktop)
 
-[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-rdesktop.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-rdesktop)
-[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-rdesktop.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-rdesktop/releases)
-[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-rdesktop/packages)
-[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-rdesktop/container_registry)
-[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/rdesktop)
-[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/rdesktop.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/rdesktop "Get your own version badge on microbadger.com")
-[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/rdesktop.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/rdesktop)
-[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/rdesktop.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/rdesktop)
-[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-rdesktop/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-rdesktop/job/master/)
-[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/rdesktop/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/rdesktop/latest/index.html)
+[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-rdesktop.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-rdesktop)
+[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-rdesktop.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-rdesktop/releases)
+[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-rdesktop/packages)
+[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-rdesktop/container_registry)
+[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/rdesktop.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/rdesktop "Get your own version badge on microbadger.com")
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/rdesktop.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/rdesktop)
+[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/rdesktop.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/rdesktop)
+[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-rdesktop%2Fjob%2Fi3-focal%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-rdesktop/job/i3-focal/)
+[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Frdesktop%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/rdesktop/latest/index.html)
 
 [Rdesktop](http://xrdp.org/) - Ubuntu based containers containing full desktop environments in officially supported flavors accessible via RDP.
 
@@ -45,7 +47,7 @@ Find us at:
 
 Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `linuxserver/rdesktop` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `ghcr.io/linuxserver/rdesktop` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
 The architectures supported by this image are:
 
@@ -55,55 +57,21 @@ The architectures supported by this image are:
 | arm64 | arm64v8-latest |
 | armhf | arm32v7-latest |
 
-## Version Tags
-
-This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
-
-| Tag | Description |
-| :----: | --- |
-| latest | XFCE Focal |
-| xfce-bionic | XFCE Bionic |
-| kde-focal | KDE Focal |
-| kde-bionic | KDE Bionic |
-| lxde-focal | LXDE Focal |
-| lxde-bionic | LXDE Bionic |
-| budgie-focal | Budgie Focal |
-| budgie-bionic | Budgie Bionic |
-| mate-focal | MATE Focal |
-| mate-bionic | MATE Bionic |
-| kylin-focal | Kylin Focal |
-| kylin-bionic | Kylin Bionic |
 
 ## Usage
 
 Here are some example snippets to help you get started creating a container.
 
-### docker
-
-```
-docker create \
-  --name=rdesktop \
-  -e PUID=1000 \
-  -e PGID=1000 \
-  -e TZ=Europe/London \
-  -p 3389:3389 \
-  -v /var/run/docker.sock:/var/run/docker.sock `#optional` \
-  -v /path/to/data:/config `#optional` \
-  --restart unless-stopped \
-  linuxserver/rdesktop
-```
-
-
-### docker-compose
+### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
 
 Compatible with docker-compose v2 schemas.
 
-```
+```yaml
 ---
-version: "2"
+version: "2.1"
 services:
   rdesktop:
-    image: linuxserver/rdesktop
+    image: ghcr.io/linuxserver/rdesktop
     container_name: rdesktop
     environment:
       - PUID=1000
@@ -117,6 +85,22 @@ services:
     restart: unless-stopped
 ```
 
+### docker cli
+
+```
+docker run -d \
+  --name=rdesktop \
+  -e PUID=1000 \
+  -e PGID=1000 \
+  -e TZ=Europe/London \
+  -p 3389:3389 \
+  -v /var/run/docker.sock:/var/run/docker.sock `#optional` \
+  -v /path/to/data:/config `#optional` \
+  --restart unless-stopped \
+  ghcr.io/linuxserver/rdesktop
+```
+
+
 ## Parameters
 
 Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
@@ -132,7 +116,7 @@ Container images are configured using parameters passed at runtime (such as thos
 
 ## Environment variables from files (Docker secrets)
 
-You can set any environment variable from a file by using a special prepend `FILE__`. 
+You can set any environment variable from a file by using a special prepend `FILE__`.
 
 As an example:
 
@@ -142,6 +126,11 @@ As an example:
 
 Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
 
+## Umask for running applications
+
+For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting.
+Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support.
+
 ## User / Group Identifiers
 
 When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
@@ -173,6 +162,11 @@ By default we perform all logic for the abc user and we reccomend using that use
 All of these containers are configured with passwordless sudo, we make no efforts to secure or harden these containers and we do not reccomend ever publishing their ports to the public Internet. 
 
 
+## Docker Mods
+[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=rdesktop&query=%24.mods%5B%27rdesktop%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=rdesktop "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.")
+
+We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above.
+
 
 ## Support Info
 
@@ -181,7 +175,7 @@ All of these containers are configured with passwordless sudo, we make no effort
 * container version number
   * `docker inspect -f '{{ index .Config.Labels "build_version" }}' rdesktop`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/rdesktop`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/rdesktop`
 
 ## Updating Info
 
@@ -189,14 +183,6 @@ Most of our images are static, versioned, and require an image update and contai
 
 Below are the instructions for updating containers:
 
-### Via Docker Run/Create
-* Update the image: `docker pull linuxserver/rdesktop`
-* Stop the running container: `docker stop rdesktop`
-* Delete the container: `docker rm rdesktop`
-* Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
-* Start the new container: `docker start rdesktop`
-* You can also remove the old dangling images: `docker image prune`
-
 ### Via Docker Compose
 * Update all images: `docker-compose pull`
   * or update a single image: `docker-compose pull rdesktop`
@@ -204,7 +190,14 @@ Below are the instructions for updating containers:
   * or update a single container: `docker-compose up -d rdesktop`
 * You can also remove the old dangling images: `docker image prune`
 
-### Via Watchtower auto-updater (especially useful if you don't remember the original parameters)
+### Via Docker Run
+* Update the image: `docker pull ghcr.io/linuxserver/rdesktop`
+* Stop the running container: `docker stop rdesktop`
+* Delete the container: `docker rm rdesktop`
+* Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
+* You can also remove the old dangling images: `docker image prune`
+
+### Via Watchtower auto-updater (only use if you don't remember the original parameters)
 * Pull the latest image at its tag and replace it with the same env variables in one run:
   ```
   docker run --rm \
@@ -212,11 +205,13 @@ Below are the instructions for updating containers:
   containrrr/watchtower \
   --run-once rdesktop
   ```
-
-**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose.
-
 * You can also remove the old dangling images: `docker image prune`
 
+**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
+
+### Image Update Notifications - Diun (Docker Image Update Notifier)
+* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
+
 ## Building locally
 
 If you want to make local modifications to these images for development purposes or just to customize the logic:
@@ -226,7 +221,7 @@ cd docker-rdesktop
 docker build \
   --no-cache \
   --pull \
-  -t linuxserver/rdesktop:latest .
+  -t ghcr.io/linuxserver/rdesktop:latest .
 ```
 
 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`

jenkins-vars.yml

@@ -3,9 +3,9 @@
 # jenkins variables
 project_name: docker-rdesktop
 external_type: os
-release_type: stable
-release_tag: latest
-ls_branch: master
+release_type: prerelease
+release_tag: i3-focal
+ls_branch: i3-focal
 repo_vars:
   - BUILD_VERSION_ARG = 'OS_VERSION'
   - LS_USER = 'linuxserver'

package_versions.txt

@@ -1,480 +1,496 @@
-adduser3.118ubuntu1
-adwaita-icon-theme3.36.0-1ubuntu1
-apt1.9.10
-apt-transport-https1.9.10
-apt-utils1.9.10
-base-files11ubuntu2
+adduser3.118ubuntu2
+adwaita-icon-theme3.36.1-2ubuntu0.20.04.2
+apt2.0.2ubuntu0.2
+apt-transport-https2.0.2ubuntu0.2
+apt-utils2.0.2ubuntu0.2
+at-spi2-core2.36.0-2
+base-files11ubuntu5.2
 base-passwd3.5.47
-bash5.0-5ubuntu1
-bsdmainutils11.1.2ubuntu2
-bsdutils1:2.34-0.1ubuntu4
+bash5.0-6ubuntu1.1
+bsdmainutils11.1.2ubuntu3
+bsdutils1:2.34-0.1ubuntu9.1
 bzip21.0.8-2
-ca-certificates20190110
+ca-certificates20201027ubuntu0.20.04.1
 coreutils8.30-3ubuntu2
-cpp4:9.2.1-3.1ubuntu1
-cpp-99.2.1-31ubuntu1
-curl7.68.0-1ubuntu1
+cpp4:9.3.0-1ubuntu2
+cpp-99.3.0-17ubuntu1~20.04
+curl7.68.0-1ubuntu2.4
 dash0.5.10.2-6
-dbus1.12.16-2ubuntu2
-dbus-user-session1.12.16-2ubuntu2
-dbus-x111.12.16-2ubuntu2
+dbus1.12.16-2ubuntu2.1
+dbus-x111.12.16-2ubuntu2.1
 dconf-gsettings-backend0.36.0-1
 dconf-service0.36.0-1
 debconf1.5.73
 debianutils4.9.1
-desktop-file-utils0.24-1ubuntu2
 diffutils1:3.7-3
-dirmngr2.2.17-3ubuntu1
-distro-info-data0.43ubuntu1
-docker-ce-cli5:19.03.8~3-0~ubuntu-bionic
-dpkg1.19.7ubuntu2
-e2fsprogs1.45.3-4ubuntu2
-elementary-xfce-icon-theme0.14-1
-exo-utils0.12.11-1
-fdisk2.34-0.1ubuntu4
-findutils4.6.0+git+20190209-2ubuntu1
-firefox74.0+build3-0ubuntu1
-fontconfig2.13.1-2ubuntu2
-fontconfig-config2.13.1-2ubuntu2
+dirmngr2.2.19-3ubuntu2
+distro-info-data0.43ubuntu1.4
+docker-ce-cli5:20.10.2~3-0~ubuntu-bionic
+dpkg1.19.7ubuntu3
+dunst1.4.1-1
+e2fsprogs1.45.5-2ubuntu1
+fdisk2.34-0.1ubuntu9.1
+findutils4.7.0-1ubuntu1
+firefox84.0.2+build1-0ubuntu0.20.04.1
+fontconfig2.13.1-2ubuntu3
+fontconfig-config2.13.1-2ubuntu3
 fonts-dejavu-core2.37-1
-fonts-noto-core20200103-3
-fonts-noto-hinted20200103-3
-fonts-noto-ui-core20200103-3
-fonts-ubuntu0.83-4ubuntu1
 gawk1:5.0.1+dfsg-1
-gcc-10-base10-20200304-1ubuntu1
-gcc-9-base9.2.1-31ubuntu1
-gir1.2-atk-1.02.35.1-1ubuntu1
-gir1.2-freedesktop1.64.0-1
-gir1.2-gdkpixbuf-2.02.40.0+dfsg-3
-gir1.2-glib-2.01.64.0-1
-gir1.2-gtk-3.03.24.14-1ubuntu1
-gir1.2-packagekitglib-1.01.1.13-2build1
-gir1.2-pango-1.01.44.7-1ubuntu3
-gir1.2-vte-2.910.59.91-0ubuntu1
-glib-networking2.63.91-1ubuntu1
-glib-networking-common2.63.91-1ubuntu1
-glib-networking-services2.63.91-1ubuntu1
-gnupg2.2.17-3ubuntu1
-gnupg22.2.17-3ubuntu1
-gnupg-l10n2.2.17-3ubuntu1
-gnupg-utils2.2.17-3ubuntu1
-gpg2.2.17-3ubuntu1
-gpg-agent2.2.17-3ubuntu1
-gpgconf2.2.17-3ubuntu1
-gpgsm2.2.17-3ubuntu1
-gpgv2.2.17-3ubuntu1
-gpg-wks-client2.2.17-3ubuntu1
-gpg-wks-server2.2.17-3ubuntu1
-grep3.3-1build1
-greybird-gtk-theme3.22.11-0ubuntu1
-groff-base1.22.4-4
-gsettings-desktop-schemas3.35.91-0ubuntu1
-gtk2-engines-murrine0.98.2-3
-gtk-update-icon-cache3.24.14-1ubuntu1
+gcc-10-base10.2.0-5ubuntu1~20.04
+gcc-9-base9.3.0-17ubuntu1~20.04
+gir1.2-atk-1.02.35.1-1ubuntu2
+gir1.2-freedesktop1.64.1-1~ubuntu20.04.1
+gir1.2-gdkpixbuf-2.02.40.0+dfsg-3ubuntu0.1
+gir1.2-glib-2.01.64.1-1~ubuntu20.04.1
+gir1.2-gtk-3.03.24.20-0ubuntu1
+gir1.2-keybinder-3.00.3.2-1ubuntu1
+gir1.2-notify-0.70.7.9-1ubuntu2
+gir1.2-packagekitglib-1.01.1.13-2ubuntu1.1
+gir1.2-pango-1.01.44.7-2ubuntu4
+gir1.2-vte-2.910.60.3-0ubuntu1~20.04
+glib-networking2.64.2-1ubuntu0.1
+glib-networking-common2.64.2-1ubuntu0.1
+glib-networking-services2.64.2-1ubuntu0.1
+gnupg2.2.19-3ubuntu2
+gnupg22.2.19-3ubuntu2
+gnupg-l10n2.2.19-3ubuntu2
+gnupg-utils2.2.19-3ubuntu2
+gpg2.2.19-3ubuntu2
+gpg-agent2.2.19-3ubuntu2
+gpgconf2.2.19-3ubuntu2
+gpgsm2.2.19-3ubuntu2
+gpgv2.2.19-3ubuntu2
+gpg-wks-client2.2.19-3ubuntu2
+gpg-wks-server2.2.19-3ubuntu2
+grep3.4-1
+groff-base1.22.4-4build1
+gsettings-desktop-schemas3.36.0-1ubuntu1
+gtk-update-icon-cache3.24.20-0ubuntu1
 gzip1.10-0ubuntu4
 hicolor-icon-theme0.17-2
 hostname3.23
 humanity-icon-theme0.6.15
+i34.17.1-1
+i3lock2.11.1-1
+i3status2.13-2
+i3-wm4.17.1-1
 init-system-helpers1.57
 iso-codes4.4-1
-keyboard-configuration1.194ubuntu2
-krb5-locales1.17-6ubuntu4
-libacl12.2.53-5ubuntu1
-libapparmor12.13.3-7ubuntu2
-libappstream40.12.10-1
-libapt-pkg5.901.9.10
+keyboard-configuration1.194ubuntu3
+krb5-locales1.17-6ubuntu4.1
+libacl12.2.53-6
+libanyevent-i3-perl0.17-1
+libanyevent-perl7.170-1
+libapparmor12.13.3-7ubuntu5.1
+libappstream40.12.10-2
+libapt-pkg6.02.0.2ubuntu0.2
 libargon2-10~20171227-0.2
-libasn1-8-heimdal7.7.0+dfsg-1
-libasound21.2.2-2ubuntu1
-libasound2-data1.2.2-2ubuntu1
+libasn1-8-heimdal7.7.0+dfsg-1ubuntu1
+libasound21.2.2-2.1ubuntu2.3
+libasound2-data1.2.2-2.1ubuntu2.3
 libasound2-plugins1.2.2-1ubuntu1
 libassuan02.5.3-7ubuntu2
+libasync-interrupt-perl1.25-1build1
 libasyncns00.8-6
-libatk1.0-02.35.1-1ubuntu1
-libatk1.0-data2.35.1-1ubuntu1
-libatk-bridge2.0-02.34.1-2ubuntu1
-libatspi2.0-02.36.0-1
+libatk1.0-02.35.1-1ubuntu2
+libatk1.0-data2.35.1-1ubuntu2
+libatk-bridge2.0-02.34.2-0ubuntu2~20.04.1
+libatspi2.0-02.36.0-2
 libattr11:2.4.48-5
-libaudit11:2.8.5-2ubuntu5
-libaudit-common1:2.8.5-2ubuntu5
-libavahi-client30.7-4ubuntu6
-libavahi-common30.7-4ubuntu6
-libavahi-common-data0.7-4ubuntu6
-libblkid12.34-0.1ubuntu4
-libbrotli11.0.7-6build1
+libaudit11:2.8.5-2ubuntu6
+libaudit-common1:2.8.5-2ubuntu6
+libauthen-sasl-perl2.1600-1
+libavahi-client30.7-4ubuntu7
+libavahi-common30.7-4ubuntu7
+libavahi-common-data0.7-4ubuntu7
+libblkid12.34-0.1ubuntu9.1
+libbrotli11.0.7-6ubuntu0.1
 libbsd00.10.0-1
-libburn41.5.2-1
 libbz2-1.01.0.8-2
-libc62.30-0ubuntu3
+libc62.31-0ubuntu9.1
 libcairo21.16.0-4ubuntu1
 libcairo-gobject21.16.0-4ubuntu1
+libcanberra00.30-7ubuntu1
 libcap21:2.32-1
 libcap2-bin1:2.32-1
-libcap-ng00.7.9-2.1
-libc-bin2.30-0ubuntu3
-libcolord21.4.4-1ubuntu2
-libcom-err21.45.3-4ubuntu2
-libcroco30.6.13-1
-libcryptsetup122:2.2.2-3ubuntu2
-libcups22.3.1-9ubuntu1
-libcurl47.68.0-1ubuntu1
+libcap-ng00.7.9-2.1build1
+libc-bin2.31-0ubuntu9.1
+libcolord21.4.4-2
+libcom-err21.45.5-2ubuntu1
+libcommon-sense-perl3.74-2build6
+libconfuse23.2.2+dfsg-1
+libconfuse-common3.2.2+dfsg-1
+libcrypt11:4.4.10-10ubuntu4
+libcryptsetup122:2.2.2-3ubuntu2.3
+libcups22.3.1-9ubuntu1.1
+libcurl47.68.0-1ubuntu2.4
+libdata-dump-perl1.23-1
 libdatrie10.2.12-3
-libdb5.35.3.28+dfsg1-0.6ubuntu1
-libdbus-1-31.12.16-2ubuntu2
+libdb5.35.3.28+dfsg1-0.6ubuntu2
+libdbus-1-31.12.16-2ubuntu2.1
 libdbus-glib-1-20.110-5fakssync1
+libdbusmenu-glib416.04.1+18.10.20180917-0ubuntu6
+libdbusmenu-gtk3-416.04.1+18.10.20180917-0ubuntu6
 libdconf10.36.0-1
-libdebconfclient00.250ubuntu2
+libdebconfclient00.251ubuntu1
 libdevmapper1.02.12:1.02.167-1ubuntu1
-libdrm22.4.100-4
-libdrm-amdgpu12.4.100-4
-libdrm-common2.4.100-4
-libdrm-intel12.4.100-4
-libdrm-nouveau22.4.100-4
-libdrm-radeon12.4.100-4
+libdrm22.4.102-1ubuntu1~20.04.1
+libdrm-amdgpu12.4.102-1ubuntu1~20.04.1
+libdrm-common2.4.102-1ubuntu1~20.04.1
+libdrm-intel12.4.102-1ubuntu1~20.04.1
+libdrm-nouveau22.4.102-1ubuntu1~20.04.1
+libdrm-radeon12.4.102-1ubuntu1~20.04.1
 libedit23.1-20191231-1
-libegl11.3.1-1
-libegl-mesa020.0.0-1ubuntu1
+libegl11.3.2-1~ubuntu0.20.04.1
+libegl-mesa020.2.6-0ubuntu0.20.04.1
 libelf10.176-1.1build1
+libencode-locale-perl1.05-1
 libepoxy01.5.4-1
-libexif120.6.21-6
-libexo-1-00.12.11-1
-libexo-2-00.12.11-1
-libexo-common0.12.11-1
-libexo-helpers0.12.11-1
-libexpat12.2.9-1
-libext2fs21.45.3-4ubuntu2
-libfdisk12.34-0.1ubuntu4
-libffi63.2.1-9
-libffi73.3-3
-libflac81.3.3-1
-libfontconfig12.13.1-2ubuntu2
+libev41:4.31-1
+libev-perl4.32-1
+libexpat12.2.9-1build1
+libext2fs21.45.5-2ubuntu1
+libfdisk12.34-0.1ubuntu9.1
+libffi73.3-4
+libfile-basedir-perl0.08-1
+libfile-desktopentry-perl0.22-1
+libfile-listing-perl6.04-1
+libfile-mimeinfo-perl0.29-1
+libflac81.3.3-1build1
+libfont-afm-perl1.20-2
+libfontconfig12.13.1-2ubuntu3
 libfontenc11:1.1.4-0ubuntu1
-libfreetype62.10.1-2
+libfreetype62.10.1-2ubuntu0.1
 libfribidi01.0.8-2
-libfuse22.9.9-2
-libgarcon-1-00.6.4-1
-libgarcon-common0.6.4-1
-libgarcon-gtk3-1-00.6.4-1
-libgbm120.0.0-1ubuntu1
-libgcc11:10-20200304-1ubuntu1
-libgcc-s110-20200304-1ubuntu1
-libgcrypt201.8.5-3ubuntu1
+libfuse22.9.9-3
+libgbm120.2.6-0ubuntu0.20.04.1
+libgcc-s110.2.0-5ubuntu1~20.04
+libgcrypt201.8.5-5ubuntu1
 libgdbm61.18.1-5
-libgdk-pixbuf2.0-02.40.0+dfsg-3
-libgdk-pixbuf2.0-common2.40.0+dfsg-3
-libgirepository-1.0-11.63.2-1
-libgl11.3.1-1
-libgl1-mesa-dri20.0.0-1ubuntu1
-libglapi-mesa20.0.0-1ubuntu1
-libglib2.0-02.64.0-1
-libglib2.0-bin2.64.0-1
-libglib2.0-data2.64.0-1
-libglvnd01.3.1-1
-libglx01.3.1-1
-libglx-mesa020.0.0-1ubuntu1
-libgmp102:6.1.2+dfsg-4
-libgnutls303.6.11.1-2
-libgomp110-20200304-1ubuntu1
-libgpg-error01.36-7
-libgraphite2-31.3.13-11
-libgssapi3-heimdal7.7.0+dfsg-1
-libgssapi-krb5-21.17-6ubuntu4
+libgdbm-compat41.18.1-5
+libgdk-pixbuf2.0-02.40.0+dfsg-3ubuntu0.1
+libgdk-pixbuf2.0-bin2.40.0+dfsg-3ubuntu0.1
+libgdk-pixbuf2.0-common2.40.0+dfsg-3ubuntu0.1
+libgirepository-1.0-11.64.1-1~ubuntu20.04.1
+libgl11.3.2-1~ubuntu0.20.04.1
+libgl1-mesa-dri20.2.6-0ubuntu0.20.04.1
+libglapi-mesa20.2.6-0ubuntu0.20.04.1
+libglib2.0-02.64.3-1~ubuntu20.04.1
+libglib2.0-bin2.64.3-1~ubuntu20.04.1
+libglib2.0-data2.64.3-1~ubuntu20.04.1
+libglvnd01.3.2-1~ubuntu0.20.04.1
+libglx01.3.2-1~ubuntu0.20.04.1
+libglx-mesa020.2.6-0ubuntu0.20.04.1
+libgmp102:6.2.0+dfsg-4
+libgnutls303.6.13-2ubuntu1.3
+libgomp110.2.0-5ubuntu1~20.04
+libgpg-error01.37-1
+libgraphite2-31.3.13-11build1
+libgssapi3-heimdal7.7.0+dfsg-1ubuntu1
+libgssapi-krb5-21.17-6ubuntu4.1
 libgstreamer1.0-01.16.2-2
-libgstreamer-plugins-base1.0-01.16.2-2ubuntu4
-libgtk2.0-02.24.32-4ubuntu4
-libgtk2.0-common2.24.32-4ubuntu4
-libgtk-3-03.24.14-1ubuntu1
-libgtk-3-common3.24.14-1ubuntu1
-libgtksourceview-3.0-13.24.11-2
-libgtksourceview-3.0-common3.24.11-2
-libgudev-1.0-01:233-1
-libharfbuzz0b2.6.4-1ubuntu2
-libhcrypto4-heimdal7.7.0+dfsg-1
-libheimbase1-heimdal7.7.0+dfsg-1
-libheimntlm0-heimdal7.7.0+dfsg-1
+libgstreamer-plugins-base1.0-01.16.2-4
+libgtk-3-03.24.20-0ubuntu1
+libgtk-3-bin3.24.20-0ubuntu1
+libgtk-3-common3.24.20-0ubuntu1
+libguard-perl1.023-1build5
+libharfbuzz0b2.6.4-1ubuntu4
+libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1
+libheimbase1-heimdal7.7.0+dfsg-1ubuntu1
+libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1
 libhogweed53.5.1+really3.5.1-2
-libhx509-5-heimdal7.7.0+dfsg-1
+libhtml-format-perl2.12-1
+libhtml-form-perl6.07-1
+libhtml-parser-perl3.72-5
+libhtml-tagset-perl3.20-4
+libhtml-tree-perl5.07-2
+libhttp-cookies-perl6.08-1
+libhttp-daemon-perl6.06-1
+libhttp-date-perl6.05-1
+libhttp-message-perl6.22-1
+libhttp-negotiate-perl6.01-1
+libhx509-5-heimdal7.7.0+dfsg-1ubuntu1
 libice62:1.0.10-0ubuntu1
-libicu6565.1-1ubuntu2
+libicu6666.1-2ubuntu2
 libidn2-02.2.0-2
-libindicator3-716.10.0+18.04.20180321.1-0ubuntu4
+libio-html-perl1.001-1
+libio-socket-ssl-perl2.067-1
+libio-stringy-perl2.111-3
 libip4tc21.8.4-3ubuntu2
+libipc-system-simple-perl1.26-1
 libisl220.22.1-1
-libisofs61.5.2-1
-libjack-jackd2-01.9.12~dfsg-2build2
+libjack-jackd2-01.9.12~dfsg-2ubuntu2
 libjbig02.1-3.1build1
 libjpeg88c-2ubuntu8
-libjpeg-turbo82.0.3-0ubuntu1
-libjson-c40.13.1+dfsg-7
-libjson-glib-1.0-01.4.4-2ubuntu1
-libjson-glib-1.0-common1.4.4-2ubuntu1
-libjte21.22-3build1
-libk5crypto31.17-6ubuntu4
-libkeybinder-3.0-00.3.2-1
+libjpeg-turbo82.0.3-0ubuntu1.20.04.1
+libjson-c40.13.1+dfsg-7ubuntu0.3
+libjson-glib-1.0-01.4.4-2ubuntu2
+libjson-glib-1.0-common1.4.4-2ubuntu2
+libjson-xs-perl4.020-1build1
+libk5crypto31.17-6ubuntu4.1
+libkeybinder-3.0-00.3.2-1ubuntu1
 libkeyutils11.6-6ubuntu1
-libkmod227-1ubuntu1
-libkrb5-26-heimdal7.7.0+dfsg-1
-libkrb5-31.17-6ubuntu4
-libkrb5support01.17-6ubuntu4
+libkmod227-1ubuntu2
+libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1
+libkrb5-31.17-6ubuntu4.1
+libkrb5support01.17-6ubuntu4.1
 libksba81.3.5-2
 liblcms2-22.9-4
-libldap-2.4-22.4.49+dfsg-1ubuntu1
-libldap-common2.4.49+dfsg-1ubuntu1
-liblightdm-gobject-1-01.30.0-0ubuntu3.1
-libllvm91:9.0.1-9ubuntu1
-liblmdb00.9.23-0ubuntu1
+libldap-2.4-22.4.49+dfsg-2ubuntu1.5
+libldap-common2.4.49+dfsg-2ubuntu1.5
+libllvm111:11.0.0-2~ubuntu20.04.1
+liblmdb00.9.24-1
 liblocale-gettext-perl1.07-4
-libltdl72.4.6-13
+libltdl72.4.6-14
+liblwp-mediatypes-perl6.04-1
+liblwp-protocol-https-perl6.07-2ubuntu2
 liblz4-11.9.2-2
-liblzma55.2.4-1
-libmagic11:5.38-4
-libmagic-mgc1:5.38-4
-libmount12.34-0.1ubuntu4
+liblzma55.2.4-1ubuntu1
+libmailtools-perl2.21-1
+libmount12.34-0.1ubuntu9.1
 libmpc31.1.0-1
 libmpdec22.4.2-3
 libmpfr64.0.2-1
-libncurses66.1+20191019-1ubuntu1
-libncursesw66.1+20191019-1ubuntu1
+libncurses66.2-0ubuntu2
+libncursesw66.2-0ubuntu2
+libnet-dbus-perl1.2.0-1
+libnet-http-perl6.19-1
+libnet-smtp-ssl-perl1.04-1
+libnet-ssleay-perl1.88-2ubuntu1
 libnettle73.5.1+really3.5.1-2
-libnewt0.520.52.21-4ubuntu2
-libnghttp2-141.40.0-1
-libnotify40.7.8-1ubuntu4
+libnghttp2-141.40.0-1build1
+libnl-3-2003.4.0-1
+libnl-genl-3-2003.4.0-1
+libnotify40.7.9-1ubuntu2
 libnpth01.6-1
 libogg01.3.4-0ubuntu1
 libopus01.3.1-0ubuntu1
 liborc-0.4-01:0.4.31-1
-libp11-kit00.23.18.1-2
-libpackagekit-glib2-181.1.13-2build1
-libpam0g1.3.1-5ubuntu4
-libpam-modules1.3.1-5ubuntu4
-libpam-modules-bin1.3.1-5ubuntu4
-libpam-runtime1.3.1-5ubuntu4
-libpam-systemd244.3-1ubuntu1
-libpango-1.0-01.44.7-1ubuntu3
-libpangocairo-1.0-01.44.7-1ubuntu3
-libpangoft2-1.0-01.44.7-1ubuntu3
-libpangoxft-1.0-01.44.7-1ubuntu3
+libp11-kit00.23.20-1ubuntu0.1
+libpackagekit-glib2-181.1.13-2ubuntu1.1
+libpam0g1.3.1-5ubuntu4.1
+libpam-modules1.3.1-5ubuntu4.1
+libpam-modules-bin1.3.1-5ubuntu4.1
+libpam-runtime1.3.1-5ubuntu4.1
+libpam-systemd245.4-4ubuntu3.4
+libpango-1.0-01.44.7-2ubuntu4
+libpangocairo-1.0-01.44.7-2ubuntu4
+libpangoft2-1.0-01.44.7-2ubuntu4
+libpangoxft-1.0-01.44.7-2ubuntu4
 libpciaccess00.16-0ubuntu1
 libpcre2-8-010.34-7
-libpcre32:8.39-12
+libpcre32:8.39-12build1
+libperl5.305.30.0-9ubuntu0.2
 libpipeline11.5.2-2build1
 libpixman-1-00.38.4-0ubuntu1
-libplymouth50.9.4git20200109-0ubuntu8
 libpng16-161.6.37-2
 libpolkit-agent-1-00.105-26ubuntu1
 libpolkit-gobject-1-00.105-26ubuntu1
-libprocps72:3.3.15-2ubuntu3
-libproxy1v50.4.15-9ubuntu1
-libpsl50.20.2-2
+libprocps82:3.3.16-1ubuntu2
+libproxy1v50.4.15-10ubuntu1.2
+libpsl50.21.0-1ubuntu1
 libpthread-stubs0-dev0.4-1
-libpulse01:13.99.1-1ubuntu1
-libpulsedsp1:13.99.1-1ubuntu1
-libpulse-mainloop-glib01:13.99.1-1ubuntu1
-libpython3.8-minimal3.8.2-1
-libpython3.8-stdlib3.8.2-1
-libpython3-stdlib3.8.0-3ubuntu1
-libqrencode44.0.2-2
+libpulse01:13.99.1-1ubuntu3.8
+libpulsedsp1:13.99.1-1ubuntu3.8
+libpython3.8-minimal3.8.5-1~20.04
+libpython3.8-stdlib3.8.5-1~20.04
+libpython3-stdlib3.8.2-0ubuntu2
 libreadline88.0-4
 librest-0.7-00.8.1-1
-libroken18-heimdal7.7.0+dfsg-1
-librsvg2-22.46.4-1ubuntu1
-librsvg2-common2.46.4-1ubuntu1
+libroken18-heimdal7.7.0+dfsg-1ubuntu1
+librsvg2-22.48.9-1ubuntu0.20.04.1
+librsvg2-common2.48.9-1ubuntu0.20.04.1
 librtmp12.4+20151223.gitfa8646d.1-2build1
 libsamplerate00.1.9-2
 libsasl2-22.1.27+dfsg-2
 libsasl2-modules2.1.27+dfsg-2
 libsasl2-modules-db2.1.27+dfsg-2
-libseccomp22.4.2-2ubuntu2
-libselinux13.0-1
-libsemanage13.0-1
-libsemanage-common3.0-1
+libseccomp22.4.3-1ubuntu3.20.04.3
+libselinux13.0-1build2
+libsemanage13.0-1build2
+libsemanage-common3.0-1build2
 libsensors51:3.6.0-2ubuntu1
 libsensors-config1:3.6.0-2ubuntu1
 libsepol13.0-1
 libsigsegv22.12-2
-libslang22.3.2-4
 libsm62:1.2.3-1
-libsmartcols12.34-0.1ubuntu4
-libsnapd-glib11.56-0ubuntu1
+libsmartcols12.34-0.1ubuntu9.1
+libsnapd-glib11.58-0ubuntu0.20.04.0
 libsndfile11.0.28-7
-libsoup2.4-12.69.90-1
-libsoup-gnome2.4-12.69.90-1
+libsoup2.4-12.70.0-1
+libsoup-gnome2.4-12.70.0-1
 libsoxr00.1.3-2build1
 libspeexdsp11.2~rc1.2-1.1ubuntu1
-libsqlite3-03.31.1-3
-libss21.45.3-4ubuntu2
-libssh-40.9.3-2ubuntu1
-libssl1.11.1.1d-2ubuntu6
+libsqlite3-03.31.1-4ubuntu0.2
+libss21.45.5-2ubuntu1
+libssh-40.9.3-2ubuntu2.1
+libssl1.11.1.1f-1ubuntu2.1
 libstartup-notification00.12-6
-libstdc++610-20200304-1ubuntu1
+libstdc++610.2.0-5ubuntu1~20.04
 libstemmer0d0+svn585-2
-libsystemd0244.3-1ubuntu1
-libtag1v51.11.1+dfsg.1-0.3ubuntu1
-libtag1v5-vanilla1.11.1+dfsg.1-0.3ubuntu1
-libtagc01.11.1+dfsg.1-0.3ubuntu1
-libtasn1-64.15.0-2
+libsystemd0245.4-4ubuntu3.4
+libtasn1-64.16.0-2
 libtdb11.4.2-3build1
+libtext-iconv-perl1.7-7
 libthai00.1.28-3
 libthai-data0.1.28-3
-libthunarx-3-01.8.12-1
-libtiff54.1.0+git191117-2
-libtinfo66.1+20191019-1ubuntu1
-libuchardet00.0.6-3
-libudev1244.3-1ubuntu1
-libunique-1.0-01.1.6-6
+libtie-ixhash-perl1.23-2
+libtiff54.1.0+git191117-2build1
+libtimedate-perl2.3200-1
+libtinfo66.2-0ubuntu2
+libtry-tiny-perl0.30-1
+libtypes-serialiser-perl1.0-1
+libuchardet00.0.6-3build1
+libudev1245.4-4ubuntu3.4
 libunistring20.9.10-2
-libunwind81.2.1-9
-libupower-glib30.99.11-1build2
-libutempter01.1.6-4
-libuuid12.34-0.1ubuntu4
+libunwind81.2.1-9build1
+liburi-perl1.76-2
+libuuid12.34-0.1ubuntu9.1
 libvorbis0a1.3.6-2ubuntu1
 libvorbisenc21.3.6-2ubuntu1
-libvte-2.91-00.59.91-0ubuntu1
-libvte-2.91-common0.59.91-0ubuntu1
+libvorbisfile31.3.6-2ubuntu1
+libvte-2.91-00.60.3-0ubuntu1~20.04
+libvte-2.91-common0.60.3-0ubuntu1~20.04
 libvulkan11.2.131.2-1
 libwayland-client01.18.0-1
 libwayland-cursor01.18.0-1
 libwayland-egl11.18.0-1
 libwayland-server01.18.0-1
 libwebp60.6.1-2
-libwebrtc-audio-processing10.3.1-0ubuntu2
-libwind0-heimdal7.7.0+dfsg-1
-libwnck-3-03.32.0-1
-libwnck-3-common3.32.0-1
+libwebrtc-audio-processing10.3.1-0ubuntu3
+libwind0-heimdal7.7.0+dfsg-1ubuntu1
 libwrap07.6.q-30
-libx11-62:1.6.9-2
-libx11-data2:1.6.9-2
-libx11-dev2:1.6.9-2
-libx11-xcb12:1.6.9-2
+libwww-perl6.43-1
+libwww-robotrules-perl6.02-1
+libx11-62:1.6.9-2ubuntu1.1
+libx11-data2:1.6.9-2ubuntu1.1
+libx11-dev2:1.6.9-2ubuntu1.1
+libx11-protocol-perl0.56-7
+libx11-xcb12:1.6.9-2ubuntu1.1
 libxau61:1.0.9-0ubuntu1
 libxau-dev1:1.0.9-0ubuntu1
 libxaw72:1.0.13-1
-libxcb11.13.1-5build1
-libxcb1-dev1.13.1-5build1
-libxcb-dri2-01.13.1-5build1
-libxcb-dri3-01.13.1-5build1
-libxcb-glx01.13.1-5build1
-libxcb-present01.13.1-5build1
-libxcb-render01.13.1-5build1
-libxcb-shape01.13.1-5build1
-libxcb-shm01.13.1-5build1
-libxcb-sync11.13.1-5build1
+libxcb11.14-2
+libxcb1-dev1.14-2
+libxcb-cursor00.1.1-4ubuntu1
+libxcb-dri2-01.14-2
+libxcb-dri3-01.14-2
+libxcb-glx01.14-2
+libxcb-icccm40.4.1-1.1
+libxcb-image00.4.0-1build1
+libxcb-keysyms10.4.0-1build1
+libxcb-present01.14-2
+libxcb-randr01.14-2
+libxcb-render01.14-2
+libxcb-render-util00.3.9-1build1
+libxcb-shape01.14-2
+libxcb-shm01.14-2
+libxcb-sync11.14-2
 libxcb-util10.4.0-0ubuntu3
-libxcb-xfixes01.13.1-5build1
-libxcomposite11:0.4.5-0ubuntu1
+libxcb-xfixes01.14-2
+libxcb-xinerama01.14-2
+libxcb-xkb11.14-2
+libxcb-xrm01.0-3
+libxcomposite11:0.4.5-1
 libxcursor11:1.2.0-2
-libxdamage11:1.1.5-1
+libxdamage11:1.1.5-2
 libxdmcp61:1.1.3-0ubuntu1
 libxdmcp-dev1:1.1.3-0ubuntu1
 libxext62:1.3.4-0ubuntu1
-libxfce4panel-2.0-44.14.3-1
-libxfce4ui-1-04.14.1-1ubuntu1
-libxfce4ui-2-04.14.1-1ubuntu1
-libxfce4ui-common4.14.1-1ubuntu1
-libxfce4ui-utils4.14.1-1ubuntu1
-libxfce4util74.14.0-1
-libxfce4util-common4.14.0-1
-libxfconf-0-34.14.1-1
-libxfixes31:5.0.3-1
+libxfixes31:5.0.3-2
 libxfont21:2.0.3-1
 libxft22.3.3-0ubuntu1
 libxi62:1.7.10-0ubuntu1
 libxinerama12:1.1.4-2
 libxkbcommon00.10.0-1
-libxkbfile11:1.1.0-0ubuntu1
-libxklavier165.4-4
-libxml22.9.10+dfsg-1ubuntu3
+libxkbcommon-x11-00.10.0-1
+libxkbfile11:1.1.0-1
+libxml22.9.10+dfsg-5
+libxml-parser-perl2.46-1
+libxml-twig-perl1:3.50-2
+libxml-xpathengine-perl0.14-1
 libxmu62:1.1.3-0ubuntu1
 libxmuu12:1.1.3-0ubuntu1
-libxnvctrl0440.64-0ubuntu1
 libxpm41:3.5.12-1
-libxpresent11.0.0-2build1
 libxrandr22:1.5.2-0ubuntu1
 libxrender11:0.9.10-1
-libxres12:1.2.0-3
 libxshmfence11.3-1
+libxss11:1.2.3-1
 libxt61:1.1.5-1
 libxtst62:1.2.3-1
 libxv12:1.0.11-1
 libxxf86dga12:1.1.5-0ubuntu1
 libxxf86vm11:1.1.4-1build1
+libyajl22.1.0-3
 libyaml-0-20.2.2-1
-libzstd11.4.4+dfsg-1
-lightdm-gtk-greeter2.0.6-0ubuntu1
-locales2.30-0ubuntu3
-login1:4.5-1.1ubuntu4
-logsave1.45.3-4ubuntu2
+libzstd11.4.4+dfsg-3
+locales2.31-0ubuntu9.1
+login1:4.8.1-1ubuntu5.20.04
+logsave1.45.5-2ubuntu1
 lsb-base11.1.0ubuntu2
 lsb-release11.1.0ubuntu2
 man-db2.9.1-1
-mawk1.3.3-17ubuntu3
+mawk1.3.4.20200120-2
 mime-support3.64ubuntu1
-mount2.34-0.1ubuntu4
-mousepad0.4.2-1
-ncurses-base6.1+20191019-1ubuntu1
-ncurses-bin6.1+20191019-1ubuntu1
-numix-gtk-theme2.6.7-5
-openssl1.1.1d-2ubuntu6
-packagekit1.1.13-2build1
-passwd1:4.5-1.1ubuntu4
-perl-base5.30.0-9
-pinentry-curses1.1.0-3
-plymouth0.9.4git20200109-0ubuntu8
-plymouth-label0.9.4git20200109-0ubuntu8
-plymouth-theme-ubuntu-text0.9.4git20200109-0ubuntu8
-plymouth-theme-xubuntu-logo20.04
-plymouth-theme-xubuntu-text20.04
+mount2.34-0.1ubuntu9.1
+ncurses-base6.2-0ubuntu2
+ncurses-bin6.2-0ubuntu2
+netbase6.1
+openssl1.1.1f-1ubuntu2.1
+packagekit1.1.13-2ubuntu1.1
+passwd1:4.8.1-1ubuntu5.20.04
+perl5.30.0-9ubuntu0.2
+perl-base5.30.0-9ubuntu0.2
+perl-modules-5.305.30.0-9ubuntu0.2
+perl-openssl-defaults4
+pinentry-curses1.1.0-3build1
 policykit-10.105-26ubuntu1
-procps2:3.3.15-2ubuntu3
-publicsuffix20200201.2258-1
-pulseaudio1:13.99.1-1ubuntu1
-pulseaudio-utils1:13.99.1-1ubuntu1
-python33.8.0-3ubuntu1
-python3.83.8.2-1
-python3.8-minimal3.8.2-1
-python3-apt1.9.7
+procps2:3.3.16-1ubuntu2
+publicsuffix20200303.0012-1
+pulseaudio1:13.99.1-1ubuntu3.8
+pulseaudio-utils1:13.99.1-1ubuntu3.8
+python33.8.2-0ubuntu2
+python3.83.8.5-1~20.04
+python3.8-minimal3.8.5-1~20.04
+python3-apt2.0.0ubuntu0.20.04.3
 python3-cairo1.16.2-2ubuntu2
 python3-certifi2019.11.28-1
 python3-chardet3.0.4-4build1
-python3-configobj5.0.6-3build1
+python3-configobj5.0.6-4
 python3-dbus1.2.16-1build1
-python3-gi3.34.0-6build1
-python3-gi-cairo3.34.0-6build1
-python3-idna2.6-2build1
-python3-minimal3.8.0-3ubuntu1
+python3-gi3.36.0-1
+python3-gi-cairo3.36.0-1
+python3-idna2.8-1
+python3-minimal3.8.2-0ubuntu2
 python3-pkg-resources45.2.0-1
 python3-psutil5.5.1-1ubuntu4
-python3-requests2.22.0-2build1
+python3-requests2.22.0-2ubuntu1
 python3-requests-unixsocket0.2.0-2
 python3-six1.14.0-2
-python3-software-properties0.98.7
-python3-urllib31.25.8-1
-python-apt-common1.9.7
+python3-software-properties0.98.9.3
+python3-urllib31.25.8-2ubuntu0.1
+python-apt-common2.0.0ubuntu0.20.04.3
 readline-common8.0-4
-ristretto0.10.0-1
 sed4.7-1
 sensible-utils0.0.12+nmu1
-shared-mime-info1.10-1
-shimmer-themes2.1.3
-software-properties-common0.98.7
+shared-mime-info1.15-1
+software-properties-common0.98.9.3
+sound-theme-freedesktop0.8-2ubuntu1
 ssl-cert1.0.39
-sudo1.8.31-1ubuntu1
-systemd244.3-1ubuntu1
-systemd-sysv244.3-1ubuntu1
-sysvinit-utils2.96-1ubuntu1
-tar1.30+dfsg-6
-terminator1.91-4
-thunar1.8.12-1
-thunar-archive-plugin0.4.0-2
-thunar-data1.8.12-1
-thunar-media-tags-plugin0.3.0-2
-tzdata2019c-3
-ubuntu-keyring2018.09.18.1
-ubuntu-mono19.04-0ubuntu2
+suckless-tools44-1
+sudo1.8.31-1ubuntu1.1
+systemd245.4-4ubuntu3.4
+systemd-sysv245.4-4ubuntu3.4
+systemd-timesyncd245.4-4ubuntu3.4
+sysvinit-utils2.96-2.1ubuntu1
+tar1.30+dfsg-7ubuntu0.20.04.1
+terminator1.91-4ubuntu1
+tzdata2020f-0ubuntu0.20.04.1
+ubuntu-keyring2020.02.11.2
+ubuntu-mono19.04-0ubuntu3
 ucf3.0038+nmu1
-udev244.3-1ubuntu1
-util-linux2.34-0.1ubuntu4
+udev245.4-4ubuntu3.4
+util-linux2.34-0.1ubuntu9.1
 x11-apps7.7+8
 x11-common1:7.7+19ubuntu14
 x11proto-core-dev2019.2-1ubuntu1
@@ -483,59 +499,17 @@ x11-session-utils7.7+4
 x11-utils7.7+5
 x11-xkb-utils7.7+5
 x11-xserver-utils7.7+8
-xfburn0.6.2-0ubuntu1
-xfce44.14
-xfce4-appfinder4.14.0-1
-xfce4-battery-plugin1.1.3-1
-xfce4-clipman2:1.4.4-0ubuntu1
-xfce4-clipman-plugin2:1.4.4-0ubuntu1
-xfce4-cpufreq-plugin1.2.1-1
-xfce4-cpugraph-plugin1.1.0-1
-xfce4-datetime-plugin0.8.0-1
-xfce4-dict0.8.3-1
-xfce4-diskperf-plugin2.6.2-1
-xfce4-fsguard-plugin1.1.1-1
-xfce4-genmon-plugin4.0.2-1
-xfce4-goodies4.12.6
-xfce4-mailwatch-plugin1.2.0-3
-xfce4-netload-plugin1.3.2-1
-xfce4-notes1.8.1-3
-xfce4-notes-plugin1.8.1-3
-xfce4-notifyd0.4.4-1
-xfce4-panel4.14.3-1
-xfce4-places-plugin1.8.1-1
-xfce4-pulseaudio-plugin0.4.2-1
-xfce4-screenshooter1.9.7-1
-xfce4-sensors-plugin1.3.0-2build1
-xfce4-session4.14.0-0ubuntu1
-xfce4-settings4.14.2-1ubuntu1
-xfce4-smartbookmark-plugin0.5.1-1
-xfce4-systemload-plugin1:1.2.3-1ubuntu1
-xfce4-taskmanager1.2.2-1
-xfce4-terminal0.8.9.1-1
-xfce4-timer-plugin1.7.0-1
-xfce4-verve-plugin2.0.0-1
-xfce4-wavelan-plugin0.6.1-1
-xfce4-weather-plugin0.10.1-1
-xfce4-whiskermenu-plugin2.4.2-1
-xfce4-xkb-plugin1:0.8.1-2
-xfconf4.14.1-1
-xfdesktop44.14.2-1
-xfdesktop4-data4.14.2-1
+xdg-utils1.1.3-2ubuntu1.20.04.2
 xfonts-base1:1.0.5
 xfonts-encodings1:1.0.5-0ubuntu1
 xfonts-utils1:7.7+6
-xfwm44.14.0-2
 xkb-data2.29-2
 xorg-sgml-doctools1:1.11-1
 xorgxrdp1:0.2.12-1
 xrdp0.9.12-1
-xserver-common2:1.20.7-2ubuntu2
-xserver-xorg-core2:1.20.7-2ubuntu2
+xserver-common2:1.20.9-2ubuntu1.2~20.04.1
+xserver-xorg-core2:1.20.9-2ubuntu1.2~20.04.1
 xtrans-dev1.4.0-1
-xubuntu-artwork20.04
-xubuntu-default-settings20.04
-xubuntu-icon-theme20.04
-xubuntu-wallpapers20.04
+xul-ext-ubufox3.4-0ubuntu1.17.10.1
 xutils1:7.7+19ubuntu14
-zlib1g1:1.2.11.dfsg-2ubuntu1
+zlib1g1:1.2.11.dfsg-2ubuntu1.2

readme-vars.yml

@@ -14,22 +14,6 @@ available_architectures:
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
   - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
 
-# development version
-development_versions: true
-development_versions_items:
-  - { tag: "latest", desc: "XFCE Focal" }
-  - { tag: "xfce-bionic", desc: "XFCE Bionic" }
-  - { tag: "kde-focal", desc: "KDE Focal" }
-  - { tag: "kde-bionic", desc: "KDE Bionic" }
-  - { tag: "lxde-focal", desc: "LXDE Focal" }
-  - { tag: "lxde-bionic", desc: "LXDE Bionic" }
-  - { tag: "budgie-focal", desc: "Budgie Focal" }
-  - { tag: "budgie-bionic", desc: "Budgie Bionic" }
-  - { tag: "mate-focal", desc: "MATE Focal" }
-  - { tag: "mate-bionic", desc: "MATE Bionic" }
-  - { tag: "kylin-focal", desc: "Kylin Focal" }
-  - { tag: "kylin-bionic", desc: "Kylin Bionic" }
-
 # container parameters
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: false

root/defaults/startwm.sh

@@ -1,2 +1,3 @@
 #!/bin/bash
-/usr/bin/startxfce4 > /dev/null 2>&1
+/usr/bin/pulseaudio --start
+/usr/bin/i3 > /dev/null 2>&1