Bot Updating Package Versions

package moved to community repo

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -67,10 +67,10 @@ body:
   - type: textarea
     attributes:
       description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
+        Provide a full docker log, output of "docker logs swag"
       label: Container logs
       placeholder: |
-        Output of `docker logs linuxserver.io`
+        Output of `docker logs swag`
       render: bash
     validations:
       required: true

.github/workflows/external_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   external-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
 
       - name: External Trigger
         if: github.ref == 'refs/heads/master'

.github/workflows/external_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   external-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 

.github/workflows/package_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   package-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
 
       - name: Package Trigger
         if: github.ref == 'refs/heads/master'

.github/workflows/package_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 

Dockerfile

@@ -76,7 +76,7 @@ RUN \
     php83-xmlreader \
     php83-xsl \
     whois && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
     php83-pecl-mcrypt && \
   echo "**** install certbot plugins ****" && \
   if [ -z ${CERTBOT_VERSION+x} ]; then \

Dockerfile.aarch64

@@ -76,7 +76,7 @@ RUN \
     php83-xmlreader \
     php83-xsl \
     whois && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
     php83-pecl-mcrypt && \
   echo "**** install certbot plugins ****" && \
   if [ -z ${CERTBOT_VERSION+x} ]; then \

Jenkinsfile

@@ -245,9 +245,11 @@ pipeline {
                   -v ${WORKSPACE}:/mnt \
                   -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                   -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                  ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                    apk add --no-cache py3-pip && \
+                    apk add --no-cache python3 && \
-                    pip install s3cmd && \
+                    python3 -m venv /lsiopy && \
+                    pip install --no-cache-dir -U pip && \
+                    pip install --no-cache-dir s3cmd && \
                     s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
         }
       }
@@ -262,14 +264,6 @@ pipeline {
         }
       }
       steps {
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ]
-        ]) {
         sh '''#! /bin/bash
               set -e
               TEMPDIR=$(mktemp -d)
@@ -353,8 +347,12 @@ pipeline {
                 GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
                 git add docs/images/docker-${CONTAINER_NAME}.md
                 git commit -m 'Bot Updating Documentation'
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH})
               fi
               mkdir -p ${TEMPDIR}/unraid
               git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
@@ -378,8 +376,12 @@ pipeline {
                   git add unraid/${CONTAINER_NAME}.xml
                   git commit -m 'Bot Updating Unraid Template'
                 fi
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH})
               fi
               # Stage 4 - Sync Readme to Docker Hub
               if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
@@ -390,7 +392,7 @@ pipeline {
                   echo "Syncing readme to Docker Hub"
                   DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md"
                 fi
-                  DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
                 curl -s \
                   -H "Authorization: JWT ${DH_TOKEN}" \
                   -H "Content-Type: application/json" \
@@ -408,7 +410,6 @@ pipeline {
         }
       }
     }
-    }
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
@@ -703,12 +704,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -719,7 +714,7 @@ pipeline {
           retry(5) {
             sh '''#! /bin/bash
                   set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                   echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
@@ -750,12 +745,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -766,7 +755,7 @@ pipeline {
           retry(5) {
             sh '''#! /bin/bash
                   set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                   echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin

package_versions.txt

@@ -3,7 +3,7 @@ ConfigArgParse                  1.7                    python
 PyJWT                           2.8.0                  python                   
 PyNamecheap                     0.0.3                  python                   
 PyYAML                          6.0.1                  python                   
-Simple Launcher                 1.1.0.14               dotnet  
+Simple Launcher                 1.1.0.14               dotnet  (+5 duplicates)  
 acme                            2.9.0                  python                   
 alpine-baselayout               3.4.3-r2               apk                      
 alpine-baselayout-data          3.4.3-r2               apk                      
@@ -17,14 +17,14 @@ apr-util                        1.6.3-r1               apk
 argon2-libs                     20190702-r5            apk                      
 attrs                           23.2.0                 python                   
 azure-common                    1.1.28                 python                   
-azure-core                      1.30.0                 python  
+azure-core                      1.30.1                 python                   
 azure-identity                  1.15.0                 python                   
 azure-mgmt-core                 1.4.0                  python                   
 azure-mgmt-dns                  8.1.0                  python                   
 bash                            5.2.21-r0              apk                      
 beautifulsoup4                  4.12.3                 python                   
-boto3                           1.34.44                python  
+boto3                           1.34.55                python                   
-botocore                        1.34.44                python  
+botocore                        1.34.55                python                   
 brotli-libs                     1.1.0-r1               apk                      
 bs4                             0.0.2                  python                   
 busybox                         1.36.1-r15             apk                      
@@ -33,7 +33,7 @@ c-ares                          1.24.0-r1              apk
 c-client                        2007f-r15              apk                      
 ca-certificates                 20230506-r0            apk                      
 ca-certificates-bundle          20230506-r0            apk                      
-cachetools                      5.3.2                  python  
+cachetools                      5.3.3                  python                   
 certbot                         2.9.0                  python                   
 certbot-dns-acmedns             0.1.0                  python                   
 certbot-dns-aliyun              2.0.0                  python                   
@@ -43,7 +43,7 @@ certbot-dns-cloudflare          2.9.0                  python
 certbot-dns-cpanel              0.4.0                  python                   
 certbot-dns-desec               1.2.1                  python                   
 certbot-dns-digitalocean        2.9.0                  python                   
-certbot-dns-directadmin         1.0.3                  python  
+certbot-dns-directadmin         1.0.4                  python                   
 certbot-dns-dnsimple            2.9.0                  python                   
 certbot-dns-dnsmadeeasy         2.9.0                  python                   
 certbot-dns-dnspod              0.1.0                  python                   
@@ -81,20 +81,20 @@ certbot-plugin-gandi            1.5.0                  python
 certifi                         2024.2.2               python                   
 cffi                            1.16.0                 python                   
 charset-normalizer              3.3.2                  python                   
-cloudflare                      2.19.0                 python  
+cloudflare                      2.19.2                 python                   
 composer                        2.7.1                  binary                   
 configobj                       5.0.8                  python                   
 coreutils                       9.4-r2                 apk                      
 coreutils-env                   9.4-r2                 apk                      
 coreutils-fmt                   9.4-r2                 apk                      
 coreutils-sha512sum             9.4-r2                 apk                      
-cryptography                    42.0.3                 python  
+cryptography                    42.0.5                 python                   
 curl                            8.5.0-r0               apk                      
 dataclasses-json                0.5.14                 python                   
 distro                          1.9.0                  python                   
 dns-lexicon                     3.17.0                 python                   
 dnslib                          0.9.24                 python                   
-dnspython                       2.6.0                  python  
+dnspython                       2.6.1                  python                   
 domeneshop                      0.4.3                  python                   
 fail2ban                        1.0.2                  python                   
 fail2ban                        1.0.2-r3               apk                      
@@ -102,7 +102,7 @@ fail2ban-pyc                    1.0.2-r3               apk
 filelock                        3.13.1                 python                   
 fontconfig                      2.14.2-r4              apk                      
 freetype                        2.13.2-r0              apk                      
-future                          0.18.3                 python  
+future                          1.0.0                  python                   
 gdbm                            1.23-r1                apk                      
 git                             2.43.0-r0              apk                      
 git-perl                        2.43.0-r0              apk                      
@@ -115,8 +115,8 @@ gnupg-utils                     2.4.4-r0               apk
 gnupg-wks-client                2.4.4-r0               apk                      
 gnutls                          3.8.3-r0               apk                      
 google-api-core                 2.17.1                 python                   
-google-api-python-client        2.118.0                python  
+google-api-python-client        2.120.0                python                   
-google-auth                     2.28.0                 python  
+google-auth                     2.28.1                 python                   
 google-auth-httplib2            0.2.0                  python                   
 googleapis-common-protos        1.62.0                 python                   
 gpg                             2.4.4-r0               apk                      
@@ -135,7 +135,7 @@ jmespath                        1.0.1                  python
 josepy                          1.14.0                 python                   
 jq                              1.7.1-r0               apk                      
 jsonlines                       4.0.0                  python                   
-jsonpickle                      3.0.2                  python  
+jsonpickle                      3.0.3                  python                   
 libacl                          2.3.1-r4               apk                      
 libassuan                       2.5.6-r1               apk                      
 libattr                         2.5.1-r5               apk                      
@@ -145,7 +145,7 @@ libbz2                          1.0.8-r6               apk
 libc-utils                      0.7.2-r5               apk                      
 libcrypto3                      3.1.4-r5               apk                      
 libcurl                         8.5.0-r0               apk                      
-libdav1d                        1.3.0-r0               apk     
+libdav1d                        1.3.0-r1               apk                      
 libedit                         20230828.3.1-r3        apk                      
 libevent                        2.1.12-r7              apk                      
 libexpat                        2.6.0-r0               apk                      
@@ -198,11 +198,11 @@ logrotate                       3.21.0-r1              apk
 loopialib                       0.2.0                  python                   
 lxml                            5.1.0                  python                   
 lz4-libs                        1.9.4-r5               apk                      
-marshmallow                     3.20.2                 python  
+marshmallow                     3.21.1                 python                   
 memcached                       1.6.22-r0              apk                      
 mock                            5.1.0                  python                   
 mpdecimal                       2.5.1-r2               apk                      
-msal                            1.26.0                 python  
+msal                            1.27.0                 python                   
 msal-extensions                 1.1.0                  python                   
 musl                            1.2.4_git20230717-r4   apk                      
 musl-utils                      1.2.4_git20230717-r4   apk                      
@@ -304,16 +304,16 @@ pyRFC3339                       1.1                    python
 pyacmedns                       0.4                    python                   
 pyasn1                          0.5.1                  python                   
 pyasn1-modules                  0.3.0                  python                   
-pyc                             3.11.6-r1              apk     
+pyc                             3.11.8-r0              apk                      
 pycparser                       2.21                   python                   
 pyotp                           2.9.0                  python                   
 pyparsing                       3.1.1                  python                   
-python-dateutil                 2.8.2                  python  
+python-dateutil                 2.9.0.post0            python                   
 python-digitalocean             1.17.0                 python                   
 python-transip                  0.6.0                  python                   
-python3                         3.11.6-r1              apk     
+python3                         3.11.8-r0              apk                      
-python3-pyc                     3.11.6-r1              apk     
+python3-pyc                     3.11.8-r0              apk                      
-python3-pycache-pyc0            3.11.6-r1              apk     
+python3-pycache-pyc0            3.11.8-r0              apk                      
 pytz                            2024.1                 python                   
 readline                        8.2.1-r2               apk                      
 requests                        2.31.0                 python                   
@@ -332,7 +332,7 @@ ssl_client                      1.36.1-r15             apk
 tiff                            4.6.0-r0               apk                      
 tldextract                      5.1.1                  python                   
 typing-inspect                  0.9.0                  python                   
-typing_extensions               4.9.0                  python  
+typing_extensions               4.10.0                 python                   
 tzdata                          2024a-r0               apk                      
 unixodbc                        2.3.12-r0              apk                      
 uritemplate                     4.1.1                  python