ci: Use actions variable for dockerhub user rather than github.actor.
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
@@ -46,6 +46,7 @@ jobs:
|
|||||||
complement: ${{vars.COMPLEMENT != 'false'}}
|
complement: ${{vars.COMPLEMENT != 'false'}}
|
||||||
complement_runner: 'het'
|
complement_runner: 'het'
|
||||||
docker_repo: ${{vars.DOCKER_REPO}}
|
docker_repo: ${{vars.DOCKER_REPO}}
|
||||||
|
docker_acct: ${{vars.DOCKER_ACCT}}
|
||||||
release_url: ${{steps.release.outputs.upload_url}}
|
release_url: ${{steps.release.outputs.upload_url}}
|
||||||
pages_url: 'https://matrix-construct.github.io/tuwunel/'
|
pages_url: 'https://matrix-construct.github.io/tuwunel/'
|
||||||
rust_sdk_integ: ${{vars.RUST_SDK_INTEGRATION != 'false'}}
|
rust_sdk_integ: ${{vars.RUST_SDK_INTEGRATION != 'false'}}
|
||||||
@@ -297,6 +298,7 @@ jobs:
|
|||||||
uses: ./.github/workflows/publish.yml
|
uses: ./.github/workflows/publish.yml
|
||||||
with:
|
with:
|
||||||
docker_repo: ${{needs.init.outputs.docker_repo}}
|
docker_repo: ${{needs.init.outputs.docker_repo}}
|
||||||
|
docker_acct: ${{needs.init.outputs.docker_acct}}
|
||||||
release_url: ${{needs.init.outputs.release_url}}
|
release_url: ${{needs.init.outputs.release_url}}
|
||||||
pages_url: ${{needs.init.outputs.pages_url}}
|
pages_url: ${{needs.init.outputs.pages_url}}
|
||||||
cargo_profiles: ${{needs.init.outputs.cargo_profiles}}
|
cargo_profiles: ${{needs.init.outputs.cargo_profiles}}
|
||||||
|
|||||||
9
.github/workflows/publish.yml
vendored
9
.github/workflows/publish.yml
vendored
@@ -41,6 +41,9 @@ on:
|
|||||||
docker_repo:
|
docker_repo:
|
||||||
type: string
|
type: string
|
||||||
description: DockerHub Repository
|
description: DockerHub Repository
|
||||||
|
docker_acct:
|
||||||
|
type: string
|
||||||
|
description: DockerHub account name
|
||||||
release_url:
|
release_url:
|
||||||
type: string
|
type: string
|
||||||
description: For release assets
|
description: For release assets
|
||||||
@@ -114,7 +117,7 @@ jobs:
|
|||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: docker.io
|
registry: docker.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ inputs.docker_acct }}
|
||||||
password: ${{ secrets.dockerhub_token }}
|
password: ${{ secrets.dockerhub_token }}
|
||||||
|
|
||||||
- name: Bake
|
- name: Bake
|
||||||
@@ -176,7 +179,7 @@ jobs:
|
|||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: docker.io
|
registry: docker.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ inputs.docker_acct }}
|
||||||
password: ${{ secrets.dockerhub_token }}
|
password: ${{ secrets.dockerhub_token }}
|
||||||
|
|
||||||
- name: Release Branch
|
- name: Release Branch
|
||||||
@@ -283,7 +286,7 @@ jobs:
|
|||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: docker.io
|
registry: docker.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ inputs.docker_acct }}
|
||||||
password: ${{ secrets.dockerhub_token }}
|
password: ${{ secrets.dockerhub_token }}
|
||||||
|
|
||||||
- name: Push Branch
|
- name: Push Branch
|
||||||
|
|||||||
Reference in New Issue
Block a user