diff --git a/.gitea/workflows/deploy-control-plane.yml b/.gitea/workflows/deploy-control-plane.yml index e78df11..727a9a9 100644 --- a/.gitea/workflows/deploy-control-plane.yml +++ b/.gitea/workflows/deploy-control-plane.yml @@ -16,7 +16,6 @@ jobs: timeout-minutes: 45 env: REGISTRY_HOST: ${{ vars.REGISTRY_HOST }} - REGISTRY_USERNAME: ${{ vars.REGISTRY_USERNAME }} DEPLOY_HOST: ${{ vars.DEPLOY_HOST }} DEPLOY_PORT: ${{ vars.DEPLOY_PORT }} DEPLOY_USER: ${{ vars.DEPLOY_USER }} @@ -32,6 +31,7 @@ jobs: - name: Validate deployment configuration shell: bash env: + REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }} REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }} DEPLOY_SSH_KNOWN_HOSTS: ${{ secrets.DEPLOY_SSH_KNOWN_HOSTS }} @@ -70,6 +70,7 @@ jobs: - name: Login to container registry shell: bash env: + REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }} REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} run: | set -Eeuo pipefail @@ -104,6 +105,7 @@ jobs: - name: Deploy on production server shell: bash env: + REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }} REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }} DEPLOY_SSH_KNOWN_HOSTS: ${{ secrets.DEPLOY_SSH_KNOWN_HOSTS }} diff --git a/docs/gitea-deploy.md b/docs/gitea-deploy.md index b4eea36..cdf1fba 100644 --- a/docs/gitea-deploy.md +++ b/docs/gitea-deploy.md @@ -16,7 +16,7 @@ Keep these existing instance-level values: | Kind | Name | Purpose | | --- | --- | --- | | Variable | `REGISTRY_HOST` | Registry hostname with optional port, without `https://` | -| Variable | `REGISTRY_USERNAME` | Registry login/user name | +| Secret | `REGISTRY_USERNAME` | Registry login/user name | | Secret | `REGISTRY_PASSWORD` | Gitea PAT with `write:package` access (which includes read) | | Secret | `RELEASE_TOKEN` | Used by the separate agent release workflow |