From a54fe5c1b9b5474cad26882a5ff84b1d604cda1f Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Mon, 27 Oct 2025 22:42:40 -0400 Subject: [PATCH] Adding a Access Token for the package system. Signed-off-by: Cliff Hill --- .gitea/workflows/cicd.yml | 57 +++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/.gitea/workflows/cicd.yml b/.gitea/workflows/cicd.yml index f7f5aea..c4b9a7f 100644 --- a/.gitea/workflows/cicd.yml +++ b/.gitea/workflows/cicd.yml @@ -41,9 +41,10 @@ jobs: - name: Build and push CICD image env: - GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} + PACKAGE_ACCESS_TOKEN: ${{ secrets.PACKAGE_ACCESS_TOKEN }} SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} GITHUB_SHA: ${{ github.sha }} + REGISTRY_USER: ${{ secrets.REGISTRY_USER || github.actor }} run: | echo "=== Building CICD Image with Secure Secrets ===" @@ -68,10 +69,20 @@ jobs: docker tag cicd:latest dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:latest docker tag cicd:latest dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} - # Login to Gitea container registry - echo "${GITEA_TOKEN}" | docker login dogar.darkhelm.org -u DarkHelm.org --password-stdin + # Login to Gitea container registry with enhanced debugging + echo "Attempting Docker login for user: ${REGISTRY_USER}" + if echo "${PACKAGE_ACCESS_TOKEN}" | docker login dogar.darkhelm.org -u "${REGISTRY_USER}" --password-stdin; then + echo "✓ Successfully logged into registry" + else + echo "❌ Failed to login to registry" + echo "Registry URL: dogar.darkhelm.org" + echo "Username: ${REGISTRY_USER}" + echo "Token length: ${#PACKAGE_ACCESS_TOKEN}" + exit 1 + fi # Push to registry + echo "Pushing images to registry..." docker push dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:latest docker push dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -84,7 +95,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Check trailing whitespace run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -104,7 +115,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Check end of file run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -125,7 +136,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Check YAML files run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -149,7 +160,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Check TOML files run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -173,7 +184,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Check line endings run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -193,7 +204,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Check TOML formatting run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -221,7 +232,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Run ruff linting run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -238,7 +249,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Check ruff formatting run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -255,7 +266,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Run pyright type checking run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -271,7 +282,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Run darglint docstring linting run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -287,7 +298,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Check for types in docstrings run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -305,7 +316,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Run ESLint run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -321,7 +332,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Check Prettier formatting run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -337,7 +348,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Run TypeScript type checking run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -352,7 +363,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Run TSDoc linting run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -370,7 +381,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Run backend tests with coverage run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -386,7 +397,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Run frontend tests with coverage run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -402,7 +413,7 @@ jobs: needs: setup steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Run backend doctests run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -428,7 +439,7 @@ jobs: needs: [backend-tests, frontend-tests] steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Run integration tests run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest} @@ -448,7 +459,7 @@ jobs: needs: [backend-tests, frontend-tests] steps: - name: Login to Gitea Container Registry - run: echo "${{ secrets.GITEA_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin + run: echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login dogar.darkhelm.org -u ${{ github.actor }} --password-stdin - name: Run E2E tests run: | docker pull dogar.darkhelm.org/darkhelm.org/plex-playlist/cicd:${GITHUB_SHA:-latest}