From 7341ed322c62dcbf12271b8649036a6627264653 Mon Sep 17 00:00:00 2001 From: Aetherinox Date: Sat, 22 Feb 2025 03:55:26 -0700 Subject: [PATCH] ci: conformity for deployment docker workflows --- .github/workflows/deploy-docker-dockerhub.yml | 54 ++++++++-------- .github/workflows/deploy-docker-gitea.yml | 62 +++++++++---------- .github/workflows/deploy-docker-github.yml | 56 ++++++++--------- 3 files changed, 86 insertions(+), 86 deletions(-) diff --git a/.github/workflows/deploy-docker-dockerhub.yml b/.github/workflows/deploy-docker-dockerhub.yml index 933c59cf..353fc454 100644 --- a/.github/workflows/deploy-docker-dockerhub.yml +++ b/.github/workflows/deploy-docker-dockerhub.yml @@ -31,8 +31,8 @@ on: # # # Image Name # - # used in github image path - # ${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + # used in dockerhub image path + # ${{ env.IMAGE_DOCKERHUB_AUTHOR }}/${{ env.IMAGE_NAME }} # # IMAGE_NAME: @@ -41,19 +41,6 @@ on: default: 'tvapp2' type: string - # # - # Image Author - # - # used in github image path - # ${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} - # # - - IMAGE_AUTHOR: - description: '🪪 Image Author' - required: true - default: 'TheBinaryNinja' - type: string - # # # Image Version # @@ -67,7 +54,20 @@ on: type: string # # - # Image Dockerhub username + # Dockerhub › Author + # + # used in dockerhub image path + # hub.docker.com/r/${{ env.IMAGE_DOCKERHUB_AUTHOR }}/${{ env.IMAGE_NAME }} + # # + + IMAGE_DOCKERHUB_AUTHOR: + description: '🪪 Image Author' + required: true + default: 'TheBinaryNinja' + type: string + + # # + # Dockerhub › Username # # this is the user to sign into Dockerhub as. # this username MUST be lowercase or you will get `unauthorized: incorrect username or password` @@ -115,7 +115,7 @@ on: env: IMAGE_NAME: ${{ github.event.inputs.IMAGE_NAME || 'tvapp2' }} - IMAGE_AUTHOR: ${{ github.event.inputs.IMAGE_AUTHOR || 'thebinaryninja' }} + IMAGE_DOCKERHUB_AUTHOR: ${{ github.event.inputs.IMAGE_DOCKERHUB_AUTHOR || 'thebinaryninja' }} IMAGE_VERSION: ${{ github.event.inputs.IMAGE_VERSION || '1.0.0' }} IMAGE_DOCKERHUB_USERNAME: ${{ github.event.inputs.IMAGE_DOCKERHUB_USERNAME || 'thebinaryninja' }} BOT_NAME_1: EuropaServ @@ -327,7 +327,7 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + ${{ env.IMAGE_DOCKERHUB_AUTHOR }}/${{ env.IMAGE_NAME }} tags: | # latest no type=raw,value=latest,enable=false @@ -347,8 +347,8 @@ jobs: org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} - org.opencontainers.image.vendor=${{ env.IMAGE_AUTHOR }} - org.opencontainers.image.ref.name=${{ env.GIT_REF }} + org.opencontainers.image.vendor=${{ env.IMAGE_DOCKERHUB_AUTHOR }} + org.opencontainers.image.ref.name=${{ env.ref_name }} # # # Release › Dockerhub › Checkpoint › Arm64 @@ -363,7 +363,7 @@ jobs: echo "github.ref_name ...... ${{ github.ref_name }}" echo "github.event_name .... ${{ github.event_name }}" echo "inputs.DRY_RUN ....... ${{ inputs.DRY_RUN }}" - echo "env.AUTHOR ........... ${{ env.IMAGE_AUTHOR }}" + echo "env.AUTHOR ........... ${{ env.IMAGE_DOCKERHUB_AUTHOR }}" echo "tags ................. ${{ steps.task_release_dh_meta.outputs.tags }}" echo "labels ............... ${{ steps.task_release_dh_meta.outputs.labels }}" @@ -418,7 +418,7 @@ jobs: - Source: `Dockerhub` https://hub.docker.com/r/${{ env.IMAGE_DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }} - Docker Image: `${{ env.IMAGE_NAME }}-${{ env.IMAGE_VERSION }}` - Version: `${{ env.IMAGE_VERSION }}` - - Pull URL: https://ghcr.io/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + - Pull URL: ${{ env.IMAGE_DOCKERHUB_AUTHOR }}/${{ env.IMAGE_NAME }} - Dry Run: `${{ inputs.DRY_RUN }}` - Branch: `${{ github.ref_name }}` - Workflow: `${{ github.workflow }} (#${{github.run_number}})` @@ -570,7 +570,7 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + ${{ env.IMAGE_DOCKERHUB_AUTHOR }}/${{ env.IMAGE_NAME }} tags: | # latest yes type=raw,value=latest,enable=${{ !inputs.DEV_RELEASE }} @@ -593,8 +593,8 @@ jobs: org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} - org.opencontainers.image.vendor=${{ env.IMAGE_AUTHOR }} - org.opencontainers.image.ref.name=${{ env.GIT_REF }} + org.opencontainers.image.vendor=${{ env.IMAGE_DOCKERHUB_AUTHOR }} + org.opencontainers.image.ref.name=${{ env.ref_name }} # # # Release › Dockerhub › Checkpoint › Amd64 @@ -609,7 +609,7 @@ jobs: echo "github.ref_name ...... ${{ github.ref_name }}" echo "github.event_name .... ${{ github.event_name }}" echo "inputs.DRY_RUN ....... ${{ inputs.DRY_RUN }}" - echo "env.AUTHOR ........... ${{ env.IMAGE_AUTHOR }}" + echo "env.AUTHOR ........... ${{ env.IMAGE_DOCKERHUB_AUTHOR }}" echo "tags ................. ${{ steps.task_release_dh_meta.outputs.tags }}" echo "labels ............... ${{ steps.task_release_dh_meta.outputs.labels }}" @@ -664,7 +664,7 @@ jobs: - Source: `Dockerhub` https://hub.docker.com/r/${{ env.IMAGE_DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }} - Docker Image: `${{ env.IMAGE_NAME }}-${{ env.IMAGE_VERSION }}` - Version: `${{ env.IMAGE_VERSION }}` - - Pull URL: https://ghcr.io/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + - Pull URL: ${{ env.IMAGE_DOCKERHUB_AUTHOR }}/${{ env.IMAGE_NAME }} - Dry Run: `${{ inputs.DRY_RUN }}` - Branch: `${{ github.ref_name }}` - Workflow: `${{ github.workflow }} (#${{github.run_number}})` diff --git a/.github/workflows/deploy-docker-gitea.yml b/.github/workflows/deploy-docker-gitea.yml index 5f4d67d0..300853c1 100644 --- a/.github/workflows/deploy-docker-gitea.yml +++ b/.github/workflows/deploy-docker-gitea.yml @@ -6,8 +6,8 @@ # upload this workflow to both the `main` branch of the tvapp2 repository # @secrets secrets.ADMINSERV_GPG_KEY_ASC gpg private key (armored) | BEGIN PGP PRIVATE KEY BLOCK # secrets.ADMINSERV_GPG_PASSPHRASE gpg private key passphrase -# secrets.ORG_GITEA_BINARYNINJA_TOKEN github personal access token (classic) with package:write permission -# secrets.DISCORD_WEBHOOK_CHAN_GITHUB_TVAPP2_RELEASES Discord webhook to report releases from github to discord +# secrets.ORG_BINARYNINJA_GITEA_TOKEN gitea personal access token (classic) with package:write permission +# secrets.DISCORD_WEBHOOK_CHAN_GITHUB_TVAPP2_RELEASES Discord webhook to report releases from gitea to discord # # name: "📦 Deploy › Docker › Gitea" @@ -32,7 +32,7 @@ on: # Image Name # # used in github image path - # git.binaryninja.net/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + # git.binaryninja.net/${{ env.IMAGE_GITEA_AUTHOR }}/${{ env.IMAGE_NAME }} # # IMAGE_NAME: @@ -41,19 +41,6 @@ on: default: 'tvapp2' type: string - # # - # Image Author - # - # used in github image path - # git.binaryninja.net/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} - # # - - IMAGE_AUTHOR: - description: '🪪 Image Author' - required: true - default: 'BinaryNinja' - type: string - # # # Image Version # @@ -67,9 +54,22 @@ on: type: string # # - # Image ghcr username + # Gitea › Author # - # this is the user to sign into ghcr as. + # used in github image path + # git.binaryninja.net/${{ env.IMAGE_GITEA_AUTHOR }}/${{ env.IMAGE_NAME }} + # # + + IMAGE_GITEA_AUTHOR: + description: '🪪 Image Author' + required: true + default: 'BinaryNinja' + type: string + + # # + # Gitea › Username + # + # this is the user to sign into gitea as. # # IMAGE_GITEA_USERNAME: @@ -114,7 +114,7 @@ on: env: IMAGE_NAME: ${{ github.event.inputs.IMAGE_NAME || 'tvapp2' }} - IMAGE_AUTHOR: ${{ github.event.inputs.IMAGE_AUTHOR || 'BinaryNinja' }} + IMAGE_GITEA_AUTHOR: ${{ github.event.inputs.IMAGE_GITEA_AUTHOR || 'BinaryNinja' }} IMAGE_VERSION: ${{ github.event.inputs.IMAGE_VERSION || '1.0.0' }} IMAGE_GITEA_USERNAME: ${{ github.event.inputs.IMAGE_GITEA_USERNAME || 'BinaryNinja' }} BOT_NAME_1: EuropaServ @@ -316,7 +316,7 @@ jobs: with: registry: git.binaryninja.net username: ${{ env.IMAGE_GITEA_USERNAME }} - password: ${{ secrets.ORG_GITEA_BINARYNINJA_TOKEN }} + password: ${{ secrets.ORG_BINARYNINJA_GITEA_TOKEN }} # # # Release › Gitea › Meta › Arm64 @@ -327,7 +327,7 @@ jobs: uses: docker/metadata-action@v5 with: images: | - git.binaryninja.net/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + git.binaryninja.net/${{ env.IMAGE_GITEA_AUTHOR }}/${{ env.IMAGE_NAME }} tags: | # latest no type=raw,value=latest,enable=false @@ -344,8 +344,8 @@ jobs: org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} - org.opencontainers.image.vendor=${{ env.IMAGE_AUTHOR }} - org.opencontainers.image.ref.name=${{ env.GIT_REF }} + org.opencontainers.image.vendor=${{ env.IMAGE_GITEA_AUTHOR }} + org.opencontainers.image.ref.name=${{ env.ref_name }} # # # Release › Gitea › Checkpoint › Arm64 @@ -360,7 +360,7 @@ jobs: echo "github.ref_name ...... ${{ github.ref_name }}" echo "github.event_name .... ${{ github.event_name }}" echo "inputs.DRY_RUN ....... ${{ inputs.DRY_RUN }}" - echo "env.AUTHOR ........... ${{ env.IMAGE_AUTHOR }}" + echo "env.AUTHOR ........... ${{ env.IMAGE_GITEA_AUTHOR }}" echo "tags ................. ${{ steps.task_release_gh_meta.outputs.tags }}" echo "labels ............... ${{ steps.task_release_gh_meta.outputs.labels }}" @@ -415,7 +415,7 @@ jobs: - Source: `Gitea` https://git.binaryninja.net/${{ env.IMAGE_GITEA_USERNAME }}/${{ env.IMAGE_NAME }}/packages - Docker Image: `${{ env.IMAGE_NAME }}-${{ env.IMAGE_VERSION }}` - Version: `${{ env.IMAGE_VERSION }}` - - Pull URL: https://git.binaryninja.net/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + - Pull URL: https://git.binaryninja.net/${{ env.IMAGE_GITEA_AUTHOR }}/${{ env.IMAGE_NAME }} - Branch: `${{ github.ref_name }}` - Workflow: `${{ github.workflow }} (#${{github.run_number}})` - Runner: `${{ runner.name }}` @@ -556,7 +556,7 @@ jobs: with: registry: git.binaryninja.net username: ${{ env.IMAGE_GITEA_USERNAME }} - password: ${{ secrets.ORG_GITEA_BINARYNINJA_TOKEN }} + password: ${{ secrets.ORG_BINARYNINJA_GITEA_TOKEN }} # # # Release › Gitea › Meta › Amd64 @@ -567,7 +567,7 @@ jobs: uses: docker/metadata-action@v5 with: images: | - git.binaryninja.net/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + git.binaryninja.net/${{ env.IMAGE_GITEA_AUTHOR }}/${{ env.IMAGE_NAME }} tags: | # latest yes type=raw,value=latest,enable=${{ !inputs.DEV_RELEASE }} @@ -586,8 +586,8 @@ jobs: org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} - org.opencontainers.image.vendor=${{ env.IMAGE_AUTHOR }} - org.opencontainers.image.ref.name=${{ env.GIT_REF }} + org.opencontainers.image.vendor=${{ env.IMAGE_GITEA_AUTHOR }} + org.opencontainers.image.ref.name=${{ env.ref_name }} # # # Release › Gitea › Checkpoint › Amd64 @@ -602,7 +602,7 @@ jobs: echo "github.ref_name ...... ${{ github.ref_name }}" echo "github.event_name .... ${{ github.event_name }}" echo "inputs.DRY_RUN ....... ${{ inputs.DRY_RUN }}" - echo "env.AUTHOR ........... ${{ env.IMAGE_AUTHOR }}" + echo "env.AUTHOR ........... ${{ env.IMAGE_GITEA_AUTHOR }}" echo "tags ................. ${{ steps.task_release_gh_meta.outputs.tags }}" echo "labels ............... ${{ steps.task_release_gh_meta.outputs.labels }}" @@ -656,7 +656,7 @@ jobs: - Source: `Gitea` https://git.binaryninja.net/${{ env.IMAGE_GITEA_USERNAME }}/${{ env.IMAGE_NAME }}/packages - Docker Image: `${{ env.IMAGE_NAME }}-${{ env.IMAGE_VERSION }}` - Version: `${{ env.IMAGE_VERSION }}` - - Pull URL: https://git.binaryninja.net/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + - Pull URL: https://git.binaryninja.net/${{ env.IMAGE_GITEA_AUTHOR }}/${{ env.IMAGE_NAME }} - Branch: `${{ github.ref_name }}` - Workflow: `${{ github.workflow }} (#${{github.run_number}})` - Runner: `${{ runner.name }}` diff --git a/.github/workflows/deploy-docker-github.yml b/.github/workflows/deploy-docker-github.yml index d5fa155d..9a40b4ac 100644 --- a/.github/workflows/deploy-docker-github.yml +++ b/.github/workflows/deploy-docker-github.yml @@ -6,7 +6,7 @@ # upload this workflow to both the `main` branch of the tvapp2 repository # @secrets secrets.ADMINSERV_GPG_KEY_ASC gpg private key (armored) | BEGIN PGP PRIVATE KEY BLOCK # secrets.ADMINSERV_GPG_PASSPHRASE gpg private key passphrase -# secrets.IMAGE_GHCR_TOKEN github personal access token (classic) with package:write permission +# secrets.ORG_BINARYNINJA_TOKEN_CL github personal access token (classic) with package:write permission # secrets.DISCORD_WEBHOOK_CHAN_GITHUB_TVAPP2_RELEASES Discord webhook to report releases from github to discord # # @@ -32,7 +32,7 @@ on: # Image Name # # used in github image path - # ghcr.io/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + # ghcr.io/${{ env.IMAGE_GHCR_AUTHOR }}/${{ env.IMAGE_NAME }} # # IMAGE_NAME: @@ -41,19 +41,6 @@ on: default: 'tvapp2' type: string - # # - # Image Author - # - # used in github image path - # ghcr.io/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} - # # - - IMAGE_AUTHOR: - description: '🪪 Image Author' - required: true - default: 'TheBinaryNinja' - type: string - # # # Image Version # @@ -66,6 +53,19 @@ on: default: '1.0.0' type: string + # # + # Image Author + # + # used in github image path + # ghcr.io/${{ env.IMAGE_GHCR_AUTHOR }}/${{ env.IMAGE_NAME }} + # # + + IMAGE_GHCR_AUTHOR: + description: '🪪 Image Author' + required: true + default: 'TheBinaryNinja' + type: string + # # # Image ghcr username # @@ -114,7 +114,7 @@ on: env: IMAGE_NAME: ${{ github.event.inputs.IMAGE_NAME || 'tvapp2' }} - IMAGE_AUTHOR: ${{ github.event.inputs.IMAGE_AUTHOR || 'BinaryNinja' }} + IMAGE_GHCR_AUTHOR: ${{ github.event.inputs.IMAGE_GHCR_AUTHOR || 'BinaryNinja' }} IMAGE_VERSION: ${{ github.event.inputs.IMAGE_VERSION || '1.0.0' }} IMAGE_GHCR_USERNAME: ${{ github.event.inputs.IMAGE_GHCR_USERNAME || 'BinaryNinja' }} BOT_NAME_1: EuropaServ @@ -316,7 +316,7 @@ jobs: with: registry: ghcr.io username: ${{ env.IMAGE_GHCR_USERNAME }} - password: ${{ secrets.IMAGE_GHCR_TOKEN }} + password: ${{ secrets.ORG_BINARYNINJA_TOKEN_CL }} # # # Release › Github › Meta › Arm64 @@ -327,7 +327,7 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ghcr.io/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + ghcr.io/${{ env.IMAGE_GHCR_AUTHOR }}/${{ env.IMAGE_NAME }} tags: | # latest no type=raw,value=latest,enable=false @@ -344,8 +344,8 @@ jobs: org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} - org.opencontainers.image.vendor=${{ env.IMAGE_AUTHOR }} - org.opencontainers.image.ref.name=${{ env.GIT_REF }} + org.opencontainers.image.vendor=${{ env.IMAGE_GHCR_AUTHOR }} + org.opencontainers.image.ref.name=${{ env.ref_name }} # # # Release › Github › Checkpoint › Arm64 @@ -360,7 +360,7 @@ jobs: echo "github.ref_name ...... ${{ github.ref_name }}" echo "github.event_name .... ${{ github.event_name }}" echo "inputs.DRY_RUN ....... ${{ inputs.DRY_RUN }}" - echo "env.AUTHOR ........... ${{ env.IMAGE_AUTHOR }}" + echo "env.AUTHOR ........... ${{ env.IMAGE_GHCR_AUTHOR }}" echo "tags ................. ${{ steps.task_release_gh_meta.outputs.tags }}" echo "labels ............... ${{ steps.task_release_gh_meta.outputs.labels }}" @@ -415,7 +415,7 @@ jobs: - Source: `Github` https://github.com/${{ github.repository }} - Docker Image: `${{ env.IMAGE_NAME }}-${{ env.IMAGE_VERSION }}` - Version: `${{ env.IMAGE_VERSION }}` - - Pull URL: https://ghcr.io/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + - Pull URL: https://ghcr.io/${{ env.IMAGE_GHCR_AUTHOR }}/${{ env.IMAGE_NAME }} - Branch: `${{ github.ref_name }}` - Workflow: `${{ github.workflow }} (#${{github.run_number}})` - Runner: `${{ runner.name }}` @@ -556,7 +556,7 @@ jobs: with: registry: ghcr.io username: ${{ env.IMAGE_GHCR_USERNAME }} - password: ${{ secrets.IMAGE_GHCR_TOKEN }} + password: ${{ secrets.ORG_BINARYNINJA_TOKEN_CL }} # # # Release › Github › Meta › Amd64 @@ -567,7 +567,7 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ghcr.io/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + ghcr.io/${{ env.IMAGE_GHCR_AUTHOR }}/${{ env.IMAGE_NAME }} tags: | # latest yes type=raw,value=latest,enable=${{ !inputs.DEV_RELEASE }} @@ -586,8 +586,8 @@ jobs: org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} - org.opencontainers.image.vendor=${{ env.IMAGE_AUTHOR }} - org.opencontainers.image.ref.name=${{ env.GIT_REF }} + org.opencontainers.image.vendor=${{ env.IMAGE_GHCR_AUTHOR }} + org.opencontainers.image.ref.name=${{ env.ref_name }} # # # Release › Github › Checkpoint › Amd64 @@ -602,7 +602,7 @@ jobs: echo "github.ref_name ...... ${{ github.ref_name }}" echo "github.event_name .... ${{ github.event_name }}" echo "inputs.DRY_RUN ....... ${{ inputs.DRY_RUN }}" - echo "env.AUTHOR ........... ${{ env.IMAGE_AUTHOR }}" + echo "env.AUTHOR ........... ${{ env.IMAGE_GHCR_AUTHOR }}" echo "tags ................. ${{ steps.task_release_gh_meta.outputs.tags }}" echo "labels ............... ${{ steps.task_release_gh_meta.outputs.labels }}" @@ -656,7 +656,7 @@ jobs: - Source: `Github` https://github.com/${{ github.repository }} - Docker Image: `${{ env.IMAGE_NAME }}-${{ env.IMAGE_VERSION }}` - Version: `${{ env.IMAGE_VERSION }}` - - Pull URL: https://ghcr.io/${{ env.IMAGE_AUTHOR }}/${{ env.IMAGE_NAME }} + - Pull URL: https://ghcr.io/${{ env.IMAGE_GHCR_AUTHOR }}/${{ env.IMAGE_NAME }} - Branch: `${{ github.ref_name }}` - Workflow: `${{ github.workflow }} (#${{github.run_number}})` - Runner: `${{ runner.name }}`