diff --git a/.github/workflows/deploy-docker-all.yml b/.github/workflows/deploy-docker-all.yml index bf2e3714..163432bc 100755 --- a/.github/workflows/deploy-docker-all.yml +++ b/.github/workflows/deploy-docker-all.yml @@ -397,6 +397,9 @@ jobs: # # # Release › Github › Meta + # + # this version of meta does not need one for amd64 and one for arm64 because both + # platforms are combined into one release, all sharing the same tags # # - name: '🔨 Github: Meta' @@ -406,7 +409,7 @@ jobs: images: | ghcr.io/${{ env.REGISTRY_REPO_AUTHOR_LC }}/${{ env.IMAGE_NAME }} tags: | - # latest yes + # tag latest = yes ( no dev ) type=raw,value=latest,enable=${{ !inputs.DEV_RELEASE }} # tag add tag @@ -436,6 +439,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Github org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" annotations: | org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} @@ -445,6 +449,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Github org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # @@ -770,6 +775,9 @@ jobs: # # # Release › Dockerhub › Meta + # + # this version of meta does not need one for amd64 and one for arm64 because both + # platforms are combined into one release, all sharing the same tags # # - name: '🔨 Dockerhub: Meta' @@ -779,7 +787,7 @@ jobs: images: | ${{ env.REGISTRY_REPO_AUTHOR_LC }}/${{ env.IMAGE_NAME }} tags: | - # latest yes + # tag latest = yes ( no dev ) type=raw,value=latest,enable=${{ !inputs.DEV_RELEASE }} # tag add tag @@ -809,6 +817,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Dockerhub org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" annotations: | org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} @@ -818,6 +827,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Dockerhub org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # @@ -1130,6 +1140,9 @@ jobs: # # # Release › Gitea › Meta › amd64 + # + # this version of meta needs one entry for amd64 and one for arm64 because each + # image needs to be uploaded manually, and then merged into a single platform. # # - name: '🔨 Gitea: Meta › amd64' @@ -1139,19 +1152,28 @@ jobs: images: | ${{ env.IMAGE_GITEA_WEBSITE }}/${{ env.REGISTRY_REPO_AUTHOR_LC }}/${{ env.IMAGE_NAME }} tags: | - # latest yes + # tag latest = yes ( no dev ) type=raw,value=latest,enable=${{ !inputs.DEV_RELEASE }} - # dispatch add x1.x.x-amd64 - type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=300,prefix=,suffix=-amd64,value=${{ env.IMAGE_VERSION }} - - # dispatch add amd64-development - type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=-amd64,value=development - - # tag add tag-amd64 + # tag add tag-amd64 ( PR or push only ) type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-amd64,event=tag - # add development tag to default architecture (amd64) + # tag add 1.0.0-amd64 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=500,prefix=,suffix=-amd64,value=${{ env.IMAGE_VERSION }} + + # tag add 1.0.0 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=450,prefix=,suffix=,value=${{ env.IMAGE_VERSION }} + + # tag add 1.0 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=425,prefix=,suffix=,value=${{ env.IMAGE_VERSION_2DIGIT }} + + # tag add 1 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=400,prefix=,suffix=,value=${{ env.IMAGE_VERSION_1DIGIT }} + + # dispatch add development-amd64 ( dispatch only + only dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=development-,suffix=,value=amd64 + + # tag add development ( amd64 + only dev ) type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development flavor: | latest=false @@ -1163,6 +1185,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Gitea org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" annotations: | org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} @@ -1172,10 +1195,14 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Gitea org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Gitea › Meta › arm64 + # + # this version of meta needs one entry for amd64 and one for arm64 because each + # image needs to be uploaded manually, and then merged into a single platform. # # - name: '🔨 Gitea: Meta › arm64' @@ -1185,17 +1212,17 @@ jobs: images: | ${{ env.IMAGE_GITEA_WEBSITE }}/${{ env.REGISTRY_REPO_AUTHOR_LC }}/${{ env.IMAGE_NAME }} tags: | - # latest yes - type=raw,value=latest,enable=${{ !inputs.DEV_RELEASE }} + # tag latest = no + type=raw,value=latest,enable=false - # dispatch add x1.x.x - type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=300,prefix=,suffix=-arm64,value=${{ env.IMAGE_VERSION }} - - # dispatch add development - type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=-arm64,value=development - - # tag add tag + # tag add tag-arm64 type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-arm64,event=tag + + # tag add 1.0.0-arm64 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=500,prefix=,suffix=-arm64,value=${{ env.IMAGE_VERSION }} + + # dispatch add development-arm64 ( dispatch only + only dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=-arm64,value=development flavor: | latest=false labels: | @@ -1206,6 +1233,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Gitea org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" annotations: | org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} @@ -1215,10 +1243,17 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Gitea org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Gitea › Meta › Release + # + # this version of meta needs one entry for amd64 and one for arm64 because each + # image needs to be uploaded manually, and then merged into a single platform. + # + # this meta action is for the final image; which has both platforms merged and + # will be the final release. # # - name: '🔨 Gitea: Meta › Release' @@ -1228,19 +1263,25 @@ jobs: images: | ${{ env.IMAGE_GITEA_WEBSITE }}/${{ env.REGISTRY_REPO_AUTHOR_LC }}/${{ env.IMAGE_NAME }} tags: | - # latest yes + # tag latest = yes ( no dev ) type=raw,value=latest,enable=${{ !inputs.DEV_RELEASE }} - # dispatch add x1.x.x - type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=300,prefix=,suffix=,value=${{ env.IMAGE_VERSION }} - - # dispatch add development - type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=,value=development - - # tag add tag + # tag add pr tag ( PR or push only ) type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=,event=tag - # add development tag to default architecture (amd64) + # tag add 1.0.0 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=450,prefix=,suffix=,value=${{ env.IMAGE_VERSION }} + + # tag add 1.0 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=425,prefix=,suffix=,value=${{ env.IMAGE_VERSION_2DIGIT }} + + # tag add 1 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=400,prefix=,suffix=,value=${{ env.IMAGE_VERSION_1DIGIT }} + + # tag add development ( dispatch only + only dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=,value=development + + # tag add development ( amd64 + only dev ) type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development flavor: | latest=false @@ -1252,6 +1293,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Gitea org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" annotations: | org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} @@ -1261,6 +1303,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Gitea org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # diff --git a/.github/workflows/deploy-docker-dockerhub.yml b/.github/workflows/deploy-docker-dockerhub.yml index 038d8925..72aef846 100755 --- a/.github/workflows/deploy-docker-dockerhub.yml +++ b/.github/workflows/deploy-docker-dockerhub.yml @@ -328,6 +328,9 @@ jobs: # # # Release › Dockerhub › Meta + # + # this version of meta does not need one for amd64 and one for arm64 because both + # platforms are combined into one release, all sharing the same tags # # - name: '🔨 Dockerhub: Meta' @@ -337,25 +340,25 @@ jobs: images: | ${{ env.REGISTRY_REPO_AUTHOR_LC }}/${{ env.IMAGE_NAME }} tags: | - # latest yes + # tag latest = yes ( no dev ) type=raw,value=latest,enable=${{ !inputs.DEV_RELEASE }} - # tag add tag + # tag add pr tag ( PR or push only ) type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=,event=tag - # dispatch add x1.x.x + # tag add 1.0.0 ( dispatch only + no dev ) type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=450,prefix=,suffix=,value=${{ env.IMAGE_VERSION }} - # dispatch add x1.x + # tag add 1.0 ( dispatch only + no dev ) type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=425,prefix=,suffix=,value=${{ env.IMAGE_VERSION_2DIGIT }} - # dispatch add x1 + # tag add 1 ( dispatch only + no dev ) type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=400,prefix=,suffix=,value=${{ env.IMAGE_VERSION_1DIGIT }} - # dispatch add development + # tag add development ( dispatch only + only dev ) type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=,value=development - # add development tag to default architecture (amd64) + # tag add development ( amd64 + only dev ) type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development flavor: | latest=false @@ -367,6 +370,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Dockerhub org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" annotations: | org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} @@ -376,6 +380,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Dockerhub org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # diff --git a/.github/workflows/deploy-docker-gitea.yml b/.github/workflows/deploy-docker-gitea.yml index fdd3338c..4e6d46f1 100755 --- a/.github/workflows/deploy-docker-gitea.yml +++ b/.github/workflows/deploy-docker-gitea.yml @@ -341,6 +341,9 @@ jobs: # # # Release › Gitea › Meta › amd64 + # + # this version of meta needs one entry for amd64 and one for arm64 because each + # image needs to be uploaded manually, and then merged into a single platform. # # - name: '🔨 Gitea: Meta › amd64' @@ -350,19 +353,28 @@ jobs: images: | ${{ env.IMAGE_GITEA_WEBSITE }}/${{ env.REGISTRY_REPO_AUTHOR_LC }}/${{ env.IMAGE_NAME }} tags: | - # latest yes + # tag latest = yes ( no dev ) type=raw,value=latest,enable=${{ !inputs.DEV_RELEASE }} - # dispatch add x1.x.x-amd64 - type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=300,prefix=,suffix=-amd64,value=${{ env.IMAGE_VERSION }} - - # dispatch add amd64-development - type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=-amd64,value=development - - # tag add tag-amd64 + # tag add tag-amd64 ( PR or push only ) type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-amd64,event=tag - # add development tag to default architecture (amd64) + # tag add 1.0.0-amd64 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=500,prefix=,suffix=-amd64,value=${{ env.IMAGE_VERSION }} + + # tag add 1.0.0 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=450,prefix=,suffix=,value=${{ env.IMAGE_VERSION }} + + # tag add 1.0 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=425,prefix=,suffix=,value=${{ env.IMAGE_VERSION_2DIGIT }} + + # tag add 1 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=400,prefix=,suffix=,value=${{ env.IMAGE_VERSION_1DIGIT }} + + # dispatch add development-amd64 ( dispatch only + only dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=development-,suffix=,value=amd64 + + # tag add development ( amd64 + only dev ) type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development flavor: | latest=false @@ -374,6 +386,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Gitea org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" annotations: | org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} @@ -383,10 +396,14 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Gitea org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Gitea › Meta › arm64 + # + # this version of meta needs one entry for amd64 and one for arm64 because each + # image needs to be uploaded manually, and then merged into a single platform. # # - name: '🔨 Gitea: Meta › arm64' @@ -396,14 +413,17 @@ jobs: images: | ${{ env.IMAGE_GITEA_WEBSITE }}/${{ env.REGISTRY_REPO_AUTHOR_LC }}/${{ env.IMAGE_NAME }} tags: | - # dispatch add x1.x.x - type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=300,prefix=,suffix=-arm64,value=${{ env.IMAGE_VERSION }} + # tag latest = no + type=raw,value=latest,enable=false - # dispatch add development - type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=-arm64,value=development - - # tag add tag + # tag add tag-arm64 type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-arm64,event=tag + + # tag add 1.0.0-arm64 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=500,prefix=,suffix=-arm64,value=${{ env.IMAGE_VERSION }} + + # dispatch add development-arm64 ( dispatch only + only dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=-arm64,value=development flavor: | latest=false labels: | @@ -414,6 +434,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Gitea org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" annotations: | org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} @@ -423,10 +444,17 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Gitea org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Gitea › Meta › Release + # + # this version of meta needs one entry for amd64 and one for arm64 because each + # image needs to be uploaded manually, and then merged into a single platform. + # + # this meta action is for the final image; which has both platforms merged and + # will be the final release. # # - name: '🔨 Gitea: Meta › Release' @@ -436,19 +464,25 @@ jobs: images: | ${{ env.IMAGE_GITEA_WEBSITE }}/${{ env.REGISTRY_REPO_AUTHOR_LC }}/${{ env.IMAGE_NAME }} tags: | - # latest yes + # tag latest = yes ( no dev ) type=raw,value=latest,enable=${{ !inputs.DEV_RELEASE }} - # dispatch add x1.x.x - type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=300,prefix=,suffix=,value=${{ env.IMAGE_VERSION }} - - # dispatch add development - type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=,value=development - - # tag add tag + # tag add pr tag ( PR or push only ) type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=,event=tag - # add development tag to default architecture (amd64) + # tag add 1.0.0 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=450,prefix=,suffix=,value=${{ env.IMAGE_VERSION }} + + # tag add 1.0 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=425,prefix=,suffix=,value=${{ env.IMAGE_VERSION_2DIGIT }} + + # tag add 1 ( dispatch only + no dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=400,prefix=,suffix=,value=${{ env.IMAGE_VERSION_1DIGIT }} + + # tag add development ( dispatch only + only dev ) + type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=,value=development + + # tag add development ( amd64 + only dev ) type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development flavor: | latest=false @@ -460,6 +494,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Gitea org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" annotations: | org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} @@ -469,6 +504,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Gitea org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # diff --git a/.github/workflows/deploy-docker-github.yml b/.github/workflows/deploy-docker-github.yml index da5676d3..1322d2f9 100755 --- a/.github/workflows/deploy-docker-github.yml +++ b/.github/workflows/deploy-docker-github.yml @@ -349,6 +349,9 @@ jobs: # # # Release › Github › Meta + # + # this version of meta does not need one for amd64 and one for arm64 because both + # platforms are combined into one release, all sharing the same tags # # - name: '🔨 Github: Meta' @@ -358,25 +361,25 @@ jobs: images: | ghcr.io/${{ env.REGISTRY_REPO_AUTHOR_LC }}/${{ env.IMAGE_NAME }} tags: | - # latest yes + # tag latest = yes ( no dev ) type=raw,value=latest,enable=${{ !inputs.DEV_RELEASE }} - # tag add tag + # tag add pr tag ( PR or push only ) type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=,event=tag - # dispatch add x1.x.x + # tag add 1.0.0 ( dispatch only + no dev ) type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=450,prefix=,suffix=,value=${{ env.IMAGE_VERSION }} - # dispatch add x1.x + # tag add 1.0 ( dispatch only + no dev ) type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=425,prefix=,suffix=,value=${{ env.IMAGE_VERSION_2DIGIT }} - # dispatch add x1 + # tag add 1 ( dispatch only + no dev ) type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == false }},priority=400,prefix=,suffix=,value=${{ env.IMAGE_VERSION_1DIGIT }} - # dispatch add development + # tag add development ( dispatch only + only dev ) type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=,value=development - # add development tag to default architecture (amd64) + # tag add development ( amd64 + only dev ) type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development flavor: | latest=false @@ -388,6 +391,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Github org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" annotations: | org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} @@ -397,6 +401,7 @@ jobs: org.opencontainers.image.vendor=${{ env.REGISTRY_REPO_AUTHOR_LC }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.opencontainers.image.registry=Github org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # @@ -415,6 +420,8 @@ jobs: labels: ${{ steps.task_release_gh_meta.outputs.labels }} tags: | ${{ steps.task_release_gh_meta.outputs.tags }} + annotations: | + ${{ steps.task_release_gh_meta.outputs.annotations }} provenance: false sbom: false build-args: |- @@ -438,6 +445,8 @@ jobs: labels: ${{ steps.task_release_gh_meta.outputs.labels }} tags: | ${{ steps.task_release_gh_meta.outputs.tags }} + annotations: | + ${{ steps.task_release_gh_meta.outputs.annotations }} provenance: false sbom: false build-args: |- @@ -453,13 +462,14 @@ jobs: id: task_release_gh_manifest uses: int128/docker-manifest-create-action@v2 with: - tags: | - ${{ steps.task_release_gh_meta.outputs.tags }} - sources: | - ghcr.io/${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}@${{ steps.task_release_gh_push_amd64.outputs.digest }} - ghcr.io/${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}@${{ steps.task_release_gh_push_arm64.outputs.digest }} - index-annotations: | - ${{ steps.task_release_gh_meta.outputs.labels }} + push: ${{ !inputs.DRY_RUN }} + tags: | + ${{ steps.task_release_gh_meta.outputs.tags }} + sources: | + ghcr.io/${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}@${{ steps.task_release_gh_push_amd64.outputs.digest }} + ghcr.io/${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}@${{ steps.task_release_gh_push_arm64.outputs.digest }} + index-annotations: | + ${{ steps.task_release_gh_meta.outputs.labels }} # # # Release › Github › Checkpoint