From 57b0d44c7d13a8c35d4b724868a3bccd8764c767 Mon Sep 17 00:00:00 2001 From: Aetherinox Date: Tue, 25 Feb 2025 06:41:37 -0700 Subject: [PATCH] chore: update docker image labels to conform with opencontainers spec https://github.com/opencontainers/image-spec/blob/main/annotations.md --- .github/workflows/deploy-docker-all.yml | 67 +++++++++++-------- .github/workflows/deploy-docker-dockerhub.yml | 19 +++--- .github/workflows/deploy-docker-gitea.yml | 29 ++++---- .github/workflows/deploy-docker-giteacom.yml | 36 +++++----- .github/workflows/deploy-docker-github.yml | 19 +++--- Dockerfile | 27 ++++---- 6 files changed, 112 insertions(+), 85 deletions(-) diff --git a/.github/workflows/deploy-docker-all.yml b/.github/workflows/deploy-docker-all.yml index 713b19ee..2533b3d7 100755 --- a/.github/workflows/deploy-docker-all.yml +++ b/.github/workflows/deploy-docker-all.yml @@ -314,12 +314,13 @@ jobs: - name: '🕛 Get Timestamp' id: task_release_set_timestamp run: | - echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} - echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV - echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV - echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV - echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV - echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV + echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} # binaryninja/tvapp2 + echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV # 71fad013cfce9116ec62779e4a7e627fe4c33627 + echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV # 02-25-2025 12:49:48 + echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV # 02-25-2025 + echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV # 02-25-2025 12:49 + echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV # 20250225 + echo "NOW_DOCKER_TS=$(date -u +'%FT%T.%3NZ')" >> $GITHUB_ENV # 2025-02-25T12:50:11.569Z # # # Release › Github › Install Dependencies @@ -417,13 +418,14 @@ jobs: flavor: | latest=${{ !inputs.DEV_RELEASE }} labels: | - org.opencontainers.image.VERSION=${{ env.IMAGE_VERSION }} - org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} + org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} + org.opencontainers.image.version=${{ env.IMAGE_VERSION }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.vendor=${{ env.IMAGE_GHCR_AUTHOR }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Github › Build and Push › Amd64 @@ -518,6 +520,7 @@ jobs: echo "env.NOW_SHORT ............................ ${{ env.NOW_SHORT }}" echo "env.NOW_LONG ............................. ${{ env.NOW_LONG }}" echo "env.NOW_DOCKER_LABEL ..................... ${{ env.NOW_DOCKER_LABEL }}" + echo "env.NOW_DOCKER_TS ........................ ${{ env.NOW_DOCKER_TS }}" echo "env.DOCKER_IMAGE ......................... ${{ env.DOCKER_IMAGE }}" echo "env.DOCKER_SHA ........................... ${{ env.DOCKER_SHA }}" echo "" @@ -637,12 +640,13 @@ jobs: - name: '🕛 Get Timestamp' id: task_release_set_timestamp run: | - echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} - echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV - echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV - echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV - echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV - echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV + echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} # binaryninja/tvapp2 + echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV # 71fad013cfce9116ec62779e4a7e627fe4c33627 + echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV # 02-25-2025 12:49:48 + echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV # 02-25-2025 + echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV # 02-25-2025 12:49 + echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV # 20250225 + echo "NOW_DOCKER_TS=$(date -u +'%FT%T.%3NZ')" >> $GITHUB_ENV # 2025-02-25T12:50:11.569Z # # # Release › Dockerhub › Install Dependencies @@ -739,13 +743,14 @@ jobs: flavor: | latest=${{ !inputs.DEV_RELEASE }} labels: | - org.opencontainers.image.VERSION=${{ env.IMAGE_VERSION }} - org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} + org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} + org.opencontainers.image.version=${{ env.IMAGE_VERSION }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.vendor=${{ env.IMAGE_DOCKERHUB_AUTHOR }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Dockerhub › Build and Push › Amd64 @@ -840,6 +845,7 @@ jobs: echo "env.NOW_SHORT ............................ ${{ env.NOW_SHORT }}" echo "env.NOW_LONG ............................. ${{ env.NOW_LONG }}" echo "env.NOW_DOCKER_LABEL ..................... ${{ env.NOW_DOCKER_LABEL }}" + echo "env.NOW_DOCKER_TS ........................ ${{ env.NOW_DOCKER_TS }}" echo "env.DOCKER_IMAGE ......................... ${{ env.DOCKER_IMAGE }}" echo "env.DOCKER_SHA ........................... ${{ env.DOCKER_SHA }}" echo "" @@ -959,12 +965,13 @@ jobs: - name: '🕛 Get Timestamp' id: task_release_set_timestamp run: | - echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} - echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV - echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV - echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV - echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV - echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV + echo "DOCKER_IMAGE=`echo ${{ env.IMAGE_GITEA_AUTHOR }}/${{ env.IMAGE_NAME }} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} # binaryninja/tvapp2 + echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV # 71fad013cfce9116ec62779e4a7e627fe4c33627 + echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV # 02-25-2025 12:49:48 + echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV # 02-25-2025 + echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV # 02-25-2025 12:49 + echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV # 20250225 + echo "NOW_DOCKER_TS=$(date -u +'%FT%T.%3NZ')" >> $GITHUB_ENV # 2025-02-25T12:50:11.569Z # # # Release › Gitea › Install Dependencies @@ -1062,13 +1069,14 @@ jobs: flavor: | latest=${{ !inputs.DEV_RELEASE }} labels: | - org.opencontainers.image.VERSION=${{ env.IMAGE_VERSION }} - org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} + org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} + org.opencontainers.image.version=${{ env.IMAGE_VERSION }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.vendor=${{ env.IMAGE_GITEA_AUTHOR }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Gitea › Meta › arm64 @@ -1095,13 +1103,14 @@ jobs: flavor: | latest=${{ !inputs.DEV_RELEASE }} labels: | - org.opencontainers.image.VERSION=${{ env.IMAGE_VERSION }} - org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} + org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} + org.opencontainers.image.version=${{ env.IMAGE_VERSION }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.vendor=${{ env.IMAGE_GITEA_AUTHOR }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Gitea › Meta › Release @@ -1131,13 +1140,14 @@ jobs: flavor: | latest=${{ !inputs.DEV_RELEASE }} labels: | - org.opencontainers.image.VERSION=${{ env.IMAGE_VERSION }} - org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} + org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} + org.opencontainers.image.version=${{ env.IMAGE_VERSION }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.vendor=${{ env.IMAGE_GITEA_AUTHOR }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Gitea › Build and Push › Amd64 @@ -1237,6 +1247,7 @@ jobs: echo "env.NOW_SHORT ............................ ${{ env.NOW_SHORT }}" echo "env.NOW_LONG ............................. ${{ env.NOW_LONG }}" echo "env.NOW_DOCKER_LABEL ..................... ${{ env.NOW_DOCKER_LABEL }}" + echo "env.NOW_DOCKER_TS ........................ ${{ env.NOW_DOCKER_TS }}" echo "env.DOCKER_IMAGE ......................... ${{ env.DOCKER_IMAGE }}" echo "env.DOCKER_SHA ........................... ${{ env.DOCKER_SHA }}" echo "" diff --git a/.github/workflows/deploy-docker-dockerhub.yml b/.github/workflows/deploy-docker-dockerhub.yml index 29350e9c..d143a895 100755 --- a/.github/workflows/deploy-docker-dockerhub.yml +++ b/.github/workflows/deploy-docker-dockerhub.yml @@ -246,12 +246,13 @@ jobs: - name: '🕛 Get Timestamp' id: task_release_set_timestamp run: | - echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} - echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV - echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV - echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV - echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV - echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV + echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} # binaryninja/tvapp2 + echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV # 71fad013cfce9116ec62779e4a7e627fe4c33627 + echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV # 02-25-2025 12:49:48 + echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV # 02-25-2025 + echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV # 02-25-2025 12:49 + echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV # 20250225 + echo "NOW_DOCKER_TS=$(date -u +'%FT%T.%3NZ')" >> $GITHUB_ENV # 2025-02-25T12:50:11.569Z # # # Release › Dockerhub › Install Dependencies @@ -348,13 +349,14 @@ jobs: flavor: | latest=${{ !inputs.DEV_RELEASE }} labels: | - org.opencontainers.image.VERSION=${{ env.IMAGE_VERSION }} - org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} + org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} + org.opencontainers.image.version=${{ env.IMAGE_VERSION }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.vendor=${{ env.IMAGE_DOCKERHUB_AUTHOR }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Dockerhub › Build and Push › Amd64 @@ -449,6 +451,7 @@ jobs: echo "env.NOW_SHORT ............................ ${{ env.NOW_SHORT }}" echo "env.NOW_LONG ............................. ${{ env.NOW_LONG }}" echo "env.NOW_DOCKER_LABEL ..................... ${{ env.NOW_DOCKER_LABEL }}" + echo "env.NOW_DOCKER_TS ........................ ${{ env.NOW_DOCKER_TS }}" echo "env.DOCKER_IMAGE ......................... ${{ env.DOCKER_IMAGE }}" echo "env.DOCKER_SHA ........................... ${{ env.DOCKER_SHA }}" echo "" diff --git a/.github/workflows/deploy-docker-gitea.yml b/.github/workflows/deploy-docker-gitea.yml index c3b24994..8469bd8d 100755 --- a/.github/workflows/deploy-docker-gitea.yml +++ b/.github/workflows/deploy-docker-gitea.yml @@ -258,12 +258,13 @@ jobs: - name: '🕛 Get Timestamp' id: task_release_set_timestamp run: | - echo "DOCKER_IMAGE=`echo ${{ env.IMAGE_GITEA_AUTHOR }}/${{ env.IMAGE_NAME }} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} - echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV - echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV - echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV - echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV - echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV + echo "DOCKER_IMAGE=`echo ${{ env.IMAGE_GITEA_AUTHOR }}/${{ env.IMAGE_NAME }} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} # binaryninja/tvapp2 + echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV # 71fad013cfce9116ec62779e4a7e627fe4c33627 + echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV # 02-25-2025 12:49:48 + echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV # 02-25-2025 + echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV # 02-25-2025 12:49 + echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV # 20250225 + echo "NOW_DOCKER_TS=$(date -u +'%FT%T.%3NZ')" >> $GITHUB_ENV # 2025-02-25T12:50:11.569Z # # # Release › Gitea › Install Dependencies @@ -361,13 +362,14 @@ jobs: flavor: | latest=${{ !inputs.DEV_RELEASE }} labels: | - org.opencontainers.image.VERSION=${{ env.IMAGE_VERSION }} - org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} + org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} + org.opencontainers.image.version=${{ env.IMAGE_VERSION }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.vendor=${{ env.IMAGE_GITEA_AUTHOR }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Gitea › Meta › arm64 @@ -394,13 +396,14 @@ jobs: flavor: | latest=${{ !inputs.DEV_RELEASE }} labels: | - org.opencontainers.image.VERSION=${{ env.IMAGE_VERSION }} - org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} + org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} + org.opencontainers.image.version=${{ env.IMAGE_VERSION }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.vendor=${{ env.IMAGE_GITEA_AUTHOR }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Gitea › Meta › Release @@ -430,13 +433,14 @@ jobs: flavor: | latest=${{ !inputs.DEV_RELEASE }} labels: | - org.opencontainers.image.VERSION=${{ env.IMAGE_VERSION }} - org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} + org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} + org.opencontainers.image.version=${{ env.IMAGE_VERSION }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.vendor=${{ env.IMAGE_GITEA_AUTHOR }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Gitea › Build and Push › Amd64 @@ -536,6 +540,7 @@ jobs: echo "env.NOW_SHORT ............................ ${{ env.NOW_SHORT }}" echo "env.NOW_LONG ............................. ${{ env.NOW_LONG }}" echo "env.NOW_DOCKER_LABEL ..................... ${{ env.NOW_DOCKER_LABEL }}" + echo "env.NOW_DOCKER_TS ........................ ${{ env.NOW_DOCKER_TS }}" echo "env.DOCKER_IMAGE ......................... ${{ env.DOCKER_IMAGE }}" echo "env.DOCKER_SHA ........................... ${{ env.DOCKER_SHA }}" echo "" diff --git a/.github/workflows/deploy-docker-giteacom.yml b/.github/workflows/deploy-docker-giteacom.yml index 25d0e41a..082eada8 100644 --- a/.github/workflows/deploy-docker-giteacom.yml +++ b/.github/workflows/deploy-docker-giteacom.yml @@ -258,12 +258,13 @@ jobs: - name: '🕛 Get Timestamp' id: task_release_set_timestamp run: | - echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} - echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV - echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV - echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV - echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV - echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV + echo "DOCKER_IMAGE=`echo ${{ env.IMAGE_GITEA_AUTHOR }}/${{ env.IMAGE_NAME }} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} # binaryninja/tvapp2 + echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV # 71fad013cfce9116ec62779e4a7e627fe4c33627 + echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV # 02-25-2025 12:49:48 + echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV # 02-25-2025 + echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV # 02-25-2025 12:49 + echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV # 20250225 + echo "NOW_DOCKER_TS=$(date -u +'%FT%T.%3NZ')" >> $GITHUB_ENV # 2025-02-25T12:50:11.569Z # # # Release › Gitea › Install Dependencies @@ -363,13 +364,14 @@ jobs: flavor: | latest=false labels: | - org.opencontainers.image.VERSION=${{ env.IMAGE_VERSION }} - org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} + org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} + org.opencontainers.image.version=${{ env.IMAGE_VERSION }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.vendor=${{ env.IMAGE_GITEA_AUTHOR }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Gitea › Build and Push › Arm64 @@ -518,12 +520,13 @@ jobs: - name: '🕛 Get Timestamp' id: task_release_set_timestamp run: | - echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} - echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV - echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV - echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV - echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV - echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV + echo "DOCKER_IMAGE=`echo ${{ env.IMAGE_GITEA_AUTHOR }}/${{ env.IMAGE_NAME }} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} # binaryninja/tvapp2 + echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV # 71fad013cfce9116ec62779e4a7e627fe4c33627 + echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV # 02-25-2025 12:49:48 + echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV # 02-25-2025 + echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV # 02-25-2025 12:49 + echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV # 20250225 + echo "NOW_DOCKER_TS=$(date -u +'%FT%T.%3NZ')" >> $GITHUB_ENV # 2025-02-25T12:50:11.569Z # # # Release › Gitea › Install Dependencies @@ -624,13 +627,14 @@ jobs: flavor: | latest=${{ !inputs.DEV_RELEASE }} labels: | - org.opencontainers.image.VERSION=${{ env.IMAGE_VERSION }} - org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} + org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} + org.opencontainers.image.version=${{ env.IMAGE_VERSION }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.vendor=${{ env.IMAGE_GITEA_AUTHOR }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Gitea › Build and Push › Amd64 diff --git a/.github/workflows/deploy-docker-github.yml b/.github/workflows/deploy-docker-github.yml index e5b35579..035c09d8 100755 --- a/.github/workflows/deploy-docker-github.yml +++ b/.github/workflows/deploy-docker-github.yml @@ -243,12 +243,13 @@ jobs: - name: '🕛 Get Timestamp' id: task_release_set_timestamp run: | - echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} - echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV - echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV - echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV - echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV - echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV + echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV} # binaryninja/tvapp2 + echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV # 71fad013cfce9116ec62779e4a7e627fe4c33627 + echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV # 02-25-2025 12:49:48 + echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV # 02-25-2025 + echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV # 02-25-2025 12:49 + echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV # 20250225 + echo "NOW_DOCKER_TS=$(date -u +'%FT%T.%3NZ')" >> $GITHUB_ENV # 2025-02-25T12:50:11.569Z # # # Release › Github › Install Dependencies @@ -346,13 +347,14 @@ jobs: flavor: | latest=${{ !inputs.DEV_RELEASE }} labels: | - org.opencontainers.image.VERSION=${{ env.IMAGE_VERSION }} - org.opencontainers.image.BUILDDATE=${{ env.NOW_DOCKER_LABEL }} + org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }} + org.opencontainers.image.version=${{ env.IMAGE_VERSION }} org.opencontainers.image.licenses=MIT org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.vendor=${{ env.IMAGE_GHCR_AUTHOR }} org.opencontainers.image.ref.name=${{ github.ref_name }} org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }} + org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}" # # # Release › Github › Build and Push › Amd64 @@ -447,6 +449,7 @@ jobs: echo "env.NOW_SHORT ............................ ${{ env.NOW_SHORT }}" echo "env.NOW_LONG ............................. ${{ env.NOW_LONG }}" echo "env.NOW_DOCKER_LABEL ..................... ${{ env.NOW_DOCKER_LABEL }}" + echo "env.NOW_DOCKER_TS ........................ ${{ env.NOW_DOCKER_TS }}" echo "env.DOCKER_IMAGE ......................... ${{ env.DOCKER_IMAGE }}" echo "env.DOCKER_SHA ........................... ${{ env.DOCKER_SHA }}" echo "" diff --git a/Dockerfile b/Dockerfile index 91719518..89d642f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,32 +41,33 @@ ARG VERSION # Set Labels # # -LABEL maintainer="aetherinox, iFlip721" -LABEL org.opencontainers.image.authors="aetherinox, iFlip721" +LABEL org.opencontainers.image.authors="Aetherinox, iFlip721, Optx" LABEL org.opencontainers.image.vendor="BinaryNinja" LABEL org.opencontainers.image.title="TVApp2" LABEL org.opencontainers.image.description="Automatic m3u and xml guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client." -LABEL org.opencontainers.image.source="https://github.com/TheBinaryNinja/tvapp2" -LABEL org.opencontainers.image.repo.1="https://github.com/TheBinaryNinja/tvapp2" -LABEL org.opencontainers.image.repo.2="https://git.binaryninja.net/BinaryNinja/tvapp2" +LABEL org.opencontainers.image.source="https://github.com/thebinaryninja/tvapp2" +LABEL org.opencontainers.image.repo.1="https://github.com/thebinaryninja/tvapp2" +LABEL org.opencontainers.image.repo.2="https://git.binaryninja.net/binaryninja/tvapp2" LABEL org.opencontainers.image.repo.3="https://github.com/aetherinox/docker-base-alpine" LABEL org.opencontainers.image.documentation="https://thebinaryninja.github.io/tvapp2" -LABEL org.opencontainers.image.url="https://github.com/TheBinaryNinja/tvapp2/pkgs/container/tvapp2" +LABEL org.opencontainers.image.url="https://github.com/thebinaryninja/tvapp2/pkgs/container/tvapp2" LABEL org.opencontainers.image.licenses="MIT" -LABEL BUILDVERSION="Version:- ${VERSION} Date:- ${BUILDDATE}" +LABEL org.opencontainers.image.ref.name="main" +LABEL org.tvapp2.image.maintainers="Aetherinox, iFlip721, Optx" +LABEL org.tvapp2.image.build-version="Version:- ${VERSION} Date:- ${BUILDDATE}" # # # Set Env Var # # -ENV TZ="Etc/UTC" -ENV URL_REPO="https://git.binaryninja.net/BinaryNinja/" -ENV WEB_IP="0.0.0.0" -ENV WEB_PORT=4124 -ENV NODE_VERSION=18.20.5 -ENV YARN_VERSION=1.22.22 ENV DIR_BUILD=/usr/src/app ENV DIR_RUN=/usr/bin/app +ENV NODE_VERSION=18.20.5 +ENV YARN_VERSION=1.22.22 +ENV URL_REPO="https://git.binaryninja.net/binaryninja/" +ENV WEB_IP="0.0.0.0" +ENV WEB_PORT=4124 +ENV TZ="Etc/UTC" # # # Install