From 75d88fbfad82ec0e737e579bbe329d8e54c17dc5 Mon Sep 17 00:00:00 2001 From: TrezOne Date: Fri, 20 Jun 2025 09:43:17 -0400 Subject: [PATCH 1/5] Adding ENV[TIMEOUT] for Uptime-Kuma mod. --- root/app/auto_uptime_kuma/uptime_kuma_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/app/auto_uptime_kuma/uptime_kuma_service.py b/root/app/auto_uptime_kuma/uptime_kuma_service.py index ff45813f3..83f45dde3 100644 --- a/root/app/auto_uptime_kuma/uptime_kuma_service.py +++ b/root/app/auto_uptime_kuma/uptime_kuma_service.py @@ -33,7 +33,7 @@ def connect(self, url, username, password): ) return False - self.api = UptimeKumaApi(url) + self.api = UptimeKumaApi(url, ENV[TIMEOUT]) self.api.login(username, password) return True From a06c1d7c2d9c9235e9c13c777def9b5257a47cc1 Mon Sep 17 00:00:00 2001 From: TrezOne Date: Fri, 20 Jun 2025 10:41:53 -0400 Subject: [PATCH 2/5] Changing pipeline for testing. --- .github/workflows/BuildImage.yml | 90 ++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 39 deletions(-) diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 37850f081..8d7545fe9 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -1,49 +1,61 @@ name: Build Image -on: [push, pull_request_target, workflow_dispatch] +on: [push, pull_request, workflow_dispatch] env: - GITHUB_REPO: "linuxserver/docker-mods" #don't modify - ENDPOINT: "linuxserver/mods" #don't modify - BASEIMAGE: "swag" #replace - MODNAME: "auto-uptime-kuma" #replace - MULTI_ARCH: "false" #set to false if not needed + ENDPOINT: "TrezOne/swag-auto-uptime-kuma" + BRANCH: "swag-auto-uptime-kuma-timeout-fix_2025-06-20T09-38-36" jobs: - set-vars: + build: runs-on: ubuntu-latest steps: - - name: Set Vars - id: outputs + - uses: actions/checkout@v3 + + - name: Build image run: | - echo "GITHUB_REPO=${{ env.GITHUB_REPO }}" >> $GITHUB_OUTPUT - echo "ENDPOINT=${{ env.ENDPOINT }}" >> $GITHUB_OUTPUT - echo "BASEIMAGE=${{ env.BASEIMAGE }}" >> $GITHUB_OUTPUT - echo "MODNAME=${{ env.MODNAME }}" >> $GITHUB_OUTPUT - echo "MULTI_ARCH=${{ env.MULTI_ARCH }}" >> $GITHUB_OUTPUT - # **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. **** - MOD_VERSION="" - echo "MOD_VERSION=${MOD_VERSION}" >> $GITHUB_OUTPUT - outputs: - GITHUB_REPO: ${{ steps.outputs.outputs.GITHUB_REPO }} - ENDPOINT: ${{ steps.outputs.outputs.ENDPOINT }} - BASEIMAGE: ${{ steps.outputs.outputs.BASEIMAGE }} - MODNAME: ${{ steps.outputs.outputs.MODNAME }} - MULTI_ARCH: ${{ steps.outputs.outputs.MULTI_ARCH }} - MOD_VERSION: ${{ steps.outputs.outputs.MOD_VERSION }} + docker build --no-cache -t ${{ github.sha }} . - build: - uses: linuxserver/github-workflows/.github/workflows/docker-mod-builder.yml@v1 - needs: set-vars - secrets: - CR_USER: ${{ secrets.CR_USER }} - CR_PAT: ${{ secrets.CR_PAT }} - DOCKERUSER: ${{ secrets.DOCKERUSER }} - DOCKERPASS: ${{ secrets.DOCKERPASS }} - with: - GITHUB_REPO: ${{ needs.set-vars.outputs.GITHUB_REPO }} - ENDPOINT: ${{ needs.set-vars.outputs.ENDPOINT }} - BASEIMAGE: ${{ needs.set-vars.outputs.BASEIMAGE }} - MODNAME: ${{ needs.set-vars.outputs.MODNAME }} - MULTI_ARCH: ${{ needs.set-vars.outputs.MULTI_ARCH }} - MOD_VERSION: ${{ needs.set-vars.outputs.MOD_VERSION }} + - name: Tag image + if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.ENDPOINT != 'user/endpoint' }} + run: | + docker tag ${{ github.sha }} ${ENDPOINT} + docker tag ${{ github.sha }} ${ENDPOINT}:${{ github.sha }} + docker tag ${{ github.sha }} ghcr.io/${ENDPOINT} + docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${{ github.sha }} + + - name: Credential check + if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.ENDPOINT != 'user/endpoint' }} + run: | + echo "CR_USER=${{ secrets.CR_USER }}" >> $GITHUB_ENV + echo "CR_PAT=${{ secrets.CR_PAT }}" >> $GITHUB_ENV + echo "DOCKERUSER=${{ secrets.DOCKERUSER }}" >> $GITHUB_ENV + echo "DOCKERPASS=${{ secrets.DOCKERPASS }}" >> $GITHUB_ENV + if [[ "${{ secrets.CR_USER }}" == "" && "${{ secrets.CR_PAT }}" == "" && "${{ secrets.DOCKERUSER }}" == "" && "${{ secrets.DOCKERPASS }}" == "" ]]; then + echo "::error::Push credential secrets missing." + echo "::error::You must set either CR_USER & CR_PAT or DOCKERUSER & DOCKERPASS as secrets in your repo settings." + echo "::error::See https://github.com/linuxserver/docker-mods/blob/master/README.md for more information/instructions." + exit 1 + fi + + - name: Login to GitHub Container Registry + if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.CR_USER && env.CR_PAT && env.ENDPOINT != 'user/endpoint' }} + run: | + echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.CR_USER }} --password-stdin + + - name: Push tags to GitHub Container Registry + if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.CR_USER && env.CR_PAT && env.ENDPOINT != 'user/endpoint' }} + run: | + docker push ghcr.io/${ENDPOINT}:${{ github.sha }} + docker push ghcr.io/${ENDPOINT} + + - name: Login to DockerHub + if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.DOCKERUSER && env.DOCKERPASS && env.ENDPOINT != 'user/endpoint' }} + run: | + echo ${{ secrets.DOCKERPASS }} | docker login -u ${{ secrets.DOCKERUSER }} --password-stdin + + - name: Push tags to DockerHub + if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.DOCKERUSER && env.DOCKERPASS && env.ENDPOINT != 'user/endpoint' }} + run: | + docker push ${ENDPOINT}:${{ github.sha }} + docker push ${ENDPOINT} \ No newline at end of file From 8ed1b26a4858a9f3828a0b432c016898e3358a61 Mon Sep 17 00:00:00 2001 From: TrezOne Date: Fri, 20 Jun 2025 10:42:33 -0400 Subject: [PATCH 3/5] Typo fix for endpoint. --- .github/workflows/BuildImage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 8d7545fe9..6a5bd2b8b 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -3,7 +3,7 @@ name: Build Image on: [push, pull_request, workflow_dispatch] env: - ENDPOINT: "TrezOne/swag-auto-uptime-kuma" + ENDPOINT: "trezone/swag-auto-uptime-kuma" BRANCH: "swag-auto-uptime-kuma-timeout-fix_2025-06-20T09-38-36" jobs: From a443b8542f7d033fb99d2dde3782497534bd7508 Mon Sep 17 00:00:00 2001 From: TrezOne Date: Fri, 20 Jun 2025 15:18:54 -0400 Subject: [PATCH 4/5] Adding separate workflow for testing. --- .github/workflows/BuildImage.yml | 90 ++++++++++++++------------------ .github/workflows/BuildTest.yml | 61 ++++++++++++++++++++++ 2 files changed, 100 insertions(+), 51 deletions(-) create mode 100644 .github/workflows/BuildTest.yml diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 6a5bd2b8b..37850f081 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -1,61 +1,49 @@ name: Build Image -on: [push, pull_request, workflow_dispatch] +on: [push, pull_request_target, workflow_dispatch] env: - ENDPOINT: "trezone/swag-auto-uptime-kuma" - BRANCH: "swag-auto-uptime-kuma-timeout-fix_2025-06-20T09-38-36" + GITHUB_REPO: "linuxserver/docker-mods" #don't modify + ENDPOINT: "linuxserver/mods" #don't modify + BASEIMAGE: "swag" #replace + MODNAME: "auto-uptime-kuma" #replace + MULTI_ARCH: "false" #set to false if not needed jobs: - build: + set-vars: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - - name: Build image - run: | - docker build --no-cache -t ${{ github.sha }} . - - - name: Tag image - if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.ENDPOINT != 'user/endpoint' }} - run: | - docker tag ${{ github.sha }} ${ENDPOINT} - docker tag ${{ github.sha }} ${ENDPOINT}:${{ github.sha }} - docker tag ${{ github.sha }} ghcr.io/${ENDPOINT} - docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${{ github.sha }} - - - name: Credential check - if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.ENDPOINT != 'user/endpoint' }} - run: | - echo "CR_USER=${{ secrets.CR_USER }}" >> $GITHUB_ENV - echo "CR_PAT=${{ secrets.CR_PAT }}" >> $GITHUB_ENV - echo "DOCKERUSER=${{ secrets.DOCKERUSER }}" >> $GITHUB_ENV - echo "DOCKERPASS=${{ secrets.DOCKERPASS }}" >> $GITHUB_ENV - if [[ "${{ secrets.CR_USER }}" == "" && "${{ secrets.CR_PAT }}" == "" && "${{ secrets.DOCKERUSER }}" == "" && "${{ secrets.DOCKERPASS }}" == "" ]]; then - echo "::error::Push credential secrets missing." - echo "::error::You must set either CR_USER & CR_PAT or DOCKERUSER & DOCKERPASS as secrets in your repo settings." - echo "::error::See https://github.com/linuxserver/docker-mods/blob/master/README.md for more information/instructions." - exit 1 - fi - - - name: Login to GitHub Container Registry - if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.CR_USER && env.CR_PAT && env.ENDPOINT != 'user/endpoint' }} - run: | - echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.CR_USER }} --password-stdin - - - name: Push tags to GitHub Container Registry - if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.CR_USER && env.CR_PAT && env.ENDPOINT != 'user/endpoint' }} + - name: Set Vars + id: outputs run: | - docker push ghcr.io/${ENDPOINT}:${{ github.sha }} - docker push ghcr.io/${ENDPOINT} + echo "GITHUB_REPO=${{ env.GITHUB_REPO }}" >> $GITHUB_OUTPUT + echo "ENDPOINT=${{ env.ENDPOINT }}" >> $GITHUB_OUTPUT + echo "BASEIMAGE=${{ env.BASEIMAGE }}" >> $GITHUB_OUTPUT + echo "MODNAME=${{ env.MODNAME }}" >> $GITHUB_OUTPUT + echo "MULTI_ARCH=${{ env.MULTI_ARCH }}" >> $GITHUB_OUTPUT + # **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. **** + MOD_VERSION="" + echo "MOD_VERSION=${MOD_VERSION}" >> $GITHUB_OUTPUT + outputs: + GITHUB_REPO: ${{ steps.outputs.outputs.GITHUB_REPO }} + ENDPOINT: ${{ steps.outputs.outputs.ENDPOINT }} + BASEIMAGE: ${{ steps.outputs.outputs.BASEIMAGE }} + MODNAME: ${{ steps.outputs.outputs.MODNAME }} + MULTI_ARCH: ${{ steps.outputs.outputs.MULTI_ARCH }} + MOD_VERSION: ${{ steps.outputs.outputs.MOD_VERSION }} - - name: Login to DockerHub - if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.DOCKERUSER && env.DOCKERPASS && env.ENDPOINT != 'user/endpoint' }} - run: | - echo ${{ secrets.DOCKERPASS }} | docker login -u ${{ secrets.DOCKERUSER }} --password-stdin - - - name: Push tags to DockerHub - if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.DOCKERUSER && env.DOCKERPASS && env.ENDPOINT != 'user/endpoint' }} - run: | - docker push ${ENDPOINT}:${{ github.sha }} - docker push ${ENDPOINT} \ No newline at end of file + build: + uses: linuxserver/github-workflows/.github/workflows/docker-mod-builder.yml@v1 + needs: set-vars + secrets: + CR_USER: ${{ secrets.CR_USER }} + CR_PAT: ${{ secrets.CR_PAT }} + DOCKERUSER: ${{ secrets.DOCKERUSER }} + DOCKERPASS: ${{ secrets.DOCKERPASS }} + with: + GITHUB_REPO: ${{ needs.set-vars.outputs.GITHUB_REPO }} + ENDPOINT: ${{ needs.set-vars.outputs.ENDPOINT }} + BASEIMAGE: ${{ needs.set-vars.outputs.BASEIMAGE }} + MODNAME: ${{ needs.set-vars.outputs.MODNAME }} + MULTI_ARCH: ${{ needs.set-vars.outputs.MULTI_ARCH }} + MOD_VERSION: ${{ needs.set-vars.outputs.MOD_VERSION }} diff --git a/.github/workflows/BuildTest.yml b/.github/workflows/BuildTest.yml new file mode 100644 index 000000000..57e8f9ef6 --- /dev/null +++ b/.github/workflows/BuildTest.yml @@ -0,0 +1,61 @@ +name: Build Image + +on: [push, pull_request, workflow_dispatch] + +env: + ENDPOINT: "trezone/swag-auto-uptime-kuma" + BRANCH: "swag-auto-uptime-kuma-timeout-fix_2025-06-20T09-38-36" + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: Build image + run: | + docker build --no-cache -t ${{ github.sha }} . + + - name: Tag image + if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.ENDPOINT != 'user/endpoint' }} + run: | + docker tag ${{ github.sha }} ${ENDPOINT} + docker tag ${{ github.sha }} ${ENDPOINT}:${{ github.sha }} + docker tag ${{ github.sha }} ghcr.io/${ENDPOINT} + docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${{ github.sha }} + + - name: Credential check + if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.ENDPOINT != 'user/endpoint' }} + run: | + echo "CR_USER=${{ secrets.CR_USER }}" >> $GITHUB_ENV + echo "CR_PAT=${{ secrets.CR_PAT }}" >> $GITHUB_ENV + echo "DOCKERUSER=${{ secrets.DOCKERUSER }}" >> $GITHUB_ENV + echo "DOCKERPASS=${{ secrets.DOCKERPASS }}" >> $GITHUB_ENV + if [[ "${{ secrets.CR_USER }}" == "" && "${{ secrets.CR_PAT }}" == "" && "${{ secrets.DOCKERUSER }}" == "" && "${{ secrets.DOCKERPASS }}" == "" ]]; then + echo "::error::Push credential secrets missing." + echo "::error::You must set either CR_USER & CR_PAT or DOCKERUSER & DOCKERPASS as secrets in your repo settings." + echo "::error::See https://github.com/linuxserver/docker-mods/blob/master/README.md for more information/instructions." + exit 1 + fi + + - name: Login to GitHub Container Registry + if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.CR_USER && env.CR_PAT && env.ENDPOINT != 'user/endpoint' }} + run: | + echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.CR_USER }} --password-stdin + + - name: Push tags to GitHub Container Registry + if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.CR_USER && env.CR_PAT && env.ENDPOINT != 'user/endpoint' }} + run: | + docker push ghcr.io/${ENDPOINT}:${{ github.sha }} + docker push ghcr.io/${ENDPOINT} + + - name: Login to DockerHub + if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.DOCKERUSER && env.DOCKERPASS && env.ENDPOINT != 'user/endpoint' }} + run: | + echo ${{ secrets.DOCKERPASS }} | docker login -u ${{ secrets.DOCKERUSER }} --password-stdin + + - name: Push tags to DockerHub + if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.DOCKERUSER && env.DOCKERPASS && env.ENDPOINT != 'user/endpoint' }} + run: | + docker push ${ENDPOINT}:${{ github.sha }} + docker push ${ENDPOINT} \ No newline at end of file From 6c87eb91f69034af6fbe62d2dc68ef361cec32b2 Mon Sep 17 00:00:00 2001 From: TrezOne Date: Fri, 20 Jun 2025 15:58:04 -0400 Subject: [PATCH 5/5] Removing test workflow. --- .github/workflows/BuildTest.yml | 61 --------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 .github/workflows/BuildTest.yml diff --git a/.github/workflows/BuildTest.yml b/.github/workflows/BuildTest.yml deleted file mode 100644 index 57e8f9ef6..000000000 --- a/.github/workflows/BuildTest.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: Build Image - -on: [push, pull_request, workflow_dispatch] - -env: - ENDPOINT: "trezone/swag-auto-uptime-kuma" - BRANCH: "swag-auto-uptime-kuma-timeout-fix_2025-06-20T09-38-36" - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.3.3 - - - name: Build image - run: | - docker build --no-cache -t ${{ github.sha }} . - - - name: Tag image - if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.ENDPOINT != 'user/endpoint' }} - run: | - docker tag ${{ github.sha }} ${ENDPOINT} - docker tag ${{ github.sha }} ${ENDPOINT}:${{ github.sha }} - docker tag ${{ github.sha }} ghcr.io/${ENDPOINT} - docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${{ github.sha }} - - - name: Credential check - if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.ENDPOINT != 'user/endpoint' }} - run: | - echo "CR_USER=${{ secrets.CR_USER }}" >> $GITHUB_ENV - echo "CR_PAT=${{ secrets.CR_PAT }}" >> $GITHUB_ENV - echo "DOCKERUSER=${{ secrets.DOCKERUSER }}" >> $GITHUB_ENV - echo "DOCKERPASS=${{ secrets.DOCKERPASS }}" >> $GITHUB_ENV - if [[ "${{ secrets.CR_USER }}" == "" && "${{ secrets.CR_PAT }}" == "" && "${{ secrets.DOCKERUSER }}" == "" && "${{ secrets.DOCKERPASS }}" == "" ]]; then - echo "::error::Push credential secrets missing." - echo "::error::You must set either CR_USER & CR_PAT or DOCKERUSER & DOCKERPASS as secrets in your repo settings." - echo "::error::See https://github.com/linuxserver/docker-mods/blob/master/README.md for more information/instructions." - exit 1 - fi - - - name: Login to GitHub Container Registry - if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.CR_USER && env.CR_PAT && env.ENDPOINT != 'user/endpoint' }} - run: | - echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.CR_USER }} --password-stdin - - - name: Push tags to GitHub Container Registry - if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.CR_USER && env.CR_PAT && env.ENDPOINT != 'user/endpoint' }} - run: | - docker push ghcr.io/${ENDPOINT}:${{ github.sha }} - docker push ghcr.io/${ENDPOINT} - - - name: Login to DockerHub - if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.DOCKERUSER && env.DOCKERPASS && env.ENDPOINT != 'user/endpoint' }} - run: | - echo ${{ secrets.DOCKERPASS }} | docker login -u ${{ secrets.DOCKERUSER }} --password-stdin - - - name: Push tags to DockerHub - if: ${{ github.ref == format('refs/heads/{0}', env.BRANCH) && env.DOCKERUSER && env.DOCKERPASS && env.ENDPOINT != 'user/endpoint' }} - run: | - docker push ${ENDPOINT}:${{ github.sha }} - docker push ${ENDPOINT} \ No newline at end of file