mirror of
https://github.com/TheBinaryNinja/tvapp2.git
synced 2026-06-09 18:15:41 -04:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
54255493cc |
8
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
8
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
@@ -14,9 +14,6 @@ body:
|
|||||||
4. Before creating this bug report, ensure you updated your applications to the latest versions.
|
4. Before creating this bug report, ensure you updated your applications to the latest versions.
|
||||||
Check your configurations to ensure there are no typos or errors.
|
Check your configurations to ensure there are no typos or errors.
|
||||||
Docker users should attempt to re-pull the TVApp2 image to ensure caching is not the cause of an issue.
|
Docker users should attempt to re-pull the TVApp2 image to ensure caching is not the cause of an issue.
|
||||||
5. To get detailed logs of the issue, set the environment variable:
|
|
||||||
`LOG_LEVEL=5`
|
|
||||||
Restart the docker container and you should get more detailed logs.
|
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
|
|
||||||
@@ -129,9 +126,9 @@ body:
|
|||||||
- type: textarea
|
- type: textarea
|
||||||
id: docker-compose
|
id: docker-compose
|
||||||
attributes:
|
attributes:
|
||||||
label: docker-compose.yml / Run command
|
label: docker-compose.yml
|
||||||
description: |
|
description: |
|
||||||
Copy / paste your `docker-compose.yml` file or run command here
|
Copy / paste your `docker-compose.yml` file here
|
||||||
|
|
||||||
- type: textarea
|
- type: textarea
|
||||||
id: logs
|
id: logs
|
||||||
@@ -140,7 +137,6 @@ body:
|
|||||||
description: |
|
description: |
|
||||||
Paste your docker logs here.
|
Paste your docker logs here.
|
||||||
You can get your docker logs by opening terminal and running `docker logs tvapp2`
|
You can get your docker logs by opening terminal and running `docker logs tvapp2`
|
||||||
To get detailed logs, set the environment variable `LOG_LEVEL=5` and restart the container.
|
|
||||||
|
|
||||||
- type: textarea
|
- type: textarea
|
||||||
id: screenshots
|
id: screenshots
|
||||||
|
|||||||
119
.github/workflows/deploy-docker-dockerhub.yml
vendored
119
.github/workflows/deploy-docker-dockerhub.yml
vendored
@@ -280,7 +280,6 @@ jobs:
|
|||||||
echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV # 02-25-2025 12:49
|
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_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
|
echo "NOW_DOCKER_TS=$(date -u +'%FT%T.%3NZ')" >> $GITHUB_ENV # 2025-02-25T12:50:11.569Z
|
||||||
echo "GITHUB_SHA1=`git rev-parse HEAD`" >> ${GITHUB_ENV}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Dockerhub › Install Dependencies
|
# Release › Dockerhub › Install Dependencies
|
||||||
@@ -422,8 +421,6 @@ jobs:
|
|||||||
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
||||||
org.opencontainers.image.registry=dockerhub
|
org.opencontainers.image.registry=dockerhub
|
||||||
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
||||||
org.tvapp2.image.build-release="${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}"
|
|
||||||
org.tvapp2.image.build-sha1=${GITHUB_SHA1}
|
|
||||||
annotations: |
|
annotations: |
|
||||||
org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }}
|
org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }}
|
||||||
org.opencontainers.image.version=${{ env.IMAGE_VERSION }}
|
org.opencontainers.image.version=${{ env.IMAGE_VERSION }}
|
||||||
@@ -434,8 +431,6 @@ jobs:
|
|||||||
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
||||||
org.opencontainers.image.registry=dockerhub
|
org.opencontainers.image.registry=dockerhub
|
||||||
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
||||||
org.tvapp2.image.build-release="${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}"
|
|
||||||
org.tvapp2.image.build-sha1=${GITHUB_SHA1}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Dockerhub › Build and Push › Amd64
|
# Release › Dockerhub › Build and Push › Amd64
|
||||||
@@ -460,7 +455,6 @@ jobs:
|
|||||||
RELEASE=${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}
|
RELEASE=${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}
|
||||||
VERSION=${{ env.IMAGE_VERSION }}
|
VERSION=${{ env.IMAGE_VERSION }}
|
||||||
BUILDDATE=${{ env.NOW_DOCKER_LABEL }}
|
BUILDDATE=${{ env.NOW_DOCKER_LABEL }}
|
||||||
GIT_SHA1=${{ env.GITHUB_SHA1 }}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Dockerhub › Export Digest › Amd64
|
# Release › Dockerhub › Export Digest › Amd64
|
||||||
@@ -513,7 +507,6 @@ jobs:
|
|||||||
RELEASE=${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}
|
RELEASE=${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}
|
||||||
VERSION=${{ env.IMAGE_VERSION }}
|
VERSION=${{ env.IMAGE_VERSION }}
|
||||||
BUILDDATE=${{ env.NOW_DOCKER_LABEL }}
|
BUILDDATE=${{ env.NOW_DOCKER_LABEL }}
|
||||||
GIT_SHA1=${{ env.GITHUB_SHA1 }}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Dockerhub › Export Digest › Arm64
|
# Release › Dockerhub › Export Digest › Arm64
|
||||||
@@ -543,63 +536,6 @@ jobs:
|
|||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
retention-days: 10
|
retention-days: 10
|
||||||
|
|
||||||
# #
|
|
||||||
# Release › Dockerhub › Checkpoint › Amd64
|
|
||||||
# #
|
|
||||||
|
|
||||||
- name: '⚠️ Checkpoint'
|
|
||||||
id: task_release_dh_checkpoint
|
|
||||||
run: |
|
|
||||||
echo ""
|
|
||||||
echo "---- [ GITHUB ] ----------------------------------------------------------------------------------------"
|
|
||||||
echo "github.actor.............................. ${{ github.actor }}"
|
|
||||||
echo "github.ref ............................... ${{ github.ref }}"
|
|
||||||
echo "github.ref_name .......................... ${{ github.ref_name }}"
|
|
||||||
echo "github.event_name ........................ ${{ github.event_name }}"
|
|
||||||
echo "github.repository_owner .................. ${{ github.repository_owner }}"
|
|
||||||
echo "github.repository ........................ ${{ github.repository }}"
|
|
||||||
echo "github.sha ............................... ${{ github.sha }}"
|
|
||||||
echo -e ""
|
|
||||||
echo "---- [ INPUTS ] ----------------------------------------------------------------------------------------"
|
|
||||||
echo "inputs.IMAGE_NAME ........................ ${{ inputs.IMAGE_NAME }}"
|
|
||||||
echo "inputs.IMAGE_VERSION ..................... ${{ inputs.IMAGE_VERSION }}"
|
|
||||||
echo "inputs.IMAGE_DOCKERHUB_AUTHOR ............ ${{ inputs.IMAGE_DOCKERHUB_AUTHOR }}"
|
|
||||||
echo "inputs.IMAGE_DOCKERHUB_USERNAME .......... ${{ inputs.IMAGE_DOCKERHUB_USERNAME }}"
|
|
||||||
echo "inputs.DEV_RELEASE ....................... ${{ inputs.DEV_RELEASE }}"
|
|
||||||
echo "inputs.DRY_RUN ........................... ${{ inputs.DRY_RUN }}"
|
|
||||||
echo -e ""
|
|
||||||
echo "---- [ ENV ] -------------------------------------------------------------------------------------------"
|
|
||||||
echo "env.IMAGE_NAME ........................... ${{ env.IMAGE_NAME }}"
|
|
||||||
echo "env.IMAGE_VERSION ........................ ${{ env.IMAGE_VERSION }}"
|
|
||||||
echo "env.IMAGE_VERSION_1DIGIT ................. ${{ env.IMAGE_VERSION_1DIGIT }}"
|
|
||||||
echo "env.IMAGE_VERSION_2DIGIT ................. ${{ env.IMAGE_VERSION_2DIGIT }}"
|
|
||||||
echo "env.IMAGE_DOCKERHUB_AUTHOR ............... ${{ env.IMAGE_DOCKERHUB_AUTHOR }}"
|
|
||||||
echo "env.IMAGE_DOCKERHUB_USERNAME ............. ${{ env.IMAGE_DOCKERHUB_USERNAME }}"
|
|
||||||
echo "env.NOW .................................. ${{ env.NOW }}"
|
|
||||||
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.REGISTRY_REPO_ORG_AUTHOR_LC .......... ${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}"
|
|
||||||
echo "env.REGISTRY_REPO_AUTHOR_LC .............. ${{ env.REGISTRY_REPO_AUTHOR_LC }}"
|
|
||||||
echo "env.DOCKER_SHA ........................... ${{ env.DOCKER_SHA }}"
|
|
||||||
echo "env.GITHUB_SHA1 .......................... ${{ env.GITHUB_SHA1 }}"
|
|
||||||
echo -e ""
|
|
||||||
echo "---- [ DOCKER IMAGES ] ---------------------------------------------------------------------------------"
|
|
||||||
echo "registry ................................. Dockerhub"
|
|
||||||
echo "tags ..................................... ${{ steps.task_release_dh_meta.outputs.tags }}"
|
|
||||||
echo "labels ................................... ${{ steps.task_release_dh_meta.outputs.labels }}"
|
|
||||||
echo "digest ................................... ${{ steps.task_release_dh_push_amd64.outputs.digest }}"
|
|
||||||
echo -e ""
|
|
||||||
echo "(release) tags ........................... ${{ steps.task_release_dh_meta.outputs.tags }}"
|
|
||||||
echo "(release) labels ......................... ${{ steps.task_release_dh_meta.outputs.labels }}"
|
|
||||||
echo -e ""
|
|
||||||
echo "---- [ DOCKER DIGESTS ] --------------------------------------------------------------------------------"
|
|
||||||
echo "docker image id (amd64) .................. ${{ steps.task_release_dh_push_amd64.outputs.imageid }}"
|
|
||||||
echo "docker digest (amd64) .................... ${{ steps.task_release_dh_push_amd64.outputs.digest }}"
|
|
||||||
echo "docker image id (arm64) .................. ${{ steps.task_release_dh_push_arm64.outputs.imageid }}"
|
|
||||||
echo "docker digest (arm64) .................... ${{ steps.task_release_dh_push_arm64.outputs.digest }}"
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Dockerhub › Push Manifest
|
# Release › Dockerhub › Push Manifest
|
||||||
# #
|
# #
|
||||||
@@ -616,6 +552,61 @@ jobs:
|
|||||||
index-annotations: |
|
index-annotations: |
|
||||||
${{ steps.task_release_dh_meta.outputs.labels }}
|
${{ steps.task_release_dh_meta.outputs.labels }}
|
||||||
|
|
||||||
|
# #
|
||||||
|
# Release › Dockerhub › Checkpoint › Amd64
|
||||||
|
# #
|
||||||
|
|
||||||
|
- name: '⚠️ Checkpoint'
|
||||||
|
id: task_release_dh_checkpoint
|
||||||
|
run: |
|
||||||
|
echo ""
|
||||||
|
echo "[ GITHUB ] ---------------------------------------------------------------------------------------------"
|
||||||
|
echo "github.actor.............................. ${{ github.actor }}"
|
||||||
|
echo "github.ref ............................... ${{ github.ref }}"
|
||||||
|
echo "github.ref_name .......................... ${{ github.ref_name }}"
|
||||||
|
echo "github.event_name ........................ ${{ github.event_name }}"
|
||||||
|
echo "github.repository_owner .................. ${{ github.repository_owner }}"
|
||||||
|
echo "github.repository ........................ ${{ github.repository }}"
|
||||||
|
echo ""
|
||||||
|
echo "[ INPUTS ] ---------------------------------------------------------------------------------------------"
|
||||||
|
echo "inputs.IMAGE_NAME ........................ ${{ inputs.IMAGE_NAME }}"
|
||||||
|
echo "inputs.IMAGE_VERSION ..................... ${{ inputs.IMAGE_VERSION }}"
|
||||||
|
echo "inputs.IMAGE_DOCKERHUB_AUTHOR ............ ${{ inputs.IMAGE_DOCKERHUB_AUTHOR }}"
|
||||||
|
echo "inputs.IMAGE_DOCKERHUB_USERNAME .......... ${{ inputs.IMAGE_DOCKERHUB_USERNAME }}"
|
||||||
|
echo "inputs.DEV_RELEASE ....................... ${{ inputs.DEV_RELEASE }}"
|
||||||
|
echo "inputs.DRY_RUN ........................... ${{ inputs.DRY_RUN }}"
|
||||||
|
echo ""
|
||||||
|
echo "[ ENV ] ------------------------------------------------------------------------------------------------"
|
||||||
|
echo "env.IMAGE_NAME ........................... ${{ env.IMAGE_NAME }}"
|
||||||
|
echo "env.IMAGE_VERSION ........................ ${{ env.IMAGE_VERSION }}"
|
||||||
|
echo "env.IMAGE_VERSION_1DIGIT ................. ${{ env.IMAGE_VERSION_1DIGIT }}"
|
||||||
|
echo "env.IMAGE_VERSION_2DIGIT ................. ${{ env.IMAGE_VERSION_2DIGIT }}"
|
||||||
|
echo "env.IMAGE_DOCKERHUB_AUTHOR ............... ${{ env.IMAGE_DOCKERHUB_AUTHOR }}"
|
||||||
|
echo "env.IMAGE_DOCKERHUB_USERNAME ............. ${{ env.IMAGE_DOCKERHUB_USERNAME }}"
|
||||||
|
echo "env.NOW .................................. ${{ env.NOW }}"
|
||||||
|
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.REGISTRY_REPO_ORG_AUTHOR_LC .......... ${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}"
|
||||||
|
echo "env.REGISTRY_REPO_AUTHOR_LC .............. ${{ env.REGISTRY_REPO_AUTHOR_LC }}"
|
||||||
|
echo "env.DOCKER_SHA ........................... ${{ env.DOCKER_SHA }}"
|
||||||
|
echo ""
|
||||||
|
echo "[ DOCKER IMAGES ] --------------------------------------------------------------------------------------"
|
||||||
|
echo "registry ................................. Dockerhub"
|
||||||
|
echo "tags ..................................... ${{ steps.task_release_dh_meta.outputs.tags }}"
|
||||||
|
echo "labels ................................... ${{ steps.task_release_dh_meta.outputs.labels }}"
|
||||||
|
echo "digest ................................... ${{ steps.task_release_dh_push_amd64.outputs.digest }}"
|
||||||
|
echo ""
|
||||||
|
echo "(release) tags ........................... ${{ steps.task_release_dh_meta.outputs.tags }}"
|
||||||
|
echo "(release) labels ......................... ${{ steps.task_release_dh_meta.outputs.labels }}"
|
||||||
|
echo ""
|
||||||
|
echo "[ DOCKER DIGESTS ] -------------------------------------------------------------------------------------"
|
||||||
|
echo "docker image id (amd64) .................. ${{ steps.task_release_dh_push_amd64.outputs.imageid }}"
|
||||||
|
echo "docker digest (amd64) .................... ${{ steps.task_release_dh_push_amd64.outputs.digest }}"
|
||||||
|
echo "docker image id (arm64) .................. ${{ steps.task_release_dh_push_arm64.outputs.imageid }}"
|
||||||
|
echo "docker digest (arm64) .................... ${{ steps.task_release_dh_push_arm64.outputs.digest }}"
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Dockerhub › Get Weekly Commits
|
# Release › Dockerhub › Get Weekly Commits
|
||||||
# #
|
# #
|
||||||
|
|||||||
63
.github/workflows/deploy-docker-gitea.yml
vendored
63
.github/workflows/deploy-docker-gitea.yml
vendored
@@ -292,7 +292,6 @@ jobs:
|
|||||||
echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV # 02-25-2025 12:49
|
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_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
|
echo "NOW_DOCKER_TS=$(date -u +'%FT%T.%3NZ')" >> $GITHUB_ENV # 2025-02-25T12:50:11.569Z
|
||||||
echo "GITHUB_SHA1=`git rev-parse HEAD`" >> ${GITHUB_ENV}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Gitea › Install Dependencies
|
# Release › Gitea › Install Dependencies
|
||||||
@@ -438,8 +437,6 @@ jobs:
|
|||||||
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
||||||
org.opencontainers.image.registry=gitea
|
org.opencontainers.image.registry=gitea
|
||||||
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
||||||
org.tvapp2.image.build-release="${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}"
|
|
||||||
org.tvapp2.image.build-sha1=${GITHUB_SHA1}
|
|
||||||
annotations: |
|
annotations: |
|
||||||
org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }}
|
org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }}
|
||||||
org.opencontainers.image.version=${{ env.IMAGE_VERSION }}
|
org.opencontainers.image.version=${{ env.IMAGE_VERSION }}
|
||||||
@@ -450,8 +447,6 @@ jobs:
|
|||||||
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
||||||
org.opencontainers.image.registry=gitea
|
org.opencontainers.image.registry=gitea
|
||||||
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
||||||
org.tvapp2.image.build-release="${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}"
|
|
||||||
org.tvapp2.image.build-sha1=${GITHUB_SHA1}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Gitea › Meta › arm64
|
# Release › Gitea › Meta › arm64
|
||||||
@@ -490,8 +485,6 @@ jobs:
|
|||||||
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
||||||
org.opencontainers.image.registry=gitea
|
org.opencontainers.image.registry=gitea
|
||||||
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
||||||
org.tvapp2.image.build-release="${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}"
|
|
||||||
org.tvapp2.image.build-sha1=${GITHUB_SHA1}
|
|
||||||
annotations: |
|
annotations: |
|
||||||
org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }}
|
org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }}
|
||||||
org.opencontainers.image.version=${{ env.IMAGE_VERSION }}
|
org.opencontainers.image.version=${{ env.IMAGE_VERSION }}
|
||||||
@@ -502,8 +495,6 @@ jobs:
|
|||||||
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
||||||
org.opencontainers.image.registry=gitea
|
org.opencontainers.image.registry=gitea
|
||||||
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
||||||
org.tvapp2.image.build-release="${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}"
|
|
||||||
org.tvapp2.image.build-sha1=${GITHUB_SHA1}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Gitea › Meta › Release
|
# Release › Gitea › Meta › Release
|
||||||
@@ -588,7 +579,6 @@ jobs:
|
|||||||
RELEASE=${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}
|
RELEASE=${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}
|
||||||
VERSION=${{ env.IMAGE_VERSION }}
|
VERSION=${{ env.IMAGE_VERSION }}
|
||||||
BUILDDATE=${{ env.NOW_DOCKER_LABEL }}
|
BUILDDATE=${{ env.NOW_DOCKER_LABEL }}
|
||||||
GIT_SHA1=${{ env.GITHUB_SHA1 }}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Gitea › Export Digest › Amd64
|
# Release › Gitea › Export Digest › Amd64
|
||||||
@@ -641,7 +631,6 @@ jobs:
|
|||||||
RELEASE=${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}
|
RELEASE=${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}
|
||||||
VERSION=${{ env.IMAGE_VERSION }}
|
VERSION=${{ env.IMAGE_VERSION }}
|
||||||
BUILDDATE=${{ env.NOW_DOCKER_LABEL }}
|
BUILDDATE=${{ env.NOW_DOCKER_LABEL }}
|
||||||
GIT_SHA1=${{ env.GITHUB_SHA1 }}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Gitea › Export Digest › Arm64
|
# Release › Gitea › Export Digest › Arm64
|
||||||
@@ -671,6 +660,22 @@ jobs:
|
|||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
retention-days: 10
|
retention-days: 10
|
||||||
|
|
||||||
|
# #
|
||||||
|
# Release › Gitea › Push Manifest
|
||||||
|
# #
|
||||||
|
|
||||||
|
- name: '📦 Push Manifest'
|
||||||
|
id: task_release_gi_manifest
|
||||||
|
uses: int128/docker-manifest-create-action@v2
|
||||||
|
with:
|
||||||
|
tags: |
|
||||||
|
${{ steps.task_release_gi_meta_release.outputs.tags }}
|
||||||
|
sources: |
|
||||||
|
${{ env.IMAGE_GITEA_WEBSITE }}/${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}@${{ steps.task_release_gi_push_amd64.outputs.digest }}
|
||||||
|
${{ env.IMAGE_GITEA_WEBSITE }}/${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}@${{ steps.task_release_gi_push_arm64.outputs.digest }}
|
||||||
|
index-annotations: |
|
||||||
|
${{ steps.task_release_gi_meta_release.outputs.labels }}
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Gitea › Checkpoint
|
# Release › Gitea › Checkpoint
|
||||||
# #
|
# #
|
||||||
@@ -679,16 +684,15 @@ jobs:
|
|||||||
id: task_release_gi_checkpoint
|
id: task_release_gi_checkpoint
|
||||||
run: |
|
run: |
|
||||||
echo ""
|
echo ""
|
||||||
echo "---- [ GITHUB ] ----------------------------------------------------------------------------------------"
|
echo "[ GITHUB ] ---------------------------------------------------------------------------------------------"
|
||||||
echo "github.actor.............................. ${{ github.actor }}"
|
echo "github.actor.............................. ${{ github.actor }}"
|
||||||
echo "github.ref ............................... ${{ github.ref }}"
|
echo "github.ref ............................... ${{ github.ref }}"
|
||||||
echo "github.ref_name .......................... ${{ github.ref_name }}"
|
echo "github.ref_name .......................... ${{ github.ref_name }}"
|
||||||
echo "github.event_name ........................ ${{ github.event_name }}"
|
echo "github.event_name ........................ ${{ github.event_name }}"
|
||||||
echo "github.repository_owner .................. ${{ github.repository_owner }}"
|
echo "github.repository_owner .................. ${{ github.repository_owner }}"
|
||||||
echo "github.repository ........................ ${{ github.repository }}"
|
echo "github.repository ........................ ${{ github.repository }}"
|
||||||
echo "github.sha ............................... ${{ github.sha }}"
|
echo ""
|
||||||
echo -e ""
|
echo "[ INPUTS ] ---------------------------------------------------------------------------------------------"
|
||||||
echo "---- [ INPUTS ] ----------------------------------------------------------------------------------------"
|
|
||||||
echo "inputs.IMAGE_NAME ........................ ${{ inputs.IMAGE_NAME }}"
|
echo "inputs.IMAGE_NAME ........................ ${{ inputs.IMAGE_NAME }}"
|
||||||
echo "inputs.IMAGE_VERSION ..................... ${{ inputs.IMAGE_VERSION }}"
|
echo "inputs.IMAGE_VERSION ..................... ${{ inputs.IMAGE_VERSION }}"
|
||||||
echo "inputs.IMAGE_GITEA_USERNAME .............. ${{ inputs.IMAGE_GITEA_AUTHOR }}"
|
echo "inputs.IMAGE_GITEA_USERNAME .............. ${{ inputs.IMAGE_GITEA_AUTHOR }}"
|
||||||
@@ -696,8 +700,8 @@ jobs:
|
|||||||
echo "inputs.IMAGE_GITEA_WEBSITE ............... ${{ inputs.IMAGE_GITEA_WEBSITE }}"
|
echo "inputs.IMAGE_GITEA_WEBSITE ............... ${{ inputs.IMAGE_GITEA_WEBSITE }}"
|
||||||
echo "inputs.DEV_RELEASE ....................... ${{ inputs.DEV_RELEASE }}"
|
echo "inputs.DEV_RELEASE ....................... ${{ inputs.DEV_RELEASE }}"
|
||||||
echo "inputs.DRY_RUN ........................... ${{ inputs.DRY_RUN }}"
|
echo "inputs.DRY_RUN ........................... ${{ inputs.DRY_RUN }}"
|
||||||
echo -e ""
|
echo ""
|
||||||
echo "---- [ ENV ] -------------------------------------------------------------------------------------------"
|
echo "[ ENV ] ------------------------------------------------------------------------------------------------"
|
||||||
echo "env.IMAGE_NAME ........................... ${{ env.IMAGE_NAME }}"
|
echo "env.IMAGE_NAME ........................... ${{ env.IMAGE_NAME }}"
|
||||||
echo "env.IMAGE_VERSION ........................ ${{ env.IMAGE_VERSION }}"
|
echo "env.IMAGE_VERSION ........................ ${{ env.IMAGE_VERSION }}"
|
||||||
echo "env.IMAGE_VERSION_1DIGIT ................. ${{ env.IMAGE_VERSION_1DIGIT }}"
|
echo "env.IMAGE_VERSION_1DIGIT ................. ${{ env.IMAGE_VERSION_1DIGIT }}"
|
||||||
@@ -713,9 +717,8 @@ jobs:
|
|||||||
echo "env.REGISTRY_REPO_ORG_AUTHOR_LC .......... ${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}"
|
echo "env.REGISTRY_REPO_ORG_AUTHOR_LC .......... ${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}"
|
||||||
echo "env.REGISTRY_REPO_AUTHOR_LC .............. ${{ env.REGISTRY_REPO_AUTHOR_LC }}"
|
echo "env.REGISTRY_REPO_AUTHOR_LC .............. ${{ env.REGISTRY_REPO_AUTHOR_LC }}"
|
||||||
echo "env.DOCKER_SHA ........................... ${{ env.DOCKER_SHA }}"
|
echo "env.DOCKER_SHA ........................... ${{ env.DOCKER_SHA }}"
|
||||||
echo "env.GITHUB_SHA1 .......................... ${{ env.GITHUB_SHA1 }}"
|
echo ""
|
||||||
echo -e ""
|
echo "[ DOCKER IMAGES ] --------------------------------------------------------------------------------------"
|
||||||
echo "---- [ DOCKER IMAGES ] ---------------------------------------------------------------------------------"
|
|
||||||
echo "registry ................................. Gitea"
|
echo "registry ................................. Gitea"
|
||||||
echo "(amd64) tags ............................. ${{ steps.task_release_gi_meta_amd64.outputs.tags }}"
|
echo "(amd64) tags ............................. ${{ steps.task_release_gi_meta_amd64.outputs.tags }}"
|
||||||
echo "(amd64) labels ........................... ${{ steps.task_release_gi_meta_amd64.outputs.labels }}"
|
echo "(amd64) labels ........................... ${{ steps.task_release_gi_meta_amd64.outputs.labels }}"
|
||||||
@@ -727,29 +730,13 @@ jobs:
|
|||||||
echo ""
|
echo ""
|
||||||
echo "(release) tags ........................... ${{ steps.task_release_gi_meta_release.outputs.tags }}"
|
echo "(release) tags ........................... ${{ steps.task_release_gi_meta_release.outputs.tags }}"
|
||||||
echo "(release) labels ......................... ${{ steps.task_release_gi_meta_release.outputs.labels }}"
|
echo "(release) labels ......................... ${{ steps.task_release_gi_meta_release.outputs.labels }}"
|
||||||
echo -e ""
|
echo ""
|
||||||
echo "---- [ DOCKER DIGESTS ] --------------------------------------------------------------------------------"
|
echo "[ DOCKER DIGESTS ] -------------------------------------------------------------------------------------"
|
||||||
echo "docker image id (amd64) .................. ${{ steps.task_release_gi_push_amd64.outputs.imageid }}"
|
echo "docker image id (amd64) .................. ${{ steps.task_release_gi_push_amd64.outputs.imageid }}"
|
||||||
echo "docker digest (amd64) .................... ${{ steps.task_release_gi_push_amd64.outputs.digest }}"
|
echo "docker digest (amd64) .................... ${{ steps.task_release_gi_push_amd64.outputs.digest }}"
|
||||||
echo "docker image id (arm64) .................. ${{ steps.task_release_gi_push_arm64.outputs.imageid }}"
|
echo "docker image id (arm64) .................. ${{ steps.task_release_gi_push_arm64.outputs.imageid }}"
|
||||||
echo "docker digest (arm64) .................... ${{ steps.task_release_gi_push_arm64.outputs.digest }}"
|
echo "docker digest (arm64) .................... ${{ steps.task_release_gi_push_arm64.outputs.digest }}"
|
||||||
|
|
||||||
# #
|
|
||||||
# Release › Gitea › Push Manifest
|
|
||||||
# #
|
|
||||||
|
|
||||||
- name: '📦 Push Manifest'
|
|
||||||
id: task_release_gi_manifest
|
|
||||||
uses: int128/docker-manifest-create-action@v2
|
|
||||||
with:
|
|
||||||
tags: |
|
|
||||||
${{ steps.task_release_gi_meta_release.outputs.tags }}
|
|
||||||
sources: |
|
|
||||||
${{ env.IMAGE_GITEA_WEBSITE }}/${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}@${{ steps.task_release_gi_push_amd64.outputs.digest }}
|
|
||||||
${{ env.IMAGE_GITEA_WEBSITE }}/${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}@${{ steps.task_release_gi_push_arm64.outputs.digest }}
|
|
||||||
index-annotations: |
|
|
||||||
${{ steps.task_release_gi_meta_release.outputs.labels }}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Gitea › Get Weekly Commits
|
# Release › Gitea › Get Weekly Commits
|
||||||
# #
|
# #
|
||||||
|
|||||||
120
.github/workflows/deploy-docker-github.yml
vendored
120
.github/workflows/deploy-docker-github.yml
vendored
@@ -277,7 +277,6 @@ jobs:
|
|||||||
echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV # 02-25-2025 12:49
|
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_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
|
echo "NOW_DOCKER_TS=$(date -u +'%FT%T.%3NZ')" >> $GITHUB_ENV # 2025-02-25T12:50:11.569Z
|
||||||
echo "GITHUB_SHA1=`git rev-parse HEAD`" >> ${GITHUB_ENV}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Github › Install Dependencies
|
# Release › Github › Install Dependencies
|
||||||
@@ -420,8 +419,6 @@ jobs:
|
|||||||
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
||||||
org.opencontainers.image.registry=github
|
org.opencontainers.image.registry=github
|
||||||
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
||||||
org.tvapp2.image.build-release="${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}"
|
|
||||||
org.tvapp2.image.build-sha1=${GITHUB_SHA1}
|
|
||||||
annotations: |
|
annotations: |
|
||||||
org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }}
|
org.opencontainers.image.created=${{ env.NOW_DOCKER_TS }}
|
||||||
org.opencontainers.image.version=${{ env.IMAGE_VERSION }}
|
org.opencontainers.image.version=${{ env.IMAGE_VERSION }}
|
||||||
@@ -432,8 +429,6 @@ jobs:
|
|||||||
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
org.opencontainers.image.development=${{ inputs.DEV_RELEASE == true && 'true' || 'false' }}
|
||||||
org.opencontainers.image.registry=github
|
org.opencontainers.image.registry=github
|
||||||
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
org.tvapp2.image.build-version="Version:- ${{ env.IMAGE_VERSION }} Date:- ${{ env.NOW_DOCKER_LABEL }}"
|
||||||
org.tvapp2.image.build-release="${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}"
|
|
||||||
org.tvapp2.image.build-sha1=${GITHUB_SHA1}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Github › Build and Push › Amd64
|
# Release › Github › Build and Push › Amd64
|
||||||
@@ -463,7 +458,6 @@ jobs:
|
|||||||
RELEASE=${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}
|
RELEASE=${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}
|
||||||
VERSION=${{ env.IMAGE_VERSION }}
|
VERSION=${{ env.IMAGE_VERSION }}
|
||||||
BUILDDATE=${{ env.NOW_DOCKER_LABEL }}
|
BUILDDATE=${{ env.NOW_DOCKER_LABEL }}
|
||||||
GIT_SHA1=${{ env.GITHUB_SHA1 }}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Github › Export Digest › Amd64
|
# Release › Github › Export Digest › Amd64
|
||||||
@@ -521,7 +515,6 @@ jobs:
|
|||||||
RELEASE=${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}
|
RELEASE=${{ inputs.DEV_RELEASE == true && 'development' || 'stable' }}
|
||||||
VERSION=${{ env.IMAGE_VERSION }}
|
VERSION=${{ env.IMAGE_VERSION }}
|
||||||
BUILDDATE=${{ env.NOW_DOCKER_LABEL }}
|
BUILDDATE=${{ env.NOW_DOCKER_LABEL }}
|
||||||
GIT_SHA1=${{ env.GITHUB_SHA1 }}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Github › Export Digest › Arm64
|
# Release › Github › Export Digest › Arm64
|
||||||
@@ -551,63 +544,6 @@ jobs:
|
|||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
retention-days: 10
|
retention-days: 10
|
||||||
|
|
||||||
# #
|
|
||||||
# Release › Github › Checkpoint
|
|
||||||
# #
|
|
||||||
|
|
||||||
- name: '⚠️ Checkpoint'
|
|
||||||
id: task_release_gh_checkpoint
|
|
||||||
run: |
|
|
||||||
echo ""
|
|
||||||
echo "---- [ GITHUB ] ----------------------------------------------------------------------------------------"
|
|
||||||
echo "github.actor.............................. ${{ github.actor }}"
|
|
||||||
echo "github.ref ............................... ${{ github.ref }}"
|
|
||||||
echo "github.ref_name .......................... ${{ github.ref_name }}"
|
|
||||||
echo "github.event_name ........................ ${{ github.event_name }}"
|
|
||||||
echo "github.repository_owner .................. ${{ github.repository_owner }}"
|
|
||||||
echo "github.repository ........................ ${{ github.repository }}"
|
|
||||||
echo "github.sha ............................... ${{ github.sha }}"
|
|
||||||
echo -e ""
|
|
||||||
echo "---- [ INPUTS ] ----------------------------------------------------------------------------------------"
|
|
||||||
echo "inputs.IMAGE_NAME ........................ ${{ inputs.IMAGE_NAME }}"
|
|
||||||
echo "inputs.IMAGE_VERSION ..................... ${{ inputs.IMAGE_VERSION }}"
|
|
||||||
echo "inputs.IMAGE_GHCR_AUTHOR ................. ${{ inputs.IMAGE_GHCR_AUTHOR }}"
|
|
||||||
echo "inputs.IMAGE_GHCR_USERNAME ............... ${{ inputs.IMAGE_GHCR_USERNAME }}"
|
|
||||||
echo "inputs.DEV_RELEASE ....................... ${{ inputs.DEV_RELEASE }}"
|
|
||||||
echo "inputs.DRY_RUN ........................... ${{ inputs.DRY_RUN }}"
|
|
||||||
echo -e ""
|
|
||||||
echo "---- [ ENV ] -------------------------------------------------------------------------------------------"
|
|
||||||
echo "env.IMAGE_NAME ........................... ${{ env.IMAGE_NAME }}"
|
|
||||||
echo "env.IMAGE_VERSION ........................ ${{ env.IMAGE_VERSION }}"
|
|
||||||
echo "env.IMAGE_VERSION_1DIGIT ................. ${{ env.IMAGE_VERSION_1DIGIT }}"
|
|
||||||
echo "env.IMAGE_VERSION_2DIGIT ................. ${{ env.IMAGE_VERSION_2DIGIT }}"
|
|
||||||
echo "env.IMAGE_GHCR_AUTHOR .................... ${{ env.IMAGE_GHCR_AUTHOR }}"
|
|
||||||
echo "env.IMAGE_GHCR_USERNAME .................. ${{ env.IMAGE_GHCR_USERNAME }}"
|
|
||||||
echo "env.NOW .................................. ${{ env.NOW }}"
|
|
||||||
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.REGISTRY_REPO_ORG_AUTHOR_LC .......... ${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}"
|
|
||||||
echo "env.REGISTRY_REPO_AUTHOR_LC .............. ${{ env.REGISTRY_REPO_AUTHOR_LC }}"
|
|
||||||
echo "env.DOCKER_SHA ........................... ${{ env.DOCKER_SHA }}"
|
|
||||||
echo "env.GITHUB_SHA1 .......................... ${{ env.GITHUB_SHA1 }}"
|
|
||||||
echo -e ""
|
|
||||||
echo "---- [ DOCKER IMAGES ] ---------------------------------------------------------------------------------"
|
|
||||||
echo "registry ................................. Github GHCR"
|
|
||||||
echo "tags ..................................... ${{ steps.task_release_gh_meta.outputs.tags }}"
|
|
||||||
echo "labels ................................... ${{ steps.task_release_gh_meta.outputs.labels }}"
|
|
||||||
echo "digest ................................... ${{ steps.task_release_gh_push_amd64.outputs.digest }}"
|
|
||||||
echo -e ""
|
|
||||||
echo "(release) tags ........................... ${{ steps.task_release_gh_meta.outputs.tags }}"
|
|
||||||
echo "(release) labels ......................... ${{ steps.task_release_gh_meta.outputs.labels }}"
|
|
||||||
echo -e ""
|
|
||||||
echo "---- [ DOCKER DIGESTS ] --------------------------------------------------------------------------------"
|
|
||||||
echo "docker image id (amd64) .................. ${{ steps.task_release_gh_push_amd64.outputs.imageid }}"
|
|
||||||
echo "docker digest (amd64) .................... ${{ steps.task_release_gh_push_amd64.outputs.digest }}"
|
|
||||||
echo "docker image id (arm64) .................. ${{ steps.task_release_gh_push_arm64.outputs.imageid }}"
|
|
||||||
echo "docker digest (arm64) .................... ${{ steps.task_release_gh_push_arm64.outputs.digest }}"
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Github › Push Manifest
|
# Release › Github › Push Manifest
|
||||||
# #
|
# #
|
||||||
@@ -625,6 +561,62 @@ jobs:
|
|||||||
index-annotations: |
|
index-annotations: |
|
||||||
${{ steps.task_release_gh_meta.outputs.labels }}
|
${{ steps.task_release_gh_meta.outputs.labels }}
|
||||||
|
|
||||||
|
# #
|
||||||
|
# Release › Github › Checkpoint
|
||||||
|
# #
|
||||||
|
|
||||||
|
- name: '⚠️ Checkpoint'
|
||||||
|
id: task_release_gh_checkpoint
|
||||||
|
run: |
|
||||||
|
echo ""
|
||||||
|
echo "[ GITHUB ] ---------------------------------------------------------------------------------------------"
|
||||||
|
echo "github.actor.............................. ${{ github.actor }}"
|
||||||
|
echo "github.ref ............................... ${{ github.ref }}"
|
||||||
|
echo "github.ref_name .......................... ${{ github.ref_name }}"
|
||||||
|
echo "github.event_name ........................ ${{ github.event_name }}"
|
||||||
|
echo "github.repository_owner .................. ${{ github.repository_owner }}"
|
||||||
|
echo "github.repository ........................ ${{ github.repository }}"
|
||||||
|
echo ""
|
||||||
|
echo "[ INPUTS ] ---------------------------------------------------------------------------------------------"
|
||||||
|
echo "inputs.IMAGE_NAME ........................ ${{ inputs.IMAGE_NAME }}"
|
||||||
|
echo "inputs.IMAGE_VERSION ..................... ${{ inputs.IMAGE_VERSION }}"
|
||||||
|
echo "inputs.IMAGE_GHCR_AUTHOR ................. ${{ inputs.IMAGE_GHCR_AUTHOR }}"
|
||||||
|
echo "inputs.IMAGE_GHCR_USERNAME ............... ${{ inputs.IMAGE_GHCR_USERNAME }}"
|
||||||
|
echo "inputs.DEV_RELEASE ....................... ${{ inputs.DEV_RELEASE }}"
|
||||||
|
echo "inputs.DRY_RUN ........................... ${{ inputs.DRY_RUN }}"
|
||||||
|
echo ""
|
||||||
|
echo "[ ENV ] ------------------------------------------------------------------------------------------------"
|
||||||
|
echo "env.IMAGE_NAME ........................... ${{ env.IMAGE_NAME }}"
|
||||||
|
echo "env.IMAGE_VERSION ........................ ${{ env.IMAGE_VERSION }}"
|
||||||
|
echo "env.IMAGE_VERSION_1DIGIT ................. ${{ env.IMAGE_VERSION_1DIGIT }}"
|
||||||
|
echo "env.IMAGE_VERSION_2DIGIT ................. ${{ env.IMAGE_VERSION_2DIGIT }}"
|
||||||
|
echo "env.IMAGE_GHCR_AUTHOR .................... ${{ env.IMAGE_GHCR_AUTHOR }}"
|
||||||
|
echo "env.IMAGE_GHCR_USERNAME .................. ${{ env.IMAGE_GHCR_USERNAME }}"
|
||||||
|
echo "env.NOW .................................. ${{ env.NOW }}"
|
||||||
|
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.REGISTRY_REPO_ORG_AUTHOR_LC .......... ${{ env.REGISTRY_REPO_ORG_AUTHOR_LC }}"
|
||||||
|
echo "env.REGISTRY_REPO_AUTHOR_LC .............. ${{ env.REGISTRY_REPO_AUTHOR_LC }}"
|
||||||
|
echo "env.DOCKER_SHA ........................... ${{ env.DOCKER_SHA }}"
|
||||||
|
echo ""
|
||||||
|
echo "[ DOCKER IMAGES ] --------------------------------------------------------------------------------------"
|
||||||
|
echo "registry ................................. Github GHCR"
|
||||||
|
echo "tags ..................................... ${{ steps.task_release_gh_meta.outputs.tags }}"
|
||||||
|
echo "labels ................................... ${{ steps.task_release_gh_meta.outputs.labels }}"
|
||||||
|
echo "digest ................................... ${{ steps.task_release_gh_push_amd64.outputs.digest }}"
|
||||||
|
echo ""
|
||||||
|
echo "(release) tags ........................... ${{ steps.task_release_gh_meta.outputs.tags }}"
|
||||||
|
echo "(release) labels ......................... ${{ steps.task_release_gh_meta.outputs.labels }}"
|
||||||
|
echo ""
|
||||||
|
echo "[ DOCKER DIGESTS ] -------------------------------------------------------------------------------------"
|
||||||
|
echo "docker image id (amd64) .................. ${{ steps.task_release_gh_push_amd64.outputs.imageid }}"
|
||||||
|
echo "docker digest (amd64) .................... ${{ steps.task_release_gh_push_amd64.outputs.digest }}"
|
||||||
|
echo "docker image id (arm64) .................. ${{ steps.task_release_gh_push_arm64.outputs.imageid }}"
|
||||||
|
echo "docker digest (arm64) .................... ${{ steps.task_release_gh_push_arm64.outputs.digest }}"
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Github › Get Weekly Commits
|
# Release › Github › Get Weekly Commits
|
||||||
# #
|
# #
|
||||||
|
|||||||
293
.github/workflows/release.yml
vendored
293
.github/workflows/release.yml
vendored
@@ -77,23 +77,23 @@ on:
|
|||||||
type: boolean
|
type: boolean
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# true released version will be marked as a development build and will have the v1.x.x-development tag instead of -latest
|
# ENABLE: released version will be marked as pre-release
|
||||||
# false release version will be marked with -latest docker tag
|
# DISABLE: release version will be marked as stable / normal release
|
||||||
# #
|
# #
|
||||||
|
|
||||||
RC_RELEASE:
|
PRERELEASE:
|
||||||
description: '🧪 Build RC (Pre-release)'
|
description: '🧪 Build RC (Pre-release)'
|
||||||
required: true
|
required: true
|
||||||
default: false
|
default: false
|
||||||
type: boolean
|
type: boolean
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# only needed if env variable `RC_ONLY` = true
|
# Release Candidate version number
|
||||||
# sets the version number for the release candidate
|
# this will be added to the end of your released app in the releases page.
|
||||||
# e.g: noxenv-v1.0.0-rc.1
|
# e.g: tvapp2-v1.0.0-rc.1
|
||||||
# #
|
# #
|
||||||
|
|
||||||
RC_VERSION:
|
VERSION_RC:
|
||||||
description: '🧪 RC (Pre-release) Ver (tvapp2-rc.v1)'
|
description: '🧪 RC (Pre-release) Ver (tvapp2-rc.v1)'
|
||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
@@ -105,17 +105,15 @@ on:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
PROJECT_NAME: ${{ github.event.inputs.PROJECT_NAME || 'tvapp2' }}
|
PROJECT_NAME: ${{ github.event.inputs.PROJECT_NAME || 'tvapp2' }}
|
||||||
CHANGELOG_MODE_COMMIT: ${{ github.event.inputs.CHANGELOG_MODE_COMMIT || true }}
|
CHANGELOG_MODE_COMMIT: true
|
||||||
SHOW_UNCATEGORIZED: ${{ github.event.inputs.SHOW_UNCATEGORIZED || false }}
|
SHOW_UNCATEGORIZED: false
|
||||||
RC_RELEASE: ${{ github.event.inputs.RC_RELEASE || false }}
|
PRERELEASE: false
|
||||||
RC_VERSION: ${{ github.event.inputs.RC_VERSION || '1' }}
|
VERSION_RC: '1'
|
||||||
ASSIGN_USER: Aetherinox
|
ASSIGN_USER: Aetherinox
|
||||||
BOT_NAME_1: EuropaServ
|
BOT_NAME_1: EuropaServ
|
||||||
BOT_NAME_2: BinaryServ
|
BOT_NAME_2: BinaryServ
|
||||||
BOT_NAME_DEPENDABOT: dependabot[bot]
|
BOT_NAME_DEPENDABOT: dependabot[bot]
|
||||||
BOT_NAME_RENOVATE: renovate[bot]
|
BOT_NAME_RENOVATE: renovate[bot]
|
||||||
GPG_KEY_BASE64: ${{ secrets.ADMINSERV_GPG_KEY_B64 }}
|
|
||||||
GPG_KEY_PASSPHRASE: ${{ secrets.ADMINSERV_GPG_PASSPHRASE }}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Jobs
|
# Jobs
|
||||||
@@ -209,20 +207,6 @@ jobs:
|
|||||||
packages: write
|
packages: write
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
# #
|
|
||||||
# Release › Set Env Variables
|
|
||||||
# #
|
|
||||||
|
|
||||||
- name: >-
|
|
||||||
🕛 Get Timestamp
|
|
||||||
id: task_release_label_set_timestamp
|
|
||||||
run: |
|
|
||||||
echo "YEAR=$(date +'%Y')" >> $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
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Checkout
|
# Release › Checkout
|
||||||
# #
|
# #
|
||||||
@@ -234,22 +218,17 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Start
|
# Release › Set Env Variables
|
||||||
# #
|
# #
|
||||||
|
|
||||||
- name: >-
|
- name: >-
|
||||||
✅ Start
|
🕛 Get Timestamp
|
||||||
id: task_release_start
|
id: task_release_label_set_timestamp
|
||||||
run: |
|
run: |
|
||||||
echo "―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――"
|
echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
|
||||||
echo " Starting Documentation Build script"
|
echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
|
||||||
echo " Runner .............. ${{ runner.name }}"
|
echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
|
||||||
echo " Workflow ............ ${{ github.workflow }} (#${{ github.workflow_ref }})"
|
echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
|
||||||
echo " Run Number .......... #${{ github.run_number }}"
|
|
||||||
echo " Run ID .............. https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
|
|
||||||
echo " Triggered By ........ ${{ github.actor }}"
|
|
||||||
echo " Time ................ ${{ env.NOW_LONG }}"
|
|
||||||
echo "―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――"
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Print Version Debug
|
# Release › Print Version Debug
|
||||||
@@ -309,17 +288,15 @@ jobs:
|
|||||||
# Release › Build › Stable
|
# Release › Build › Stable
|
||||||
# #
|
# #
|
||||||
|
|
||||||
- name: '🔨 Build › Stable › ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip'
|
- name: '🔨 Build › Stable ( ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip )'
|
||||||
id: task_release_build_st
|
id: task_release_build_st
|
||||||
if: |
|
if: ${{ startsWith( inputs.PRERELEASE, false ) }}
|
||||||
startsWith( inputs.RC_RELEASE, false ) ||
|
|
||||||
startsWith( env.RC_RELEASE, false )
|
|
||||||
run: |
|
run: |
|
||||||
echo Building STABLE Package ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip
|
echo Building STABLE Package ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip
|
||||||
zip -r ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip Dockerfile Dockerfile.aarch64 docker-compose.yml docker-entrypoint.sh root/ tvapp2/package.json README.md LICENSE
|
zip -r ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip Dockerfile Dockerfile.aarch64 docker-compose.yml docker-entrypoint.sh root/ tvapp2/package.json README.md LICENSE
|
||||||
|
|
||||||
echo Building STABLE Package ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-docker-compose.zip
|
echo Building STABLE Package ${{ env.PROJECT_NAME }}-v${{ env.PACKAGE_VERSION }}-docker-compose.zip
|
||||||
zip -r ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-docker-compose.zip docker-compose.yml README.md LICENSE
|
zip -r ${{ env.PROJECT_NAME }}-v${{ env.PACKAGE_VERSION }}-docker-compose.zip docker-compose.yml README.md LICENSE
|
||||||
env:
|
env:
|
||||||
NODE_AUTH_TOKEN: ${{ secrets.ADMINSERV_TOKEN_CL }}
|
NODE_AUTH_TOKEN: ${{ secrets.ADMINSERV_TOKEN_CL }}
|
||||||
|
|
||||||
@@ -327,17 +304,15 @@ jobs:
|
|||||||
# Release › Build › Release Candidate
|
# Release › Build › Release Candidate
|
||||||
# #
|
# #
|
||||||
|
|
||||||
- name: '🔨 Build › Release Candidate › ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.RC_VERSION }}.zip'
|
- name: '🔨 Build › RC ( ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.VERSION_RC }}.zip )'
|
||||||
id: task_release_build_rc
|
id: task_release_build_rc
|
||||||
if: |
|
if: ${{ startsWith( inputs.PRERELEASE, true ) }}
|
||||||
startsWith( inputs.RC_RELEASE, true ) ||
|
|
||||||
startsWith( env.RC_RELEASE, true )
|
|
||||||
run: |
|
run: |
|
||||||
echo Building PRE-RELEASE Package ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.RC_VERSION }}.zip
|
echo Building PRE-RELEASE Package ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.VERSION_RC }}.zip
|
||||||
zip -r ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.RC_VERSION }}.zip Dockerfile Dockerfile.aarch64 docker-compose.yml docker-entrypoint.sh root/ tvapp2/package.json README.md LICENSE
|
zip -r ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.VERSION_RC }}.zip Dockerfile Dockerfile.aarch64 docker-compose.yml docker-entrypoint.sh root/ tvapp2/package.json README.md LICENSE
|
||||||
|
|
||||||
echo Building PRE-RELEASE Package ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.RC_VERSION }}-docker-compose.zip
|
echo Building PRE-RELEASE Package ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.VERSION_RC }}-docker-compose.zip
|
||||||
zip -r ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.RC_VERSION }}-docker-compose.zip docker-compose.yml README.md LICENSE
|
zip -r ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.VERSION_RC }}-docker-compose.zip docker-compose.yml README.md LICENSE
|
||||||
env:
|
env:
|
||||||
NODE_AUTH_TOKEN: ${{ secrets.ADMINSERV_TOKEN_CL }}
|
NODE_AUTH_TOKEN: ${{ secrets.ADMINSERV_TOKEN_CL }}
|
||||||
|
|
||||||
@@ -371,93 +346,39 @@ jobs:
|
|||||||
echo "Tag already present: ${{ env.TAG_EXISTS }}"
|
echo "Tag already present: ${{ env.TAG_EXISTS }}"
|
||||||
echo "Tag already present: ${{ steps.task_release_tag_create.outputs.tag_exists }}"
|
echo "Tag already present: ${{ steps.task_release_tag_create.outputs.tag_exists }}"
|
||||||
|
|
||||||
# #
|
|
||||||
# Release › GPG › Import Key (No Passphrase)
|
|
||||||
#
|
|
||||||
# requires your GPG private key, converted to base64 binary .gpg (not armored .asc)
|
|
||||||
# #
|
|
||||||
|
|
||||||
- name: '🪪 GPG › Import Signing Key › W/o Passphrase'
|
|
||||||
id: task_release_gpg_import_nopass
|
|
||||||
if: env.GPG_KEY_BASE64 != '' && env.GPG_KEY_PASSPHRASE == ''
|
|
||||||
run: |
|
|
||||||
echo $GPG_KEY_BASE64 | base64 -di | gpg --import
|
|
||||||
|
|
||||||
# #
|
|
||||||
# Release › GPG › Import Key (With Passphrase)
|
|
||||||
#
|
|
||||||
# requires your GPG private key, converted to base64 binary .gpg (not armored .asc)
|
|
||||||
# #
|
|
||||||
|
|
||||||
- name: '🪪 GPG › Import Signing Key › w/ Passphrase'
|
|
||||||
id: task_release_gpg_import_withpass
|
|
||||||
if: env.GPG_KEY_BASE64 != '' && env.GPG_KEY_PASSPHRASE != ''
|
|
||||||
run: |
|
|
||||||
echo "$GPG_KEY_BASE64" | base64 -di > /tmp/signing-key.gpg
|
|
||||||
echo "$GPG_KEY_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg
|
|
||||||
(echo "$GPG_KEY_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1)
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Checksum › Stable
|
# Release › Checksum › Stable
|
||||||
# #
|
# #
|
||||||
|
|
||||||
- name: '🆔 Checksum › Stable'
|
- name: '🆔 Checksum › Stable'
|
||||||
id: task_release_checksum_st_set
|
id: task_release_checksum_st_set
|
||||||
if: |
|
if: ${{ startsWith( inputs.PRERELEASE, false ) }}
|
||||||
startsWith( inputs.RC_RELEASE, false ) ||
|
|
||||||
startsWith( env.RC_RELEASE, false )
|
|
||||||
run: |
|
run: |
|
||||||
filename_zip="${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip"
|
filename_zip="${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip"
|
||||||
|
sha256="$(shasum --algorithm 256 ${filename_zip} | awk '{ print $1 }')"
|
||||||
# get sha1 and sha256 for .zip and .gz files
|
shasum --algorithm 256 ${filename_zip} > SHA256SUMS.txt
|
||||||
find . -maxdepth 1 \( -name '*.zip' -o -name '*.gz' \) -printf '%P\n' | xargs -r sha1sum | gpg --digest-algo sha256 --clearsign > sha1sum.txt.asc
|
|
||||||
find . -maxdepth 1 \( -name '*.zip' -o -name '*.gz' \) -printf '%P\n' | xargs -r sha256sum | gpg --digest-algo sha256 --clearsign > sha256sum.txt.asc
|
|
||||||
|
|
||||||
# get sha1sum; assign to variable
|
|
||||||
sha1sum="$(shasum --algorithm 1 ${filename_zip} | awk '{ print $1 }')"
|
|
||||||
echo "SHA1SUM=${sha1sum}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
# get sha256sum; assign to variable
|
|
||||||
sha256sum="$(shasum --algorithm 256 ${filename_zip} | awk '{ print $1 }')"
|
|
||||||
echo "SHA256SUM=${sha256sum}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
# no longer needed, replaced by find . command
|
|
||||||
# shasum --algorithm 256 ${filename_zip} > SHA256SUMS.txt
|
|
||||||
echo "FILE_ZIP=${filename_zip}" >> $GITHUB_ENV
|
echo "FILE_ZIP=${filename_zip}" >> $GITHUB_ENV
|
||||||
|
echo "SHA256SUM=${sha256}" >> $GITHUB_ENV
|
||||||
|
|
||||||
filename_compose_zip="${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-docker-compose.zip"
|
filename_compose_zip="${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-docker-compose.zip"
|
||||||
sha256sum_compose="$(shasum --algorithm 256 ${filename_compose_zip} | awk '{ print $1 }')"
|
sha256_compose="$(shasum --algorithm 256 ${filename_compose_zip} | awk '{ print $1 }')"
|
||||||
echo "FILE_COMPOSE_ZIP=${filename_compose_zip}" >> $GITHUB_ENV
|
echo "FILE_COMPOSE_ZIP=${filename_compose_zip}" >> $GITHUB_ENV
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Checksum › Release Candidate
|
# Release › Checksum › Release Candidate
|
||||||
# #
|
# #
|
||||||
|
|
||||||
- name: '🆔 Checksum › Release Candidate'
|
- name: '🆔 Checksum › RC'
|
||||||
id: task_release_checksum_rc_set
|
id: task_release_checksum_rc_set
|
||||||
if: |
|
if: ${{ startsWith( inputs.PRERELEASE, true ) }}
|
||||||
startsWith( inputs.RC_RELEASE, true ) ||
|
|
||||||
startsWith( env.RC_RELEASE, true )
|
|
||||||
run: |
|
run: |
|
||||||
filename_zip="${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.RC_VERSION }}.zip"
|
filename_zip="${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.VERSION_RC }}.zip"
|
||||||
|
sha256="$(shasum --algorithm 256 ${filename_zip} | awk '{ print $1 }')"
|
||||||
# get sha1 and sha256 for .zip and .gz files
|
shasum --algorithm 256 ${filename_zip} > SHA256SUMS.txt
|
||||||
find . -maxdepth 1 \( -name '*.zip' -o -name '*.gz' \) -printf '%P\n' | xargs -r sha1sum | gpg --digest-algo sha256 --clearsign > sha1sum.txt.asc
|
|
||||||
find . -maxdepth 1 \( -name '*.zip' -o -name '*.gz' \) -printf '%P\n' | xargs -r sha256sum | gpg --digest-algo sha256 --clearsign > sha256sum.txt.asc
|
|
||||||
|
|
||||||
# get sha1sum; assign to variable
|
|
||||||
sha1sum="$(shasum --algorithm 1 ${filename_zip} | awk '{ print $1 }')"
|
|
||||||
echo "SHA1SUM=${sha1sum}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
# get sha256sum; assign to variable
|
|
||||||
sha256sum="$(shasum --algorithm 256 ${filename_zip} | awk '{ print $1 }')"
|
|
||||||
echo "SHA256SUM=${sha256sum}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
# no longer needed, replaced by find . command
|
|
||||||
# shasum --algorithm 256 ${filename_zip} > SHA256SUMS.txt
|
|
||||||
echo "FILE_ZIP=${filename_zip}" >> $GITHUB_ENV
|
echo "FILE_ZIP=${filename_zip}" >> $GITHUB_ENV
|
||||||
|
echo "SHA256SUM=${sha256}" >> $GITHUB_ENV
|
||||||
|
|
||||||
filename_compose_zip="${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.RC_VERSION }}-docker-compose.zip"
|
filename_compose_zip="${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.VERSION_RC }}-docker-compose.zip"
|
||||||
sha256_compose="$(shasum --algorithm 256 ${filename_compose_zip} | awk '{ print $1 }')"
|
sha256_compose="$(shasum --algorithm 256 ${filename_compose_zip} | awk '{ print $1 }')"
|
||||||
echo "FILE_COMPOSE_ZIP=${filename_compose_zip}" >> $GITHUB_ENV
|
echo "FILE_COMPOSE_ZIP=${filename_compose_zip}" >> $GITHUB_ENV
|
||||||
|
|
||||||
@@ -483,13 +404,31 @@ jobs:
|
|||||||
avatarSize: 42
|
avatarSize: 42
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Changelog › Generate Tags
|
# Release › Checksum › Add (Stable)
|
||||||
#
|
# #
|
||||||
# generates a changelog from the github api. requires a PREVIOUS_TAG in order to figure
|
|
||||||
# out the changes made between the two versions.
|
- name: '📦 Zip › Add Checksum › Stable'
|
||||||
#
|
id: task_release_zip_st
|
||||||
# outputs:
|
if: ${{ startsWith( inputs.PRERELEASE, false ) }}
|
||||||
# ${{ steps.changelog.outputs.changelog }}
|
run: |
|
||||||
|
echo Zipping STABLE Package .zip ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip
|
||||||
|
zip -jr ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip SHA256SUMS.txt
|
||||||
|
ls
|
||||||
|
|
||||||
|
# #
|
||||||
|
# Release › Checksum › Add (Release Candidate)
|
||||||
|
# #
|
||||||
|
|
||||||
|
- name: '📦 Zip › Add Checksum › RC'
|
||||||
|
id: task_release_zip_rc
|
||||||
|
if: ${{ startsWith( inputs.PRERELEASE, true ) }}
|
||||||
|
run: |
|
||||||
|
echo Zipping PRE-RELEASE Package .zip ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.VERSION_RC }}.zip
|
||||||
|
zip -jr ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.VERSION_RC }}.zip SHA256SUMS.txt
|
||||||
|
ls
|
||||||
|
|
||||||
|
# #
|
||||||
|
# Release › Generate Tags
|
||||||
# #
|
# #
|
||||||
|
|
||||||
- name: '📝 Changelog › Pre Setup (Categorized Commits)'
|
- name: '📝 Changelog › Pre Setup (Categorized Commits)'
|
||||||
@@ -604,56 +543,14 @@ jobs:
|
|||||||
echo "$CHANGELOG_UNCATEGORIZED"
|
echo "$CHANGELOG_UNCATEGORIZED"
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Verbose › List Tree
|
# Release › List Tree
|
||||||
# #
|
# #
|
||||||
|
|
||||||
- name: '⚙️ Verbose › Tree Listing'
|
- name: '⚙️ Debug › Tree Listing'
|
||||||
id: task_release_verbose_tree
|
id: task_release_debug_tree
|
||||||
run: |
|
run: |
|
||||||
tree
|
tree
|
||||||
|
|
||||||
# #
|
|
||||||
# Release › Verbose › Changelog › Print Categorized
|
|
||||||
# #
|
|
||||||
|
|
||||||
- name: '⚙️ Verbose › Changelog › Categorized'
|
|
||||||
id: task_release_changelog_verbose_categorized
|
|
||||||
if: |
|
|
||||||
startsWith( inputs.SHOW_UNCATEGORIZED, false ) ||
|
|
||||||
startsWith( env.SHOW_UNCATEGORIZED, false )
|
|
||||||
env:
|
|
||||||
CHANGELOG_CATEGORIZED: ${{ steps.task_release_changelog_categorized.outputs.changelog }}
|
|
||||||
CHANGELOG_UNCATEGORIZED: ${{ steps.task_release_changelog_categorized.outputs.changelog }}
|
|
||||||
run: |
|
|
||||||
echo
|
|
||||||
echo "---- CHANGELOG [ Categorized ] -----------------------------------------------"
|
|
||||||
echo
|
|
||||||
echo "$CHANGELOG_CATEGORIZED"
|
|
||||||
echo
|
|
||||||
echo "---- CHANGELOG ---------------------------------------------------------------"
|
|
||||||
echo
|
|
||||||
|
|
||||||
# #
|
|
||||||
# Release › Verbose › Changelog › Print Uncategorized
|
|
||||||
# #
|
|
||||||
|
|
||||||
- name: '⚙️ Verbose › Changelog › Uncategorized'
|
|
||||||
id: task_release_changelog_verbose_uncategorized
|
|
||||||
if: |
|
|
||||||
startsWith( inputs.SHOW_UNCATEGORIZED, true ) ||
|
|
||||||
startsWith( env.SHOW_UNCATEGORIZED, true )
|
|
||||||
env:
|
|
||||||
CHANGELOG_CATEGORIZED: ${{ steps.task_release_changelog_categorized.outputs.changelog }}
|
|
||||||
CHANGELOG_UNCATEGORIZED: ${{ steps.task_release_changelog_categorized.outputs.changelog }}
|
|
||||||
run: |
|
|
||||||
echo
|
|
||||||
echo "---- CHANGELOG [ Uncategorized ] ---------------------------------------------"
|
|
||||||
echo
|
|
||||||
echo "$CHANGELOG_UNCATEGORIZED"
|
|
||||||
echo
|
|
||||||
echo "---- CHANGELOG ---------------------------------------------------------------"
|
|
||||||
echo
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Post Release (Stable)
|
# Release › Post Release (Stable)
|
||||||
#
|
#
|
||||||
@@ -666,12 +563,10 @@ jobs:
|
|||||||
- name: '🏳️ Post › Stable'
|
- name: '🏳️ Post › Stable'
|
||||||
id: task_release_bundle_st
|
id: task_release_bundle_st
|
||||||
if: |
|
if: |
|
||||||
startsWith( inputs.RC_RELEASE, false ) ||
|
startsWith( inputs.PRERELEASE, false ) ||
|
||||||
startsWith( env.RC_RELEASE, false )
|
startsWith( env.PRERELEASE, false )
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
env:
|
env:
|
||||||
CHANGELOG_CATEGORIZED: ${{ steps.task_release_changelog_categorized.outputs.changelog }}
|
|
||||||
CHANGELOG_UNCATEGORIZED: ${{ steps.task_release_changelog_categorized.outputs.changelog }}
|
|
||||||
GITHUB_TOKEN: ${{ secrets.ADMINSERV_TOKEN_CL }}
|
GITHUB_TOKEN: ${{ secrets.ADMINSERV_TOKEN_CL }}
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.ADMINSERV_TOKEN_CL }}
|
token: ${{ secrets.ADMINSERV_TOKEN_CL }}
|
||||||
@@ -681,10 +576,9 @@ jobs:
|
|||||||
draft: false
|
draft: false
|
||||||
generate_release_notes: false
|
generate_release_notes: false
|
||||||
files: |
|
files: |
|
||||||
${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-docker-compose.zip
|
${{ env.PROJECT_NAME }}-v${{ env.PACKAGE_VERSION }}-docker-compose.zip
|
||||||
${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip
|
${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip
|
||||||
sha1sum.txt.asc
|
SHA256SUMS.txt
|
||||||
sha256sum.txt.asc
|
|
||||||
prerelease: false
|
prerelease: false
|
||||||
body: |
|
body: |
|
||||||
${{ steps.task_release_changelog_categorized.outputs.changelog }}
|
${{ steps.task_release_changelog_categorized.outputs.changelog }}
|
||||||
@@ -699,16 +593,14 @@ jobs:
|
|||||||
# ${{ steps.task_release_bundle_st.outputs.id
|
# ${{ steps.task_release_bundle_st.outputs.id
|
||||||
# #
|
# #
|
||||||
|
|
||||||
- name: '🏳️ Post › Release Candidate'
|
- name: "🏳️ Post › Release Candidate"
|
||||||
id: task_release_bundle_rc
|
id: task_release_bundle_rc
|
||||||
if: |
|
if: |
|
||||||
startsWith( inputs.RC_RELEASE, true ) ||
|
startsWith( inputs.PRERELEASE, true ) ||
|
||||||
startsWith( env.RC_RELEASE, true )
|
startsWith( env.PRERELEASE, true )
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
env:
|
env:
|
||||||
CHANGELOG_CATEGORIZED: ${{ steps.task_release_changelog_categorized.outputs.changelog }}
|
GITHUB_TOKEN: ${{ secrets.ADMINSERV_TOKEN }}
|
||||||
CHANGELOG_UNCATEGORIZED: ${{ steps.task_release_changelog_categorized.outputs.changelog }}
|
|
||||||
GITHUB_TOKEN: ${{ secrets.ADMINSERV_TOKEN_CL }}
|
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.ADMINSERV_TOKEN }}
|
token: ${{ secrets.ADMINSERV_TOKEN }}
|
||||||
name: v${{ env.PACKAGE_VERSION }}
|
name: v${{ env.PACKAGE_VERSION }}
|
||||||
@@ -717,10 +609,9 @@ jobs:
|
|||||||
draft: false
|
draft: false
|
||||||
generate_release_notes: false
|
generate_release_notes: false
|
||||||
files: |
|
files: |
|
||||||
${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.RC_VERSION }}-docker-compose.zip
|
${{ env.PROJECT_NAME }}-v${{ env.PACKAGE_VERSION }}-rc.${{ inputs.VERSION_RC }}-docker-compose.zip
|
||||||
${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.RC_VERSION }}.zip
|
${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.VERSION_RC }}.zip
|
||||||
sha1sum.txt.asc
|
SHA256SUMS.txt
|
||||||
sha256sum.txt.asc
|
|
||||||
prerelease: false
|
prerelease: false
|
||||||
body: |
|
body: |
|
||||||
> [!WARNING]
|
> [!WARNING]
|
||||||
@@ -764,37 +655,19 @@ jobs:
|
|||||||
echo "---- CHANGELOG ---------------------------------------------------------------"
|
echo "---- CHANGELOG ---------------------------------------------------------------"
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Release › Upload Artifacts › Release Files › Stable
|
# Release › Upload Artifacts › Release Files
|
||||||
# #
|
# #
|
||||||
|
|
||||||
- name: >-
|
- name: >-
|
||||||
📋 Upload Artifacts › Stable › ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip
|
📋 Upload Artifacts › ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip
|
||||||
id: task_release_artifact_stable
|
id: task_release_artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
if: |
|
if: always()
|
||||||
startsWith( inputs.RC_RELEASE, false ) ||
|
|
||||||
startsWith( env.RC_RELEASE, false )
|
|
||||||
with:
|
with:
|
||||||
name: "${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}"
|
name: "${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}"
|
||||||
path: ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip
|
path: ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip
|
||||||
retention-days: 30
|
retention-days: 30
|
||||||
|
|
||||||
# #
|
|
||||||
# Release › Upload Artifacts › Release Files › Release Candidate
|
|
||||||
# #
|
|
||||||
|
|
||||||
- name: >-
|
|
||||||
📋 Upload Artifacts › RC › ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}.zip
|
|
||||||
id: task_release_artifact_rc
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
if: |
|
|
||||||
startsWith( inputs.RC_RELEASE, true ) ||
|
|
||||||
startsWith( env.RC_RELEASE, true )
|
|
||||||
with:
|
|
||||||
name: "${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.RC_VERSION }}"
|
|
||||||
path: ${{ env.PROJECT_NAME }}-${{ env.PACKAGE_VERSION }}-rc.${{ inputs.RC_VERSION }}.zip
|
|
||||||
retention-days: 30
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Job › Complete
|
# Job › Complete
|
||||||
# #
|
# #
|
||||||
|
|||||||
@@ -57,7 +57,6 @@ ARG ALPINE_VERSION=3.21
|
|||||||
ARG BUILDDATE
|
ARG BUILDDATE
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
ARG RELEASE
|
ARG RELEASE
|
||||||
ARG GIT_SHA1=0000000000000000000000000000000000000000
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Set Labels
|
# Set Labels
|
||||||
@@ -83,7 +82,6 @@ LABEL org.tvapp2.image.build-version="Version:- ${VERSION} Date:- ${BUILDDATE}"
|
|||||||
LABEL org.tvapp2.image.build-version-alpine="${ALPINE_VERSION}"
|
LABEL org.tvapp2.image.build-version-alpine="${ALPINE_VERSION}"
|
||||||
LABEL org.tvapp2.image.build-architecture="${ARCH}"
|
LABEL org.tvapp2.image.build-architecture="${ARCH}"
|
||||||
LABEL org.tvapp2.image.build-release="${RELEASE}"
|
LABEL org.tvapp2.image.build-release="${RELEASE}"
|
||||||
LABEL org.tvapp2.image.build-sha1="${GIT_SHA1}"
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Set Env Var
|
# Set Env Var
|
||||||
@@ -105,10 +103,8 @@ ENV FILE_M3U="playlist.m3u8"
|
|||||||
ENV FILE_EPG="xmltv.xml"
|
ENV FILE_EPG="xmltv.xml"
|
||||||
ENV FILE_TAR="xmltv.xml.gz"
|
ENV FILE_TAR="xmltv.xml.gz"
|
||||||
ENV HEALTH_TIMER=600000
|
ENV HEALTH_TIMER=600000
|
||||||
ENV TASK_CRON_SYNC="0 0 */3 * *"
|
|
||||||
ENV LOG_LEVEL=4
|
ENV LOG_LEVEL=4
|
||||||
ENV TZ="Etc/UTC"
|
ENV TZ="Etc/UTC"
|
||||||
ENV GIT_SHA1=${GIT_SHA1:-0000000000000000000000000000000000000000}
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Install
|
# Install
|
||||||
@@ -120,7 +116,6 @@ RUN \
|
|||||||
curl \
|
curl \
|
||||||
bash \
|
bash \
|
||||||
nano \
|
nano \
|
||||||
git \
|
|
||||||
npm \
|
npm \
|
||||||
openssl
|
openssl
|
||||||
|
|
||||||
|
|||||||
115
README.md
115
README.md
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
<div align="center">
|
<div align="center">
|
||||||
|
|
||||||
<img src="docs/img/screenshots/01.gif" height="450">
|
<img src="docs/img/screenshots/01.png" height="320">
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
<br />
|
<br />
|
||||||
@@ -154,34 +154,13 @@ For the [environment variables](#environment-variables), you may specify these i
|
|||||||
|
|
||||||
#### Environment Variables
|
#### Environment Variables
|
||||||
|
|
||||||
The following is a list of environment variables you can declare within your `docker-compose.yml` or docker run command:
|
|
||||||
|
|
||||||
<br />
|
|
||||||
|
|
||||||
> [!CAUTION]
|
|
||||||
> Do **not** add `"` quotation marks to environment variables.
|
|
||||||
>
|
|
||||||
> ✔️ Correct
|
|
||||||
> ```yml
|
|
||||||
> environment:
|
|
||||||
> - TASK_CRON_SYNC=*/60 * * * *
|
|
||||||
> ```
|
|
||||||
>
|
|
||||||
> ❌ Incorrect
|
|
||||||
> ```yml
|
|
||||||
> environment:
|
|
||||||
> - TASK_CRON_SYNC="*/60 * * * *"
|
|
||||||
> ```
|
|
||||||
|
|
||||||
<br />
|
|
||||||
|
|
||||||
| Env Var | Default | Description |
|
| Env Var | Default | Description |
|
||||||
| --- | --- | --- |
|
| --- | --- | --- |
|
||||||
| `TZ` | `Etc/UTC` | Timezone for error / log reporting |
|
| `TZ` | `Etc/UTC` | Timezone for error / log reporting |
|
||||||
| `WEB_IP` | `0.0.0.0` | IP to use for webserver |
|
| `WEB_IP` | `0.0.0.0` | IP to use for webserver |
|
||||||
| `WEB_PORT` | `4124` | Port to use for webserver |
|
| `WEB_PORT` | `4124` | Port to use for webserver |
|
||||||
| `WEB_FOLDER` | `www` | Internal container folder to keep TVApp2 web files in. <br /><br /> <sup>⚠️ This should not be used unless you know what you're doing</sup> |
|
| `WEB_FOLDER` | `www` | Internal container folder to keep TVApp2 web files in. <br /><br /> <sup>⚠️ This should not be used unless you know what you're doing</sup> |
|
||||||
| `WEB_ENCODING` | `deflate, br` | Defines the HTTP `Accept-Encoding` request and response header. This value specifies what content encoding the sender can understand<br /><br />Gzip compression can be enabled by specifying `'gzip, deflate, br'`, however, [it may break Jellyfin users](#build-error-err-27-jellyfinlivetvguideguidemanager-error-getting-programs-for-channel-xxxxxxxxxxxxxxx-source-2-systemxmlxmlexception--hexadecimal-value-0x1f-is-an-invalid-character-line-1-position-1). |
|
| `WEB_ENCODING` | `deflate, br` | Defines the HTTP `Accept-Encoding` request and response header. This value specifies what content encoding the sender can understand<br /><br />Gzip compression can be enabled by specifying `'gzip, deflate, br'` |
|
||||||
| `WEB_PROXY_HEADER` | `x-forwarded-for` | Defines the header to look for when finding a client's IP address. Used to get a client's IP when behind a reverse proxy or Cloudflare |
|
| `WEB_PROXY_HEADER` | `x-forwarded-for` | Defines the header to look for when finding a client's IP address. Used to get a client's IP when behind a reverse proxy or Cloudflare |
|
||||||
| `URL_REPO` | `https://git.binaryninja.net/BinaryNinja/` | Determines where the data files will be downloaded from. Do not change this or you will be unable to get M3U and EPG data. |
|
| `URL_REPO` | `https://git.binaryninja.net/BinaryNinja/` | Determines where the data files will be downloaded from. Do not change this or you will be unable to get M3U and EPG data. |
|
||||||
| `FILE_URL` | `urls.txt` | Filename for `urls.txt` cache file |
|
| `FILE_URL` | `urls.txt` | Filename for `urls.txt` cache file |
|
||||||
@@ -189,8 +168,6 @@ The following is a list of environment variables you can declare within your `do
|
|||||||
| `FILE_EPG` | `xmltv.xml` | Filename for XML guide data file |
|
| `FILE_EPG` | `xmltv.xml` | Filename for XML guide data file |
|
||||||
| `FILE_GZP` | `xmltv.xml.gz` | Filename for XML compressed as gzip .gz |
|
| `FILE_GZP` | `xmltv.xml.gz` | Filename for XML compressed as gzip .gz |
|
||||||
| `STREAM_QUALITY` | `hd` | Stream quality<br />Can be either `hd` or `sd` |
|
| `STREAM_QUALITY` | `hd` | Stream quality<br />Can be either `hd` or `sd` |
|
||||||
| `TASK_CRON_SYNC` | `0 0 */3 * *` | Defines how often to refresh the M3U and XML IPTV data |
|
|
||||||
| `HEALTH_TIMER` | `600000` | How often (in milliseconds) to run a health check |
|
|
||||||
| `DIR_BUILD` | `/usr/src/app` | Path inside container where TVApp2 will be built. <br /><br /> <sup>⚠️ This should not be used unless you know what you're doing</sup> |
|
| `DIR_BUILD` | `/usr/src/app` | Path inside container where TVApp2 will be built. <br /><br /> <sup>⚠️ This should not be used unless you know what you're doing</sup> |
|
||||||
| `DIR_RUN` | `/usr/bin/app` | Path inside container where TVApp2 will be placed after it is built <br /><br /> <sup>⚠️ This should not be used unless you know what you're doing</sup> |
|
| `DIR_RUN` | `/usr/bin/app` | Path inside container where TVApp2 will be placed after it is built <br /><br /> <sup>⚠️ This should not be used unless you know what you're doing</sup> |
|
||||||
| `LOG_LEVEL` | `4` | Level of logging to display in console<br/>`7` Trace <sup><sub>& below</sub></sup><br />`6` Verbose <sup><sub>& below</sub></sup><br />`5` Debug <sup><sub>& below</sub></sup><br />`4` Info <sup><sub>& below</sub></sup><br />`3` Notice <sup><sub>& below</sub></sup><br />`2` Warn <sup><sub>& below</sub></sup><br />`1` Error <sup><sub>only</sub></sup> |
|
| `LOG_LEVEL` | `4` | Level of logging to display in console<br/>`7` Trace <sup><sub>& below</sub></sup><br />`6` Verbose <sup><sub>& below</sub></sup><br />`5` Debug <sup><sub>& below</sub></sup><br />`4` Info <sup><sub>& below</sub></sup><br />`3` Notice <sup><sub>& below</sub></sup><br />`2` Warn <sup><sub>& below</sub></sup><br />`1` Error <sup><sub>only</sub></sup> |
|
||||||
@@ -389,7 +366,7 @@ This repository offers two types of docker image; `stable` and `development`. Yo
|
|||||||
|
|
||||||
| Build | Tags |
|
| Build | Tags |
|
||||||
| ------------------------- | ----------------------------------------------------------------------------- |
|
| ------------------------- | ----------------------------------------------------------------------------- |
|
||||||
| `Stable` | `🔖 tvapp2:latest` <br /> `🔖 tvapp2:1.5.2` <br /> `🔖 tvapp2:1.5` <br /> `🔖 tvapp2:1` |
|
| `Stable` | `🔖 tvapp2:latest` <br /> `🔖 tvapp2:1.5.0` <br /> `🔖 tvapp2:1.5` <br /> `🔖 tvapp2:1` |
|
||||||
| `Development` | `🔖 tvapp2:development` |
|
| `Development` | `🔖 tvapp2:development` |
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
@@ -601,19 +578,18 @@ Creates the TVApp2 `amd64` docker image:
|
|||||||
# Build tvapp2 amd64
|
# Build tvapp2 amd64
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--build-arg ARCH=amd64 \
|
--build-arg ARCH=amd64 \
|
||||||
--build-arg VERSION=1.5.2 \
|
--build-arg VERSION=1.5.0 \
|
||||||
--build-arg BUILDDATE=20260812 \
|
--build-arg BUILDDATE=20260812 \
|
||||||
--build-arg RELEASE=stable \
|
--build-arg RELEASE=stable \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:1.5.2 \
|
--tag ghcr.io/thebinaryninja/tvapp2:1.5.0 \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:1.5 \
|
--tag ghcr.io/thebinaryninja/tvapp2:1.5 \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:1 \
|
--tag ghcr.io/thebinaryninja/tvapp2:1 \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:latest \
|
--tag ghcr.io/thebinaryninja/tvapp2:latest \
|
||||||
--attest type=provenance,disabled=true \
|
--attest type=provenance,disabled=true \
|
||||||
--attest type=sbom,disabled=true \
|
--attest type=sbom,disabled=true \
|
||||||
--output type=docker \
|
|
||||||
--builder default \
|
|
||||||
--file Dockerfile \
|
--file Dockerfile \
|
||||||
--platform linux/amd64 \
|
--platform linux/amd64 \
|
||||||
|
--output type=docker \
|
||||||
--allow network.host \
|
--allow network.host \
|
||||||
--network host \
|
--network host \
|
||||||
--no-cache \
|
--no-cache \
|
||||||
@@ -631,19 +607,18 @@ Creates the TVApp2 `arm64` docker image:
|
|||||||
# Build tvapp2 arm64
|
# Build tvapp2 arm64
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--build-arg ARCH=arm64 \
|
--build-arg ARCH=arm64 \
|
||||||
--build-arg VERSION=1.5.2 \
|
--build-arg VERSION=1.5.0 \
|
||||||
--build-arg BUILDDATE=20260812 \
|
--build-arg BUILDDATE=20260812 \
|
||||||
--build-arg RELEASE=stable \
|
--build-arg RELEASE=stable \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:1.5.2 \
|
--tag ghcr.io/thebinaryninja/tvapp2:1.5.0 \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:1.5 \
|
--tag ghcr.io/thebinaryninja/tvapp2:1.5 \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:1 \
|
--tag ghcr.io/thebinaryninja/tvapp2:1 \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:latest \
|
--tag ghcr.io/thebinaryninja/tvapp2:latest \
|
||||||
--attest type=provenance,disabled=true \
|
--attest type=provenance,disabled=true \
|
||||||
--attest type=sbom,disabled=true \
|
--attest type=sbom,disabled=true \
|
||||||
--output type=docker \
|
|
||||||
--builder default \
|
|
||||||
--file Dockerfile \
|
--file Dockerfile \
|
||||||
--platform linux/arm64 \
|
--platform linux/arm64 \
|
||||||
|
--output type=docker \
|
||||||
--allow network.host \
|
--allow network.host \
|
||||||
--network host \
|
--network host \
|
||||||
--no-cache \
|
--no-cache \
|
||||||
@@ -765,8 +740,8 @@ docker run --privileged --rm tonistiigi/binfmt --install all
|
|||||||
|
|
||||||
Once the emulator is installed; we will now build two images. When building these two images; we will ensure the `--tag` value is different for each one, by adding the architecture to the end. This ensures we don't overwrite one image with the newer one. We need to have two seperate docker images with two different tags.
|
Once the emulator is installed; we will now build two images. When building these two images; we will ensure the `--tag` value is different for each one, by adding the architecture to the end. This ensures we don't overwrite one image with the newer one. We need to have two seperate docker images with two different tags.
|
||||||
|
|
||||||
- `--tag ghcr.io/thebinaryninja/tvapp2:1.5.2-amd64`
|
- `--tag ghcr.io/thebinaryninja/tvapp2:1.5.0-amd64`
|
||||||
- `--tag ghcr.io/thebinaryninja/tvapp2:1.5.2-arm64`
|
- `--tag ghcr.io/thebinaryninja/tvapp2:1.5.0-arm64`
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
|
|
||||||
@@ -777,10 +752,10 @@ Once the emulator is installed; we will now build two images. When building thes
|
|||||||
>
|
>
|
||||||
> | Registry | Tag |
|
> | Registry | Tag |
|
||||||
> | --- | --- |
|
> | --- | --- |
|
||||||
> | Dockerhub | `--tag thebinaryninja/tvapp2:1.5.2-amd64`<br>`--tag thebinaryninja/tvapp2:1.5.2-arm64` |
|
> | Dockerhub | `--tag thebinaryninja/tvapp2:1.5.0-amd64`<br>`--tag thebinaryninja/tvapp2:1.5.0-arm64` |
|
||||||
> | Github (GHCR) | `--tag ghcr.io/thebinaryninja/tvapp2:1.5.2-amd64`<br>`--tag ghcr.io/thebinaryninja/tvapp2:1.5.2-arm64` |
|
> | Github (GHCR) | `--tag ghcr.io/thebinaryninja/tvapp2:1.5.0-amd64`<br>`--tag ghcr.io/thebinaryninja/tvapp2:1.5.0-arm64` |
|
||||||
> | Registry v2 | `--tag registry.domain.lan/thebinaryninja/tvapp2:1.5.2-amd64`<br>`--tag registry.domain.lan/thebinaryninja/tvapp2:1.5.2-arm64` |
|
> | Registry v2 | `--tag registry.domain.lan/thebinaryninja/tvapp2:1.5.0-amd64`<br>`--tag registry.domain.lan/thebinaryninja/tvapp2:1.5.0-arm64` |
|
||||||
> | Gitea | `--tag git.binaryninja.net/binaryninja/tvapp2:1.5.2-amd64`<br>`--tag git.binaryninja.net/binaryninja/tvapp2:1.5.2-arm64` |
|
> | Gitea | `--tag git.binaryninja.net/binaryninja/tvapp2:1.5.0-amd64`<br>`--tag git.binaryninja.net/binaryninja/tvapp2:1.5.0-arm64` |
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
|
|
||||||
@@ -801,16 +776,15 @@ Creates the TVApp2 **Stable** release `amd64` docker image:
|
|||||||
# Build Tvapp2 amd64 - (stable release)
|
# Build Tvapp2 amd64 - (stable release)
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--build-arg ARCH=amd64 \
|
--build-arg ARCH=amd64 \
|
||||||
--build-arg VERSION=1.5.2 \
|
--build-arg VERSION=1.5.0 \
|
||||||
--build-arg BUILDDATE=20260812 \
|
--build-arg BUILDDATE=20260812 \
|
||||||
--build-arg RELEASE=stable \
|
--build-arg RELEASE=stable \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:1.5.2-amd64 \
|
--tag ghcr.io/thebinaryninja/tvapp2:1.5.0-amd64 \
|
||||||
--attest type=provenance,disabled=true \
|
--attest type=provenance,disabled=true \
|
||||||
--attest type=sbom,disabled=true \
|
--attest type=sbom,disabled=true \
|
||||||
--output type=docker \
|
|
||||||
--builder default \
|
|
||||||
--file Dockerfile \
|
--file Dockerfile \
|
||||||
--platform linux/amd64 \
|
--platform linux/amd64 \
|
||||||
|
--output type=docker \
|
||||||
--allow network.host \
|
--allow network.host \
|
||||||
--network host \
|
--network host \
|
||||||
--no-cache \
|
--no-cache \
|
||||||
@@ -829,16 +803,15 @@ Creates the TVApp2 **Stable** release `arm64` docker image:
|
|||||||
# Build Tvapp2 arm64 - (stable release)
|
# Build Tvapp2 arm64 - (stable release)
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--build-arg ARCH=arm64 \
|
--build-arg ARCH=arm64 \
|
||||||
--build-arg VERSION=1.5.2 \
|
--build-arg VERSION=1.5.0 \
|
||||||
--build-arg BUILDDATE=20260812 \
|
--build-arg BUILDDATE=20260812 \
|
||||||
--build-arg RELEASE=stable \
|
--build-arg RELEASE=stable \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:1.5.2-arm64 \
|
--tag ghcr.io/thebinaryninja/tvapp2:1.5.0-arm64 \
|
||||||
--attest type=provenance,disabled=true \
|
--attest type=provenance,disabled=true \
|
||||||
--attest type=sbom,disabled=true \
|
--attest type=sbom,disabled=true \
|
||||||
--output type=docker \
|
|
||||||
--builder default \
|
|
||||||
--file Dockerfile \
|
--file Dockerfile \
|
||||||
--platform linux/arm64 \
|
--platform linux/arm64 \
|
||||||
|
--output type=docker \
|
||||||
--allow network.host \
|
--allow network.host \
|
||||||
--network host \
|
--network host \
|
||||||
--no-cache \
|
--no-cache \
|
||||||
@@ -857,16 +830,15 @@ Creates the TVApp2 **Development** release `amd64` docker image:
|
|||||||
# Build Tvapp2 amd64 - (development release)
|
# Build Tvapp2 amd64 - (development release)
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--build-arg ARCH=amd64 \
|
--build-arg ARCH=amd64 \
|
||||||
--build-arg VERSION=1.5.2 \
|
--build-arg VERSION=1.5.0 \
|
||||||
--build-arg BUILDDATE=20260812 \
|
--build-arg BUILDDATE=20260812 \
|
||||||
--build-arg RELEASE=development \
|
--build-arg RELEASE=development \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:development-amd64 \
|
--tag ghcr.io/thebinaryninja/tvapp2:development-amd64 \
|
||||||
--attest type=provenance,disabled=true \
|
--attest type=provenance,disabled=true \
|
||||||
--attest type=sbom,disabled=true \
|
--attest type=sbom,disabled=true \
|
||||||
--output type=docker \
|
|
||||||
--builder default \
|
|
||||||
--file Dockerfile \
|
--file Dockerfile \
|
||||||
--platform linux/amd64 \
|
--platform linux/amd64 \
|
||||||
|
--output type=docker \
|
||||||
--allow network.host \
|
--allow network.host \
|
||||||
--network host \
|
--network host \
|
||||||
--no-cache \
|
--no-cache \
|
||||||
@@ -885,16 +857,15 @@ Creates the TVApp2 **Development** release `arm64` docker image:
|
|||||||
# Build Tvapp2 arm64 - (development release)
|
# Build Tvapp2 arm64 - (development release)
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--build-arg ARCH=arm64 \
|
--build-arg ARCH=arm64 \
|
||||||
--build-arg VERSION=1.5.2 \
|
--build-arg VERSION=1.5.0 \
|
||||||
--build-arg BUILDDATE=20260812 \
|
--build-arg BUILDDATE=20260812 \
|
||||||
--build-arg RELEASE=development \
|
--build-arg RELEASE=development \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:development-arm64 \
|
--tag ghcr.io/thebinaryninja/tvapp2:development-arm64 \
|
||||||
--attest type=provenance,disabled=true \
|
--attest type=provenance,disabled=true \
|
||||||
--attest type=sbom,disabled=true \
|
--attest type=sbom,disabled=true \
|
||||||
--output type=docker \
|
|
||||||
--builder default \
|
|
||||||
--file Dockerfile \
|
--file Dockerfile \
|
||||||
--platform linux/arm64 \
|
--platform linux/arm64 \
|
||||||
|
--output type=docker \
|
||||||
--allow network.host \
|
--allow network.host \
|
||||||
--network host \
|
--network host \
|
||||||
--no-cache \
|
--no-cache \
|
||||||
@@ -907,8 +878,8 @@ docker buildx build \
|
|||||||
|
|
||||||
After completing the `docker buildx` commands above; you should now have a few new images. Each image should have its own separate docker tags which do not conflict. If you decided to not build the **development** releases below; that is fine.
|
After completing the `docker buildx` commands above; you should now have a few new images. Each image should have its own separate docker tags which do not conflict. If you decided to not build the **development** releases below; that is fine.
|
||||||
|
|
||||||
- `--tag ghcr.io/thebinaryninja/tvapp2:1.5.2-amd64`
|
- `--tag ghcr.io/thebinaryninja/tvapp2:1.5.0-amd64`
|
||||||
- `--tag ghcr.io/thebinaryninja/tvapp2:1.5.2-arm64`
|
- `--tag ghcr.io/thebinaryninja/tvapp2:1.5.0-arm64`
|
||||||
- `--tag ghcr.io/thebinaryninja/tvapp2:development-amd64`
|
- `--tag ghcr.io/thebinaryninja/tvapp2:development-amd64`
|
||||||
- `--tag ghcr.io/thebinaryninja/tvapp2:development-arm64`
|
- `--tag ghcr.io/thebinaryninja/tvapp2:development-arm64`
|
||||||
|
|
||||||
@@ -934,15 +905,15 @@ You can also get the hash digests by running the commands:
|
|||||||
<br />
|
<br />
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
$ docker buildx imagetools inspect ghcr.io/thebinaryninja/tvapp2:1.5.2-amd64
|
$ docker buildx imagetools inspect ghcr.io/thebinaryninja/tvapp2:1.5.0-amd64
|
||||||
|
|
||||||
Name: ghcr.io/thebinaryninja/tvapp2:1.5.2-amd64
|
Name: ghcr.io/thebinaryninja/tvapp2:1.5.0-amd64
|
||||||
MediaType: application/vnd.docker.distribution.manifest.v2+json
|
MediaType: application/vnd.docker.distribution.manifest.v2+json
|
||||||
Digest: sha256:0abe1b1c119959b3b1ccc23c56a7ee2c4c908c6aaef290d4ab2993859d807a3b
|
Digest: sha256:0abe1b1c119959b3b1ccc23c56a7ee2c4c908c6aaef290d4ab2993859d807a3b
|
||||||
|
|
||||||
$ docker buildx imagetools inspect ghcr.io/thebinaryninja/tvapp2:1.5.2-arm64
|
$ docker buildx imagetools inspect ghcr.io/thebinaryninja/tvapp2:1.5.0-arm64
|
||||||
|
|
||||||
Name: ghcr.io/thebinaryninja/tvapp2:1.5.2-arm64
|
Name: ghcr.io/thebinaryninja/tvapp2:1.5.0-arm64
|
||||||
MediaType: application/vnd.docker.distribution.manifest.v2+json
|
MediaType: application/vnd.docker.distribution.manifest.v2+json
|
||||||
Digest: sha256:e68b9de8669eac64d4e4d2a8343c56705e05e9a907cf0b542343f9b536d9c473
|
Digest: sha256:e68b9de8669eac64d4e4d2a8343c56705e05e9a907cf0b542343f9b536d9c473
|
||||||
```
|
```
|
||||||
@@ -989,14 +960,14 @@ Digest: sha256:c719ccb034946e3f0625003f25026d001768794e38a1ba8aafc9146291d548
|
|||||||
> ```shell
|
> ```shell
|
||||||
> $ docker images --all --no-trunc | grep thebinaryninja
|
> $ docker images --all --no-trunc | grep thebinaryninja
|
||||||
>
|
>
|
||||||
> ghcr.io/thebinaryninja/tvapp2 1.5.2-arm64 sha256:48520ca15fed6483d2d5b79993126c311f833002345b0e12b8eceb5bf9def966 42 minutes ago 46MB
|
> ghcr.io/thebinaryninja/tvapp2 1.5.0-arm64 sha256:48520ca15fed6483d2d5b79993126c311f833002345b0e12b8eceb5bf9def966 42 minutes ago 46MB
|
||||||
>
|
>
|
||||||
> ghcr.io/thebinaryninja/tvapp2 1.5.2-amd64 sha256:54a9b7d390199532d5667fae67120d77e2f459bd6108b27ce94e0cfec8f3c41f 43 minutes ago 45MB
|
> ghcr.io/thebinaryninja/tvapp2 1.5.0-amd64 sha256:54a9b7d390199532d5667fae67120d77e2f459bd6108b27ce94e0cfec8f3c41f 43 minutes ago 45MB
|
||||||
> ```
|
> ```
|
||||||
>
|
>
|
||||||
> To get the correct sha256 digest, use:
|
> To get the correct sha256 digest, use:
|
||||||
> - `docker buildx imagetools inspect ghcr.io/thebinaryninja/tvapp2:1.5.2-amd64`
|
> - `docker buildx imagetools inspect ghcr.io/thebinaryninja/tvapp2:1.5.0-amd64`
|
||||||
> - `docker buildx imagetools inspect ghcr.io/thebinaryninja/tvapp2:1.5.2-arm64`
|
> - `docker buildx imagetools inspect ghcr.io/thebinaryninja/tvapp2:1.5.0-arm64`
|
||||||
> - `docker buildx imagetools inspect ghcr.io/thebinaryninja/tvapp2:development-amd64`
|
> - `docker buildx imagetools inspect ghcr.io/thebinaryninja/tvapp2:development-amd64`
|
||||||
> - `docker buildx imagetools inspect ghcr.io/thebinaryninja/tvapp2:development-arm64`
|
> - `docker buildx imagetools inspect ghcr.io/thebinaryninja/tvapp2:development-arm64`
|
||||||
>
|
>
|
||||||
@@ -1016,7 +987,7 @@ For the **stable** releases, use:
|
|||||||
# #
|
# #
|
||||||
|
|
||||||
docker buildx imagetools create \
|
docker buildx imagetools create \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:1.5.2 \
|
--tag ghcr.io/thebinaryninja/tvapp2:1.5.0 \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:1.5 \
|
--tag ghcr.io/thebinaryninja/tvapp2:1.5 \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:1 \
|
--tag ghcr.io/thebinaryninja/tvapp2:1 \
|
||||||
--tag ghcr.io/thebinaryninja/tvapp2:latest \
|
--tag ghcr.io/thebinaryninja/tvapp2:latest \
|
||||||
@@ -1025,9 +996,9 @@ docker buildx imagetools create \
|
|||||||
|
|
||||||
[+] Building 0.2s (4/4) FINISHED
|
[+] Building 0.2s (4/4) FINISHED
|
||||||
=> [internal] pushing ghcr.io/thebinaryninja/tvapp2:latest 0.2s
|
=> [internal] pushing ghcr.io/thebinaryninja/tvapp2:latest 0.2s
|
||||||
=> [internal] pushing ghcr.io/thebinaryninja/tvapp2:1 0.2s
|
|
||||||
=> [internal] pushing ghcr.io/thebinaryninja/tvapp2:1.5 0.2s
|
=> [internal] pushing ghcr.io/thebinaryninja/tvapp2:1.5 0.2s
|
||||||
=> [internal] pushing ghcr.io/thebinaryninja/tvapp2:1.5.2 0.2s
|
=> [internal] pushing ghcr.io/thebinaryninja/tvapp2:1 0.2s
|
||||||
|
=> [internal] pushing ghcr.io/thebinaryninja/tvapp2:1.5.0 0.2s
|
||||||
```
|
```
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
@@ -1073,8 +1044,8 @@ In this example, we take the existing two files we created earlier, and merge th
|
|||||||
```shell
|
```shell
|
||||||
# Example 1 (using tag)
|
# Example 1 (using tag)
|
||||||
docker manifest create ghcr.io/thebinaryninja/tvapp2:latest \
|
docker manifest create ghcr.io/thebinaryninja/tvapp2:latest \
|
||||||
--amend ghcr.io/thebinaryninja/tvapp2:1.5.2-amd64 \
|
--amend ghcr.io/thebinaryninja/tvapp2:1.5.0-amd64 \
|
||||||
--amend ghcr.io/thebinaryninja/tvapp2:1.5.2-arm64
|
--amend ghcr.io/thebinaryninja/tvapp2:1.5.0-arm64
|
||||||
|
|
||||||
# Example 2 (using sha256 hash)
|
# Example 2 (using sha256 hash)
|
||||||
docker manifest create ghcr.io/thebinaryninja/tvapp2:latest \
|
docker manifest create ghcr.io/thebinaryninja/tvapp2:latest \
|
||||||
@@ -1115,7 +1086,7 @@ To build the project, `🗔 cd` into the project folder and run the build comman
|
|||||||
|
|
||||||
```shell
|
```shell
|
||||||
cd /home/docker/tvapp2/
|
cd /home/docker/tvapp2/
|
||||||
npm run docker:build:amd64 --VERSION=1.5.2 --BUILDDATE=20260812
|
npm run docker:build:amd64 --VERSION=1.5.0 --BUILDDATE=20260812
|
||||||
```
|
```
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
@@ -1240,7 +1211,7 @@ This docker container contains the following env variables:
|
|||||||
| `WEB_IP` | `0.0.0.0` | IP to use for webserver |
|
| `WEB_IP` | `0.0.0.0` | IP to use for webserver |
|
||||||
| `WEB_PORT` | `4124` | Port to use for webserver |
|
| `WEB_PORT` | `4124` | Port to use for webserver |
|
||||||
| `WEB_FOLDER` | `www` | Internal container folder to keep TVApp2 web files in. <br /><br /> <sup>⚠️ This should not be used unless you know what you're doing</sup> |
|
| `WEB_FOLDER` | `www` | Internal container folder to keep TVApp2 web files in. <br /><br /> <sup>⚠️ This should not be used unless you know what you're doing</sup> |
|
||||||
| `WEB_ENCODING` | `deflate, br` | Defines the HTTP `Accept-Encoding` request and response header. This value specifies what content encoding the sender can understand<br /><br />Gzip compression can be enabled by specifying `'gzip, deflate, br'`, however, [it may break Jellyfin users](#build-error-err-27-jellyfinlivetvguideguidemanager-error-getting-programs-for-channel-xxxxxxxxxxxxxxx-source-2-systemxmlxmlexception--hexadecimal-value-0x1f-is-an-invalid-character-line-1-position-1). |
|
| `WEB_ENCODING` | `deflate, br` | Defines the HTTP `Accept-Encoding` request and response header. This value specifies what content encoding the sender can understand<br /><br />Gzip compression can be enabled by specifying `'gzip, deflate, br'` |
|
||||||
| `WEB_PROXY_HEADER` | `x-forwarded-for` | Defines the header to look for when finding a client's IP address. Used to get a client's IP when behind a reverse proxy or Cloudflare |
|
| `WEB_PROXY_HEADER` | `x-forwarded-for` | Defines the header to look for when finding a client's IP address. Used to get a client's IP when behind a reverse proxy or Cloudflare |
|
||||||
| `URL_REPO` | `https://git.binaryninja.net/BinaryNinja/` | Determines where the data files will be downloaded from. Do not change this or you will be unable to get M3U and EPG data. |
|
| `URL_REPO` | `https://git.binaryninja.net/BinaryNinja/` | Determines where the data files will be downloaded from. Do not change this or you will be unable to get M3U and EPG data. |
|
||||||
| `FILE_URL` | `urls.txt` | Filename for `urls.txt` cache file |
|
| `FILE_URL` | `urls.txt` | Filename for `urls.txt` cache file |
|
||||||
@@ -1248,8 +1219,6 @@ This docker container contains the following env variables:
|
|||||||
| `FILE_EPG` | `xmltv.xml` | Filename for XML guide data file |
|
| `FILE_EPG` | `xmltv.xml` | Filename for XML guide data file |
|
||||||
| `FILE_GZP` | `xmltv.xml.gz` | Filename for XML compressed as gzip .gz |
|
| `FILE_GZP` | `xmltv.xml.gz` | Filename for XML compressed as gzip .gz |
|
||||||
| `STREAM_QUALITY` | `hd` | Stream quality<br />Can be either `hd` or `sd` |
|
| `STREAM_QUALITY` | `hd` | Stream quality<br />Can be either `hd` or `sd` |
|
||||||
| `TASK_CRON_SYNC` | `0 0 */3 * *` | Defines how often to refresh the M3U and XML IPTV data |
|
|
||||||
| `HEALTH_TIMER` | `600000` | How often (in milliseconds) to run a health check |
|
|
||||||
| `DIR_BUILD` | `/usr/src/app` | Path inside container where TVApp2 will be built. <br /><br /> <sup>⚠️ This should not be used unless you know what you're doing</sup> |
|
| `DIR_BUILD` | `/usr/src/app` | Path inside container where TVApp2 will be built. <br /><br /> <sup>⚠️ This should not be used unless you know what you're doing</sup> |
|
||||||
| `DIR_RUN` | `/usr/bin/app` | Path inside container where TVApp2 will be placed after it is built <br /><br /> <sup>⚠️ This should not be used unless you know what you're doing</sup> |
|
| `DIR_RUN` | `/usr/bin/app` | Path inside container where TVApp2 will be placed after it is built <br /><br /> <sup>⚠️ This should not be used unless you know what you're doing</sup> |
|
||||||
| `LOG_LEVEL` | `4` | Level of logging to display in console<br/>`7` Trace <sup><sub>& below</sub></sup><br />`6` Verbose <sup><sub>& below</sub></sup><br />`5` Debug <sup><sub>& below</sub></sup><br />`4` Info <sup><sub>& below</sub></sup><br />`3` Notice <sup><sub>& below</sub></sup><br />`2` Warn <sup><sub>& below</sub></sup><br />`1` Error <sup><sub>only</sub></sup> |
|
| `LOG_LEVEL` | `4` | Level of logging to display in console<br/>`7` Trace <sup><sub>& below</sub></sup><br />`6` Verbose <sup><sub>& below</sub></sup><br />`5` Debug <sup><sub>& below</sub></sup><br />`4` Info <sup><sub>& below</sub></sup><br />`3` Notice <sup><sub>& below</sub></sup><br />`2` Warn <sup><sub>& below</sub></sup><br />`1` Error <sup><sub>only</sub></sup> |
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 970 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 61 KiB |
@@ -9,80 +9,10 @@
|
|||||||
# @repo.3 https://github.com/aetherinox/docker-base-alpine
|
# @repo.3 https://github.com/aetherinox/docker-base-alpine
|
||||||
# #
|
# #
|
||||||
|
|
||||||
# #
|
|
||||||
# define > colors
|
|
||||||
#
|
|
||||||
# Use the color table at:
|
|
||||||
# - https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797
|
|
||||||
# #
|
|
||||||
|
|
||||||
declare -A c=(
|
|
||||||
[end]=$'\e[0m'
|
|
||||||
[white]=$'\e[97m'
|
|
||||||
[bold]=$'\e[1m'
|
|
||||||
[dim]=$'\e[2m'
|
|
||||||
[underline]=$'\e[4m'
|
|
||||||
[strike]=$'\e[9m'
|
|
||||||
[blink]=$'\e[5m'
|
|
||||||
[inverted]=$'\e[7m'
|
|
||||||
[hidden]=$'\e[8m'
|
|
||||||
[black]=$'\e[0;30m'
|
|
||||||
[redl]=$'\e[0;91m'
|
|
||||||
[redd]=$'\e[0;31m'
|
|
||||||
[magental]=$'\e[0;95m'
|
|
||||||
[magentad]=$'\e[0;35mm'
|
|
||||||
[bluel]=$'\e[0;94m'
|
|
||||||
[blued]=$'\e[0;34m'
|
|
||||||
[cyanl]=$'\e[0;96m'
|
|
||||||
[cyand]=$'\e[0;36m'
|
|
||||||
[greenl]=$'\e[0;92m'
|
|
||||||
[greend]=$'\e[0;32m'
|
|
||||||
[yellowl]=$'\e[0;93m'
|
|
||||||
[yellowd]=$'\e[0;33m'
|
|
||||||
[greyl]=$'\e[0;37m'
|
|
||||||
[greyd]=$'\e[0;90m'
|
|
||||||
[navy]=$'\e[38;5;62m'
|
|
||||||
[olive]=$'\e[38;5;144m'
|
|
||||||
[peach]=$'\e[38;5;210m'
|
|
||||||
)
|
|
||||||
|
|
||||||
# #
|
|
||||||
# unicode for emojis
|
|
||||||
# https://apps.timwhitlock.info/emoji/tables/unicode
|
|
||||||
# #
|
|
||||||
|
|
||||||
declare -A icon=(
|
|
||||||
["symbolic link"]=$'\xF0\x9F\x94\x97' # 🔗
|
|
||||||
["regular file"]=$'\xF0\x9F\x93\x84' # 📄
|
|
||||||
["directory"]=$'\xF0\x9F\x93\x81' # 📁
|
|
||||||
["regular empty file"]=$'\xe2\xad\x95' # ⭕
|
|
||||||
["log"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["1"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["2"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["3"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["4"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["5"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["pem"]=$'\xF0\x9F\x94\x92' # 🔑
|
|
||||||
["pub"]=$'\xF0\x9F\x94\x91' # 🔒
|
|
||||||
["pfx"]=$'\xF0\x9F\x94\x92' # 🔑
|
|
||||||
["p12"]=$'\xF0\x9F\x94\x92' # 🔑
|
|
||||||
["key"]=$'\xF0\x9F\x94\x91' # 🔒
|
|
||||||
["crt"]=$'\xF0\x9F\xAA\xAA ' # 🪪
|
|
||||||
["gz"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["zip"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["gzip"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["deb"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["sh"]=$'\xF0\x9F\x97\x94' # 🗔
|
|
||||||
)
|
|
||||||
|
|
||||||
# #
|
|
||||||
# define > general
|
|
||||||
# #
|
|
||||||
|
|
||||||
PLUGINS_PATH="/config/www/plugins"
|
PLUGINS_PATH="/config/www/plugins"
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# Plugins > Start
|
# Plugins > Start
|
||||||
# #
|
# #
|
||||||
|
|
||||||
printf '%-29s %-65s\n' " ${c[bluel]}Loader${c[end]}" "${c[end]}Checking tvapp2-plugins${c[end]}"
|
echo -e " Loader : Checking tvapp2-plugins"
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
echo -e " Completed loading container"
|
echo -e " Core : Completed loading container"
|
||||||
|
|||||||
@@ -1,160 +1,35 @@
|
|||||||
#!/usr/bin/with-contenv bash
|
#!/usr/bin/with-contenv bash
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
# #
|
|
||||||
# defaults
|
|
||||||
# #
|
|
||||||
|
|
||||||
PUID=${PUID:-911}
|
PUID=${PUID:-911}
|
||||||
PGID=${PGID:-911}
|
PGID=${PGID:-911}
|
||||||
DIR_BUILD=${DIR_BUILD:-/usr/src/app}
|
|
||||||
DIR_RUN=${DIR_RUN:-/usr/bin/app}
|
|
||||||
bHasError=false
|
|
||||||
|
|
||||||
# #
|
|
||||||
# define > colors
|
|
||||||
#
|
|
||||||
# Use the color table at:
|
|
||||||
# - https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797
|
|
||||||
# #
|
|
||||||
|
|
||||||
declare -A c=(
|
|
||||||
[end]=$'\e[0m'
|
|
||||||
[white]=$'\e[97m'
|
|
||||||
[bold]=$'\e[1m'
|
|
||||||
[dim]=$'\e[2m'
|
|
||||||
[underline]=$'\e[4m'
|
|
||||||
[strike]=$'\e[9m'
|
|
||||||
[blink]=$'\e[5m'
|
|
||||||
[inverted]=$'\e[7m'
|
|
||||||
[hidden]=$'\e[8m'
|
|
||||||
[black]=$'\e[0;30m'
|
|
||||||
[redl]=$'\e[0;91m'
|
|
||||||
[redd]=$'\e[0;31m'
|
|
||||||
[magental]=$'\e[0;95m'
|
|
||||||
[magentad]=$'\e[0;35mm'
|
|
||||||
[bluel]=$'\e[0;94m'
|
|
||||||
[blued]=$'\e[0;34m'
|
|
||||||
[cyanl]=$'\e[0;96m'
|
|
||||||
[cyand]=$'\e[0;36m'
|
|
||||||
[greenl]=$'\e[0;92m'
|
|
||||||
[greend]=$'\e[0;32m'
|
|
||||||
[yellowl]=$'\e[0;93m'
|
|
||||||
[yellowd]=$'\e[0;33m'
|
|
||||||
[greyl]=$'\e[0;37m'
|
|
||||||
[greyd]=$'\e[0;90m'
|
|
||||||
[navy]=$'\e[38;5;62m'
|
|
||||||
[olive]=$'\e[38;5;144m'
|
|
||||||
[peach]=$'\e[38;5;210m'
|
|
||||||
)
|
|
||||||
|
|
||||||
# #
|
|
||||||
# unicode for emojis
|
|
||||||
# https://apps.timwhitlock.info/emoji/tables/unicode
|
|
||||||
# #
|
|
||||||
|
|
||||||
declare -A icon=(
|
|
||||||
["symbolic link"]=$'\xF0\x9F\x94\x97' # 🔗
|
|
||||||
["regular file"]=$'\xF0\x9F\x93\x84' # 📄
|
|
||||||
["directory"]=$'\xF0\x9F\x93\x81' # 📁
|
|
||||||
["regular empty file"]=$'\xe2\xad\x95' # ⭕
|
|
||||||
["log"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["1"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["2"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["3"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["4"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["5"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["pem"]=$'\xF0\x9F\x94\x92' # 🔑
|
|
||||||
["pub"]=$'\xF0\x9F\x94\x91' # 🔒
|
|
||||||
["pfx"]=$'\xF0\x9F\x94\x92' # 🔑
|
|
||||||
["p12"]=$'\xF0\x9F\x94\x92' # 🔑
|
|
||||||
["key"]=$'\xF0\x9F\x94\x91' # 🔒
|
|
||||||
["crt"]=$'\xF0\x9F\xAA\xAA ' # 🪪
|
|
||||||
["gz"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["zip"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["gzip"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["deb"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["sh"]=$'\xF0\x9F\x97\x94' # 🗔
|
|
||||||
)
|
|
||||||
|
|
||||||
# #
|
|
||||||
# get container ips
|
|
||||||
# #
|
|
||||||
|
|
||||||
IP_GATEWAY=$(/sbin/ip route|awk '/default/ { print $3 }')
|
IP_GATEWAY=$(/sbin/ip route|awk '/default/ { print $3 }')
|
||||||
IP_CONTAINER=$(ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')
|
IP_CONTAINER=$(ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')
|
||||||
|
|
||||||
# #
|
|
||||||
# usermod
|
|
||||||
# -o, --non-unique allow using duplicate (non-unique) UID
|
|
||||||
# -g, --gid GROUP force use GROUP as new primary group
|
|
||||||
# -G, --groups GROUPS new list of supplementary GROUPS
|
|
||||||
# -u, --uid UID new UID for the user account
|
|
||||||
# -U, --unlock unlock the user account
|
|
||||||
#
|
|
||||||
# groupmod
|
|
||||||
# -g, --gid GID change the group ID to GID
|
|
||||||
# -o, --non-unique allow to use a duplicate (non-unique) GID
|
|
||||||
# #
|
|
||||||
|
|
||||||
if [[ -z ${TVAPP_READ_ONLY_FS} ]] && [[ -z ${TVAPP_NON_ROOT_USER} ]]; then
|
if [[ -z ${TVAPP_READ_ONLY_FS} ]] && [[ -z ${TVAPP_NON_ROOT_USER} ]]; then
|
||||||
groupmod -o -g "$PGID" dockerx
|
groupmod -o -g "$PGID" dockerx
|
||||||
usermod -o -u "$PUID" dockerx
|
usermod -o -u "$PUID" dockerx
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# #
|
if { [[ -z ${TVAPP_READ_ONLY_FS} ]] && [[ -z ${TVAPP_NON_ROOT_USER} ]]; } || [[ ! ${TVAPP_FIRST_PARTY} = "true" ]]; then
|
||||||
# s6 > branding
|
cat /etc/s6-overlay/s6-rc.d/init-adduser/branding
|
||||||
# #
|
else
|
||||||
|
cat /run/branding
|
||||||
printf '%-1s\n' " ${c[greyd]}──────────────────────────────────────────────────────────────────────────────────────────${c[end]}"
|
fi
|
||||||
printf '%-1s\n' " ${c[greyd]} TVApp2 Docker Image${c[end]}"
|
|
||||||
printf '%-1s\n' " ${c[greyd]}──────────────────────────────────────────────────────────────────────────────────────────${c[end]}"
|
|
||||||
|
|
||||||
printf '%-2s\n' " ${c[greyd]}The TvApp2 image allows you to fetch M3U playlist and EPG data for numerous IPTV ${c[end]}"
|
|
||||||
printf '%-2s\n' " ${c[greyd]}services online. ${c[end]}"
|
|
||||||
echo -e
|
|
||||||
printf '%-2s\n' " ${c[greyd]}Once the files are fetched by the image, you can visit the self-hosted webpage, copy ${c[end]}"
|
|
||||||
printf '%-2s\n' " ${c[greyd]}the links to the M3U and EPG files; and add them to your favorite IPTV app such as ${c[end]}"
|
|
||||||
printf '%-2s\n' " ${c[greyd]}Jellyfin, Plex, or Emby. ${c[end]}"
|
|
||||||
echo -e
|
|
||||||
printf '%-2s\n' " ${c[greyd]}For more information about this project; visit the links below. This app is served on ${c[end]}"
|
|
||||||
printf '%-2s\n' " ${c[greyd]}multiple repositories as backup. Use any of the repo links below: ${c[end]}"
|
|
||||||
echo -e
|
|
||||||
printf '%-6s %-35s %-65s\n' "" " ${c[greenl]}TVApp2 Repo 1${c[end]}" "${c[end]}https://github.com/TheBinaryNinja/tvapp2 ${c[end]}"
|
|
||||||
printf '%-6s %-35s %-65s\n' "" " ${c[greenl]}TVApp2 Repo 2${c[end]}" "${c[end]}https://git.binaryninja.net/BinaryNinja/tvapp2 ${c[end]}"
|
|
||||||
printf '%-6s %-35s %-65s\n' "" " ${c[greenl]}Base Alpine Image${c[end]}" "${c[end]}https://github.com/Aetherinox/docker-base-alpine ${c[end]}"
|
|
||||||
echo -e
|
|
||||||
|
|
||||||
printf '%-2s\n' " ${c[greyd]}If you are making this container available on a public-facing domain, please consider ${c[end]}"
|
|
||||||
printf '%-2s\n' " ${c[greyd]}using Traefik and Authentik to protect this container from outside access. Your M3U ${c[end]}"
|
|
||||||
printf '%-2s\n' " ${c[greyd]}and EPG files will be available for the public to download and use. ${c[end]}"
|
|
||||||
|
|
||||||
# if { [[ -z ${TVAPP_READ_ONLY_FS} ]] && [[ -z ${TVAPP_NON_ROOT_USER} ]]; } || [[ ! ${TVAPP_FIRST_PARTY} = "true" ]]; then
|
|
||||||
# cat /etc/s6-overlay/s6-rc.d/init-adduser/branding
|
|
||||||
# else
|
|
||||||
# cat /run/branding
|
|
||||||
# fi
|
|
||||||
|
|
||||||
# #
|
|
||||||
# branding > non-root user
|
|
||||||
# #
|
|
||||||
|
|
||||||
if [[ -z ${TVAPP_NON_ROOT_USER} ]]; then
|
if [[ -z ${TVAPP_NON_ROOT_USER} ]]; then
|
||||||
echo -e
|
echo ""
|
||||||
printf '%-6s %-35s %-65s\n' "" " ${c[greenl]}User:Group${c[end]}" "${c[end]}$(id -u dockerx):$(id -g dockerx)${c[end]}"
|
echo " User:Group $(id -u dockerx):$(id -g dockerx)"
|
||||||
else
|
else
|
||||||
printf '%-6s %-35s %-65s\n' "" " ${c[greenl]}User:Group${c[end]}" "${c[end]}$(stat /run -c %u):$(stat /run -c %g)${c[end]}"
|
echo " User:Group $(stat /run -c %u):$(stat /run -c %g)"
|
||||||
fi
|
fi
|
||||||
printf '%-6s %-35s %-65s\n' "" " ${c[greenl]}Port(s)${c[end]}" "${c[end]}$(echo $WEB_PORT)${c[end]}"
|
echo " Port(s) $(echo $WEB_PORT)"
|
||||||
printf '%-6s %-35s %-65s\n' "" " ${c[greenl]}Gateway${c[end]}" "${c[end]}$(echo $IP_GATEWAY)${c[end]}"
|
echo " Gateway $(echo $IP_GATEWAY)"
|
||||||
printf '%-6s %-35s %-65s\n' "" " ${c[greenl]}Web Server${c[end]}" "${c[end]}$(echo $IP_CONTAINER:$WEB_PORT)${c[end]}"
|
echo " Web Server $(echo $IP_CONTAINER:$WEB_PORT)"
|
||||||
printf '%-6s %-35s %-65s\n' "" " ${c[greenl]}App Folder${c[end]}" "${c[end]}$(echo $DIR_RUN)${c[end]}"
|
echo " App Folder $(echo $DIR_RUN)"
|
||||||
echo -e
|
echo ""
|
||||||
printf '%-1s\n' " ${c[greyd]}──────────────────────────────────────────────────────────────────────────────────────────${c[end]}"
|
echo '──────────────────────────────────────────────────────────────────────────────────────────'
|
||||||
|
|
||||||
# #
|
|
||||||
# set permissions
|
|
||||||
# #
|
|
||||||
|
|
||||||
if [[ -z ${TVAPP_READ_ONLY_FS} ]] && [[ -z ${TVAPP_NON_ROOT_USER} ]]; then
|
if [[ -z ${TVAPP_READ_ONLY_FS} ]] && [[ -z ${TVAPP_NON_ROOT_USER} ]]; then
|
||||||
aetherxown dockerx:dockerx /app
|
aetherxown dockerx:dockerx /app
|
||||||
|
|||||||
@@ -1,88 +1,22 @@
|
|||||||
#!/usr/bin/with-contenv bash
|
#!/usr/bin/with-contenv bash
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
# #
|
|
||||||
# define > colors
|
|
||||||
#
|
|
||||||
# Use the color table at:
|
|
||||||
# - https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797
|
|
||||||
# #
|
|
||||||
|
|
||||||
declare -A c=(
|
|
||||||
[end]=$'\e[0m'
|
|
||||||
[white]=$'\e[97m'
|
|
||||||
[bold]=$'\e[1m'
|
|
||||||
[dim]=$'\e[2m'
|
|
||||||
[underline]=$'\e[4m'
|
|
||||||
[strike]=$'\e[9m'
|
|
||||||
[blink]=$'\e[5m'
|
|
||||||
[inverted]=$'\e[7m'
|
|
||||||
[hidden]=$'\e[8m'
|
|
||||||
[black]=$'\e[0;30m'
|
|
||||||
[redl]=$'\e[0;91m'
|
|
||||||
[redd]=$'\e[0;31m'
|
|
||||||
[magental]=$'\e[0;95m'
|
|
||||||
[magentad]=$'\e[0;35mm'
|
|
||||||
[bluel]=$'\e[0;94m'
|
|
||||||
[blued]=$'\e[0;34m'
|
|
||||||
[cyanl]=$'\e[0;96m'
|
|
||||||
[cyand]=$'\e[0;36m'
|
|
||||||
[greenl]=$'\e[0;92m'
|
|
||||||
[greend]=$'\e[0;32m'
|
|
||||||
[yellowl]=$'\e[0;93m'
|
|
||||||
[yellowd]=$'\e[0;33m'
|
|
||||||
[greyl]=$'\e[0;37m'
|
|
||||||
[greyd]=$'\e[0;90m'
|
|
||||||
[navy]=$'\e[38;5;62m'
|
|
||||||
[olive]=$'\e[38;5;144m'
|
|
||||||
[peach]=$'\e[38;5;210m'
|
|
||||||
)
|
|
||||||
|
|
||||||
# #
|
|
||||||
# unicode for emojis
|
|
||||||
# https://apps.timwhitlock.info/emoji/tables/unicode
|
|
||||||
# #
|
|
||||||
|
|
||||||
declare -A icon=(
|
|
||||||
["symbolic link"]=$'\xF0\x9F\x94\x97' # 🔗
|
|
||||||
["regular file"]=$'\xF0\x9F\x93\x84' # 📄
|
|
||||||
["directory"]=$'\xF0\x9F\x93\x81' # 📁
|
|
||||||
["regular empty file"]=$'\xe2\xad\x95' # ⭕
|
|
||||||
["log"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["1"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["2"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["3"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["4"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["5"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["pem"]=$'\xF0\x9F\x94\x92' # 🔑
|
|
||||||
["pub"]=$'\xF0\x9F\x94\x91' # 🔒
|
|
||||||
["pfx"]=$'\xF0\x9F\x94\x92' # 🔑
|
|
||||||
["p12"]=$'\xF0\x9F\x94\x92' # 🔑
|
|
||||||
["key"]=$'\xF0\x9F\x94\x91' # 🔒
|
|
||||||
["crt"]=$'\xF0\x9F\xAA\xAA ' # 🪪
|
|
||||||
["gz"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["zip"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["gzip"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["deb"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["sh"]=$'\xF0\x9F\x97\x94' # 🗔
|
|
||||||
)
|
|
||||||
|
|
||||||
# Directories
|
# Directories
|
||||||
SCRIPTS_DIR="/custom-cont-init.d"
|
SCRIPTS_DIR="/custom-cont-init.d"
|
||||||
|
|
||||||
# Make sure custom init directory exists and has files in it
|
# Make sure custom init directory exists and has files in it
|
||||||
if [[ -e "${SCRIPTS_DIR}" ]] && [[ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)" ]]; then
|
if [[ -e "${SCRIPTS_DIR}" ]] && [[ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)" ]]; then
|
||||||
printf '%-29s %-65s\n' " ${c[bluel]}Loader${c[end]}" "${c[end]}Loading any found plugins${c[end]}"
|
echo -e " Loader : Plugins found, loading them ..."
|
||||||
for SCRIPT in "${SCRIPTS_DIR}"/*; do
|
for SCRIPT in "${SCRIPTS_DIR}"/*; do
|
||||||
NAME="$(basename "${SCRIPT}")"
|
NAME="$(basename "${SCRIPT}")"
|
||||||
if [[ -f "${SCRIPT}" ]]; then
|
if [[ -f "${SCRIPT}" ]]; then
|
||||||
printf '%-29s %-65s\n' " ${c[bluel]}Loader${c[end]}" "${c[end]}Executing${c[end]}"
|
echo -e " Loader : Executing ..."
|
||||||
/bin/bash "${SCRIPT}"
|
/bin/bash "${SCRIPT}"
|
||||||
printf '%-29s %-65s\n' " ${c[bluel]}Loader${c[end]}" "${c[end]}Successfully ran with code ${c[bluel]}[$?]${c[end]}"
|
echo -e " Loader : ${NAME}: Ran Successfully with code [$?]"
|
||||||
elif [[ ! -f "${SCRIPT}" ]]; then
|
elif [[ ! -f "${SCRIPT}" ]]; then
|
||||||
printf '%-29s %-65s\n' " ${c[bluel]}Loader${c[end]}" "${c[end]}${c[bluel]}${NAME}${c[end]} is not a valid file${c[end]}"
|
echo -e " Loader : ${NAME}: Not a valid file"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
printf '%-29s %-65s\n' " ${c[bluel]}Loader${c[end]}" "${c[end]}No plugins found; skipping${c[end]}"
|
echo -e " Loader : No Plugins found, skipping..."
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1,113 +1,14 @@
|
|||||||
#!/usr/bin/with-contenv bash
|
#!/usr/bin/with-contenv sh
|
||||||
# shellcheck shell=bash
|
|
||||||
|
|
||||||
# #
|
# #
|
||||||
# defaults
|
# Store env variables in s6
|
||||||
# #
|
|
||||||
|
|
||||||
PUID=${PUID:-911}
|
|
||||||
PGID=${PGID:-911}
|
|
||||||
DIR_BUILD=${DIR_BUILD:-/usr/src/app}
|
|
||||||
DIR_RUN=${DIR_RUN:-/usr/bin/app}
|
|
||||||
bHasError=false
|
|
||||||
|
|
||||||
# #
|
|
||||||
# define > colors
|
|
||||||
#
|
|
||||||
# Use the color table at:
|
|
||||||
# - https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797
|
|
||||||
# #
|
|
||||||
|
|
||||||
declare -A c=(
|
|
||||||
[end]=$'\e[0m'
|
|
||||||
[white]=$'\e[97m'
|
|
||||||
[bold]=$'\e[1m'
|
|
||||||
[dim]=$'\e[2m'
|
|
||||||
[underline]=$'\e[4m'
|
|
||||||
[strike]=$'\e[9m'
|
|
||||||
[blink]=$'\e[5m'
|
|
||||||
[inverted]=$'\e[7m'
|
|
||||||
[hidden]=$'\e[8m'
|
|
||||||
[black]=$'\e[0;30m'
|
|
||||||
[redl]=$'\e[0;91m'
|
|
||||||
[redd]=$'\e[0;31m'
|
|
||||||
[magental]=$'\e[0;95m'
|
|
||||||
[magentad]=$'\e[0;35mm'
|
|
||||||
[bluel]=$'\e[0;94m'
|
|
||||||
[blued]=$'\e[0;34m'
|
|
||||||
[cyanl]=$'\e[0;96m'
|
|
||||||
[cyand]=$'\e[0;36m'
|
|
||||||
[greenl]=$'\e[0;92m'
|
|
||||||
[greend]=$'\e[0;32m'
|
|
||||||
[yellowl]=$'\e[0;93m'
|
|
||||||
[yellowd]=$'\e[0;33m'
|
|
||||||
[greyl]=$'\e[0;37m'
|
|
||||||
[greyd]=$'\e[0;90m'
|
|
||||||
[navy]=$'\e[38;5;62m'
|
|
||||||
[olive]=$'\e[38;5;144m'
|
|
||||||
[peach]=$'\e[38;5;210m'
|
|
||||||
)
|
|
||||||
|
|
||||||
# #
|
|
||||||
# unicode for emojis
|
|
||||||
# https://apps.timwhitlock.info/emoji/tables/unicode
|
|
||||||
# #
|
|
||||||
|
|
||||||
declare -A icon=(
|
|
||||||
["symbolic link"]=$'\xF0\x9F\x94\x97' # 🔗
|
|
||||||
["regular file"]=$'\xF0\x9F\x93\x84' # 📄
|
|
||||||
["directory"]=$'\xF0\x9F\x93\x81' # 📁
|
|
||||||
["regular empty file"]=$'\xe2\xad\x95' # ⭕
|
|
||||||
["log"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["1"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["2"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["3"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["4"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["5"]=$'\xF0\x9F\x93\x9C' # 📜
|
|
||||||
["pem"]=$'\xF0\x9F\x94\x92' # 🔑
|
|
||||||
["pub"]=$'\xF0\x9F\x94\x91' # 🔒
|
|
||||||
["pfx"]=$'\xF0\x9F\x94\x92' # 🔑
|
|
||||||
["p12"]=$'\xF0\x9F\x94\x92' # 🔑
|
|
||||||
["key"]=$'\xF0\x9F\x94\x91' # 🔒
|
|
||||||
["crt"]=$'\xF0\x9F\xAA\xAA ' # 🪪
|
|
||||||
["gz"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["zip"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["gzip"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["deb"]=$'\xF0\x9F\x93\xA6' # 📦
|
|
||||||
["sh"]=$'\xF0\x9F\x97\x94' # 🗔
|
|
||||||
)
|
|
||||||
|
|
||||||
# #
|
|
||||||
# define > system
|
|
||||||
# #
|
|
||||||
|
|
||||||
sys_os_ver="1.0.0"
|
|
||||||
sys_os_name="Unknown"
|
|
||||||
|
|
||||||
# #
|
|
||||||
# s6 > store env variables
|
|
||||||
# #
|
|
||||||
|
|
||||||
printf '%-29s %-65s\n' " ${c[bluel]}STATUS${c[end]}" "${c[end]}Fetching docker container and gateway addresses${c[end]}"
|
|
||||||
|
|
||||||
# #
|
|
||||||
# get container ips
|
|
||||||
# #
|
# #
|
||||||
|
|
||||||
ip_gateway=$(/sbin/ip route|awk '/default/ { print $3 }')
|
ip_gateway=$(/sbin/ip route|awk '/default/ { print $3 }')
|
||||||
ip_container=$(ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')
|
ip_container=$(ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')
|
||||||
|
|
||||||
if [ -d "/var/run/s6/container_environment/" ]; then
|
printf "$ip_gateway" > /var/run/s6/container_environment/IP_GATEWAY
|
||||||
printf "$ip_gateway" > /var/run/s6/container_environment/IP_GATEWAY
|
printf "$ip_container" > /var/run/s6/container_environment/IP_CONTAINER
|
||||||
printf "$ip_container" > /var/run/s6/container_environment/IP_CONTAINER
|
|
||||||
else
|
|
||||||
printf '%-29s %-65s\n' " ${c[redl]}ERROR${c[end]}" "${c[end]}Cannot generate s6-overlay env files; folder ${c[redl]}/var/run/s6/container_environment/${c[end]} does not exist${c[end]}"
|
|
||||||
bHasError=true
|
|
||||||
fi
|
|
||||||
|
|
||||||
# #
|
|
||||||
# s6 > export env vars
|
|
||||||
# #
|
|
||||||
|
|
||||||
export IP_GATEWAY=$ip_gateway
|
export IP_GATEWAY=$ip_gateway
|
||||||
export IP_GATEWAY=$ip_container
|
export IP_GATEWAY=$ip_container
|
||||||
@@ -116,75 +17,8 @@ export IP_GATEWAY=$ip_container
|
|||||||
# install and startup for tvapp2
|
# install and startup for tvapp2
|
||||||
# #
|
# #
|
||||||
|
|
||||||
printf '%-29s %-65s\n' " ${c[bluel]}STATUS${c[end]}" "${c[end]}Copying ${c[bluel]}${DIR_BUILD}${c[end]} to ${c[bluel]}${DIR_RUN}${c[end]}"
|
cp -r ${DIR_BUILD}/* ${DIR_RUN}
|
||||||
if [ -z "${DIR_BUILD}" ]; then
|
rm -rf ${DIR_BUILD}/*
|
||||||
printf '%-29s %-65s\n' " ${c[redl]}ERROR${c[end]}" "${c[end]}Cannot copy; env var ${c[redl]}\${DIR_BUILD}${c[end]} missing${c[end]}"
|
cd ${DIR_RUN}
|
||||||
bHasError=true
|
npm install --omit=dev
|
||||||
else
|
npm start
|
||||||
if [ -d "${DIR_BUILD}/" ]; then
|
|
||||||
cp -r ${DIR_BUILD}/* ${DIR_RUN}
|
|
||||||
else
|
|
||||||
printf '%-29s %-65s\n' " ${c[redl]}ERROR${c[end]}" "${c[end]}Cannot copy folder ${c[redl]}${DIR_BUILD}${c[end]} to ${c[redl]}${DIR_RUN}${c[end]}; build folder ${c[redl]}${DIR_BUILD}${c[end]} does not exist${c[end]}"
|
|
||||||
bHasError=true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# #
|
|
||||||
# remove build directory
|
|
||||||
# #
|
|
||||||
|
|
||||||
printf '%-29s %-65s\n' " ${c[bluel]}STATUS${c[end]}" "${c[end]}Remove ${c[bluel]}${DIR_BUILD}/${c[end]}"
|
|
||||||
if [ -z "${DIR_BUILD}" ]; then
|
|
||||||
printf '%-29s %-65s\n' " ${c[redl]}ERROR${c[end]}" "${c[end]}Cannot remove; env var ${c[redl]}\${DIR_BUILD}${c[end]} missing${c[end]}"
|
|
||||||
else
|
|
||||||
if [ -d "${DIR_BUILD}" ]; then
|
|
||||||
rm -rf "${DIR_BUILD}/"
|
|
||||||
else
|
|
||||||
printf '%-29s %-65s\n' " ${c[redl]}ERROR${c[end]}" "${c[end]}Cannot remove; build folder ${c[redl]}${DIR_BUILD}${c[end]} does not exist. Restart the container to re-initialize build folder.${c[end]}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# #
|
|
||||||
# cd to BUILD_RUN directory
|
|
||||||
# #
|
|
||||||
|
|
||||||
printf '%-29s %-65s\n' " ${c[bluel]}STATUS${c[end]}" "${c[end]}Changing to run directory ${c[bluel]}${DIR_RUN}/${c[end]}"
|
|
||||||
if [ -z "${DIR_RUN}" ]; then
|
|
||||||
printf '%-29s %-65s\n' " ${c[redl]}ERROR${c[end]}" "${c[end]}Cannot cd; env var ${c[redl]}\${DIR_RUN}${c[end]} missing${c[end]}"
|
|
||||||
bHasError=true
|
|
||||||
else
|
|
||||||
if [ -d "${DIR_RUN}" ]; then
|
|
||||||
cd ${DIR_RUN}
|
|
||||||
else
|
|
||||||
printf '%-29s %-65s\n' " ${c[redl]}ERROR${c[end]}" "${c[end]}Cannot cd; run folder ${c[redl]}${DIR_RUN}${c[end]} does not exist${c[end]}"
|
|
||||||
bHasError=true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# #
|
|
||||||
# install tvapp2 via npm
|
|
||||||
# #
|
|
||||||
|
|
||||||
printf '%-29s %-65s\n' " ${c[bluel]}STATUS${c[end]}" "${c[end]}Running command ${c[bluel]}npm install --omit=dev${c[end]}"
|
|
||||||
if ! command -v npm; then
|
|
||||||
printf '%-29s %-65s\n' " ${c[redl]}ERROR${c[end]}" "${c[end]}Cannot install TVApp2 with npm because package ${c[redl]}npm${c[end]} not installed${c[end]}"
|
|
||||||
bHasError=true
|
|
||||||
else
|
|
||||||
npm install --omit=dev
|
|
||||||
|
|
||||||
printf '%-29s %-65s\n' " ${c[bluel]}STATUS${c[end]}" "${c[end]}Running command ${c[bluel]}npm start${c[end]}"
|
|
||||||
npm start
|
|
||||||
fi
|
|
||||||
|
|
||||||
# #
|
|
||||||
# finished run script
|
|
||||||
# #
|
|
||||||
|
|
||||||
printf '%-29s %-65s\n' " ${c[greenl]}OK${c[end]}" "${c[end]}Finished initializing script${c[end]}"
|
|
||||||
if [ "$bHasError" = true ] ; then
|
|
||||||
printf '%-29s %-65s\n' "" ""
|
|
||||||
printf '%-29s %-65s\n' " ${c[redl]}ERROR${c[end]}" "${c[end]}Fatal errors were detected${c[end]}"
|
|
||||||
printf '%-29s %-65s\n' " ${c[redl]}${c[end]}" "${c[end]}The run script detected that certain steps failed. This app may not${c[end]}"
|
|
||||||
printf '%-29s %-65s\n' " ${c[redl]}${c[end]}" "${c[end]}work properly. Try restarting the container.${c[end]}"
|
|
||||||
printf '%-29s %-65s\n' "" ""
|
|
||||||
fi
|
|
||||||
|
|||||||
114
tvapp2/index.js
114
tvapp2/index.js
@@ -12,9 +12,6 @@ import zlib from 'zlib';
|
|||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import ejs from 'ejs';
|
import ejs from 'ejs';
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import * as child from 'child_process';
|
|
||||||
import cron, { schedule } from 'node-cron';
|
|
||||||
import * as crons from 'cron';
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Old CJS variables converted to ESM
|
Old CJS variables converted to ESM
|
||||||
@@ -30,10 +27,6 @@ const cache = new Map();
|
|||||||
const { name, author, version, repository, discord, docs } = JSON.parse( fs.readFileSync( './package.json' ) );
|
const { name, author, version, repository, discord, docs } = JSON.parse( fs.readFileSync( './package.json' ) );
|
||||||
const __filename = fileURLToPath( import.meta.url ); // get resolved path to file
|
const __filename = fileURLToPath( import.meta.url ); // get resolved path to file
|
||||||
const __dirname = path.dirname( __filename ); // get name of directory
|
const __dirname = path.dirname( __filename ); // get name of directory
|
||||||
/*
|
|
||||||
const gitHash = child.execSync( 'git rev-parse HEAD' ).toString().trim();
|
|
||||||
*/
|
|
||||||
const gitHash = `f6484e00dea57891cdeb3123aca124ca7388b22b`;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
chalk.level
|
chalk.level
|
||||||
@@ -87,8 +80,7 @@ const envWebFolder = process.env.WEB_FOLDER || 'www';
|
|||||||
const envWebEncoding = process.env.WEB_ENCODING || 'deflate, br';
|
const envWebEncoding = process.env.WEB_ENCODING || 'deflate, br';
|
||||||
const envProxyHeader = process.env.WEB_PROXY_HEADER || 'x-forwarded-for';
|
const envProxyHeader = process.env.WEB_PROXY_HEADER || 'x-forwarded-for';
|
||||||
const envHealthTimer = process.env.HEALTH_TIMER || 600000;
|
const envHealthTimer = process.env.HEALTH_TIMER || 600000;
|
||||||
const envTaskCronSync = process.env.TASK_CRON_SYNC || '0 0 */3 * *';
|
const LOG_LEVEL = process.env.LOG_LEVEL || 10;
|
||||||
const LOG_LEVEL = process.env.LOG_LEVEL || 4;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Define > Externals
|
Define > Externals
|
||||||
@@ -115,8 +107,8 @@ const USERAGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:138.0) Gecko/201
|
|||||||
http://127.0.0.1:4124/gz
|
http://127.0.0.1:4124/gz
|
||||||
http://127.0.0.1:4124/playlist
|
http://127.0.0.1:4124/playlist
|
||||||
http://127.0.0.1:4124/key
|
http://127.0.0.1:4124/key
|
||||||
http://127.0.0.1:4124/channel?url=https://thetvapp.to/tv/bbc-america-live-stream/
|
http://127.0.0.1:4124/channel
|
||||||
http://127.0.0.1:4124/api/health
|
http://127.0.0.1:4124/health
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const subdomainGZP = [ 'gzip', 'gz' ];
|
const subdomainGZP = [ 'gzip', 'gz' ];
|
||||||
@@ -1527,34 +1519,11 @@ async function serveM3U( res, req )
|
|||||||
const updatedContent = formattedContent
|
const updatedContent = formattedContent
|
||||||
.replace( /(https?:\/\/[^\s]*thetvapp[^\s]*)/g, ( fullUrl ) =>
|
.replace( /(https?:\/\/[^\s]*thetvapp[^\s]*)/g, ( fullUrl ) =>
|
||||||
{
|
{
|
||||||
Log.debug( `.m3u`, chalk.yellow( `[rewriter]` ), chalk.white( `⚙️` ),
|
|
||||||
chalk.blueBright( `<msg>` ), chalk.gray( `Rewriting url for keyword` ),
|
|
||||||
chalk.blueBright( `<keyword>` ), chalk.gray( `*thetvapp` ),
|
|
||||||
chalk.blueBright( `<from>` ), chalk.gray( `${ fullUrl }` ),
|
|
||||||
chalk.blueBright( `<to>` ), chalk.gray( `${ baseUrl }/channel?url=${ encodeURIComponent( fullUrl ) }` ) );
|
|
||||||
|
|
||||||
return `${ baseUrl }/channel?url=${ encodeURIComponent( fullUrl ) }`;
|
return `${ baseUrl }/channel?url=${ encodeURIComponent( fullUrl ) }`;
|
||||||
})
|
})
|
||||||
.replace( /(https?:\/\/[^\s]*tvpass[^\s]*)/g, ( fullUrl ) =>
|
.replace( /(https?:\/\/[^\s]*tvpass[^\s]*)/g, ( fullUrl ) =>
|
||||||
{
|
{
|
||||||
Log.debug( `.m3u`, chalk.yellow( `[rewriter]` ), chalk.white( `⚙️` ),
|
|
||||||
chalk.blueBright( `<msg>` ), chalk.gray( `Rewriting url for keyword` ),
|
|
||||||
chalk.blueBright( `<keyword>` ), chalk.gray( `*tvpass` ),
|
|
||||||
chalk.blueBright( `<from>` ), chalk.gray( `${ fullUrl }` ),
|
|
||||||
chalk.blueBright( `<to>` ), chalk.gray( `${ baseUrl }/channel?url=${ encodeURIComponent( fullUrl ) }` ) );
|
|
||||||
|
|
||||||
return `${ baseUrl }/channel?url=${ encodeURIComponent( fullUrl ) }`;
|
return `${ baseUrl }/channel?url=${ encodeURIComponent( fullUrl ) }`;
|
||||||
})
|
|
||||||
.replace( /(https?:\/\/[^\s]*fl2.moveonjoy[^\s]*)/g, ( fullUrl ) =>
|
|
||||||
{
|
|
||||||
const urlRewrite = fullUrl.replace( 'fl2.moveonjoy', 'fl6.moveonjoy' );
|
|
||||||
Log.debug( `.m3u`, chalk.yellow( `[rewriter]` ), chalk.white( `⚙️` ),
|
|
||||||
chalk.blueBright( `<msg>` ), chalk.gray( `Rewriting url for keyword` ),
|
|
||||||
chalk.blueBright( `<keyword>` ), chalk.gray( `*fl2.moveonjoy` ),
|
|
||||||
chalk.blueBright( `<from>` ), chalk.gray( `${ fullUrl }` ),
|
|
||||||
chalk.blueBright( `<to>` ), chalk.gray( `${ urlRewrite }` ) );
|
|
||||||
|
|
||||||
return `${ urlRewrite }`;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
res.writeHead( 200, {
|
res.writeHead( 200, {
|
||||||
@@ -1793,25 +1762,6 @@ async function initialize()
|
|||||||
const start = performance.now();
|
const start = performance.now();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
const validation = crons.validateCronExpression( envTaskCronSync );
|
|
||||||
if ( !validation.valid )
|
|
||||||
{
|
|
||||||
Log.error( `core`, chalk.yellow( `[schedule]` ), chalk.white( `❌` ),
|
|
||||||
chalk.redBright( `<msg>` ), chalk.gray( `Specified cron schedule is not valid` ),
|
|
||||||
chalk.redBright( `<schedule>` ), chalk.whiteBright.bgBlack( ` ${ envTaskCronSync } ` ) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
const cronNextRunDt = new Date( crons.sendAt( envTaskCronSync ) );
|
|
||||||
const cronNextRun = moment( cronNextRunDt ).format( 'MM-DD-YYYY h:mm A' );
|
|
||||||
|
|
||||||
Log.info( `core`, chalk.yellow( `[schedule]` ), chalk.white( `ℹ️` ),
|
|
||||||
chalk.blueBright( `<msg>` ), chalk.gray( `TVApp2 will refresh channel and guide data at` ),
|
|
||||||
chalk.blueBright( `<schedule>` ), chalk.whiteBright.gray( ` ${ envTaskCronSync } ` ),
|
|
||||||
chalk.blueBright( `<nextrun>` ), chalk.whiteBright.gray( ` ${ cronNextRun } ` ),
|
|
||||||
chalk.blueBright( `<nextrunIso>` ), chalk.whiteBright.gray( ` ${ cronNextRunDt } ` ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
Log.info( `core`, chalk.yellow( `[initiate]` ), chalk.white( `ℹ️` ),
|
Log.info( `core`, chalk.yellow( `[initiate]` ), chalk.white( `ℹ️` ),
|
||||||
chalk.blueBright( `<msg>` ), chalk.gray( `Starting TVApp2 container. Assigning bound IP to host network adapter` ),
|
chalk.blueBright( `<msg>` ), chalk.gray( `Starting TVApp2 container. Assigning bound IP to host network adapter` ),
|
||||||
chalk.blueBright( `<hostIp>` ), chalk.gray( `${ envWebIP }` ),
|
chalk.blueBright( `<hostIp>` ), chalk.gray( `${ envWebIP }` ),
|
||||||
@@ -2197,11 +2147,9 @@ const server = http.createServer( ( request, response ) =>
|
|||||||
appRelease: envAppRelease,
|
appRelease: envAppRelease,
|
||||||
appName: name,
|
appName: name,
|
||||||
appVersion: version,
|
appVersion: version,
|
||||||
appUrlGithub: repository.url.substr( 0, repository.url.lastIndexOf( '.' ) ),
|
appUrlGithub: repository.url,
|
||||||
appUrlDiscord: discord.url,
|
appUrlDiscord: discord.url,
|
||||||
appUrlDocs: docs.url,
|
appUrlDocs: docs.url
|
||||||
appGitHashShort: gitHash.substring( 0, 9 ),
|
|
||||||
appGitHashLong: gitHash
|
|
||||||
}, ( err, data ) =>
|
}, ( err, data ) =>
|
||||||
{
|
{
|
||||||
if ( !err )
|
if ( !err )
|
||||||
@@ -2343,9 +2291,7 @@ const server = http.createServer( ( request, response ) =>
|
|||||||
|
|
||||||
serviceCheck( 'TVPass.org', 'https://tvpass.org' );
|
serviceCheck( 'TVPass.org', 'https://tvpass.org' );
|
||||||
serviceCheck( 'TheTVApp.to', 'https://thetvapp.to' );
|
serviceCheck( 'TheTVApp.to', 'https://thetvapp.to' );
|
||||||
serviceCheck( 'MoveOnJoy.com', 'http://moveonjoy.com' );
|
serviceCheck( 'MoveOnJoy.com', 'https://moveonjoy.com' );
|
||||||
serviceCheck( 'Daddylive.dad', 'https://daddylive.dad' );
|
|
||||||
serviceCheck( 'Newkso.ru', 'https://zekonew.newkso.ru/zeko' );
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
start web server
|
start web server
|
||||||
@@ -2355,53 +2301,7 @@ const server = http.createServer( ( request, response ) =>
|
|||||||
{
|
{
|
||||||
Log.ok( `core`, chalk.yellow( `[initiate]` ), chalk.white( `✅` ),
|
Log.ok( `core`, chalk.yellow( `[initiate]` ), chalk.white( `✅` ),
|
||||||
chalk.blueBright( `<msg>` ), chalk.gray( `Server is now running on` ),
|
chalk.blueBright( `<msg>` ), chalk.gray( `Server is now running on` ),
|
||||||
chalk.blueBright( `<ipPublic>` ), chalk.whiteBright.bgBlack( ` ${ envWebIP }:${ envWebPort } ` ),
|
chalk.blueBright( `<address>` ), chalk.whiteBright.bgBlack( ` ${ envWebIP }:${ envWebPort } ` ) );
|
||||||
chalk.blueBright( `<ipDocker>` ), chalk.whiteBright.bgBlack( ` ${ envIpContainer }:${ envWebPort } ` ) );
|
|
||||||
|
|
||||||
Log.info( `core`, chalk.yellow( `[initiate]` ), chalk.white( `ℹ️` ),
|
|
||||||
chalk.blueBright( `<msg>` ), chalk.gray( `Running TVApp2 version` ),
|
|
||||||
chalk.blueBright( `<version>` ), chalk.gray( ` ${ version } ` ),
|
|
||||||
chalk.blueBright( `<release>` ), chalk.gray( ` ${ envAppRelease } ` ) );
|
|
||||||
});
|
});
|
||||||
})();
|
})();
|
||||||
|
|
||||||
/*
|
|
||||||
Crons > Next Sync
|
|
||||||
*/
|
|
||||||
|
|
||||||
cron.schedule( envTaskCronSync, async() =>
|
|
||||||
{
|
|
||||||
Log.ok( `task`, chalk.yellow( `[resync]` ), chalk.white( `✅` ),
|
|
||||||
chalk.blueBright( `<msg>` ), chalk.gray( `Ran cron / task to re-sync IPTV data` ),
|
|
||||||
chalk.blueBright( `<schedule>` ), chalk.whiteBright.bgBlack( ` ${ envTaskCronSync } ` ) );
|
|
||||||
|
|
||||||
await initialize();
|
|
||||||
});
|
|
||||||
|
|
||||||
/*
|
|
||||||
Crons > Announce Next Sync
|
|
||||||
should show every 30 minutes
|
|
||||||
*/
|
|
||||||
|
|
||||||
cron.schedule( '*/30 * * * *', async() =>
|
|
||||||
{
|
|
||||||
const validation = crons.validateCronExpression( envTaskCronSync );
|
|
||||||
if ( !validation.valid )
|
|
||||||
{
|
|
||||||
Log.error( `core`, chalk.yellow( `[schedule]` ), chalk.white( `❌` ),
|
|
||||||
chalk.redBright( `<msg>` ), chalk.gray( `Specified cron schedule is not valid. Re-write the cron so that it is properly formatted` ),
|
|
||||||
chalk.redBright( `<env>` ), chalk.gray( `TASK_CRON_SYNC` ),
|
|
||||||
chalk.redBright( `<schedule>` ), chalk.whiteBright.bgBlack( ` ${ envTaskCronSync } ` ) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
const cronNextRunDt = new Date( crons.sendAt( envTaskCronSync ) );
|
|
||||||
const cronNextRun = moment( cronNextRunDt ).format( 'MM-DD-YYYY h:mm A' );
|
|
||||||
|
|
||||||
Log.info( `core`, chalk.yellow( `[schedule]` ), chalk.white( `ℹ️` ),
|
|
||||||
chalk.blueBright( `<msg>` ), chalk.gray( `Next IPTV data refresh at` ),
|
|
||||||
chalk.blueBright( `<schedule>` ), chalk.whiteBright.gray( ` ${ envTaskCronSync } ` ),
|
|
||||||
chalk.blueBright( `<nextrun>` ), chalk.whiteBright.gray( ` ${ cronNextRun } ` ),
|
|
||||||
chalk.blueBright( `<nextrunIso>` ), chalk.whiteBright.gray( ` ${ cronNextRunDt } ` ) );
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|||||||
234
tvapp2/node_modules/.package-lock.json
generated
vendored
234
tvapp2/node_modules/.package-lock.json
generated
vendored
@@ -1,43 +1,26 @@
|
|||||||
{
|
{
|
||||||
"name": "tvapp2",
|
"name": "tvapp2",
|
||||||
"version": "1.5.2",
|
"version": "1.5.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"node_modules/@aetherinox/noxenv": {
|
"node_modules/@babel/runtime": {
|
||||||
"version": "1.1.1",
|
"version": "7.27.0",
|
||||||
"resolved": "https://registry.npmjs.org/@aetherinox/noxenv/-/noxenv-1.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz",
|
||||||
"integrity": "sha512-oSk7rEI4xzC4R1IykulJf+H2hZ6/OQIqX2ZA60IIU3yy91l5UgjkeHIDQguIdC2zVfjPeW5JqI14NMZyH4WMfw==",
|
"integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"cross-spawn": "^7.0.6",
|
"regenerator-runtime": "^0.14.0"
|
||||||
"uuid": "^11.1.0"
|
|
||||||
},
|
},
|
||||||
"bin": {
|
|
||||||
"noxenv": "src/bin/noxenv.js",
|
|
||||||
"noxenv-shell": "src/bin/noxenv-shell.js"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=20.9.0",
|
|
||||||
"npm": ">=10",
|
|
||||||
"yarn": ">=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@babel/runtime": {
|
|
||||||
"version": "7.27.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz",
|
|
||||||
"integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@eslint-community/eslint-utils": {
|
"node_modules/@eslint-community/eslint-utils": {
|
||||||
"version": "4.7.0",
|
"version": "4.6.1",
|
||||||
"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.6.1.tgz",
|
||||||
"integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
|
"integrity": "sha512-KTsJMmobmbrFLe3LDh0PC2FXpcSYJt/MLjlkh/9LEnmKYLSYmT/0EW9JWANjeoemiuZrmogti0tW5Ch+qNUYDw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -77,9 +60,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@eslint/config-array": {
|
"node_modules/@eslint/config-array": {
|
||||||
"version": "0.20.0",
|
"version": "0.19.2",
|
||||||
"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
|
"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
|
||||||
"integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
|
"integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -91,20 +74,10 @@
|
|||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@eslint/config-helpers": {
|
|
||||||
"version": "0.2.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
|
|
||||||
"integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@eslint/core": {
|
"node_modules/@eslint/core": {
|
||||||
"version": "0.14.0",
|
"version": "0.9.1",
|
||||||
"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
|
"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.1.tgz",
|
||||||
"integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
|
"integrity": "sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -139,16 +112,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@eslint/js": {
|
"node_modules/@eslint/js": {
|
||||||
"version": "9.28.0",
|
"version": "9.17.0",
|
||||||
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.28.0.tgz",
|
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz",
|
||||||
"integrity": "sha512-fnqSjGWd/CoIp4EXIxWVK/sHA6DOHN4+8Ix2cX5ycOY7LG0UY8nHCU5pIp2eaE1Mc7Qd8kHspYNzYXT2ojPLzg==",
|
"integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://eslint.org/donate"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@eslint/object-schema": {
|
"node_modules/@eslint/object-schema": {
|
||||||
@@ -162,19 +132,32 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@eslint/plugin-kit": {
|
"node_modules/@eslint/plugin-kit": {
|
||||||
"version": "0.3.1",
|
"version": "0.2.8",
|
||||||
"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
|
"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz",
|
||||||
"integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
|
"integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint/core": "^0.14.0",
|
"@eslint/core": "^0.13.0",
|
||||||
"levn": "^0.4.1"
|
"levn": "^0.4.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
|
||||||
|
"version": "0.13.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
|
||||||
|
"integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/json-schema": "^7.0.15"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@humanfs/core": {
|
"node_modules/@humanfs/core": {
|
||||||
"version": "0.19.1",
|
"version": "0.19.1",
|
||||||
"resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
|
"resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
|
||||||
@@ -228,9 +211,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@humanwhocodes/retry": {
|
"node_modules/@humanwhocodes/retry": {
|
||||||
"version": "0.4.3",
|
"version": "0.4.2",
|
||||||
"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
|
"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
|
||||||
"integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
|
"integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"engines": {
|
"engines": {
|
||||||
@@ -249,9 +232,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@stylistic/eslint-plugin-js": {
|
"node_modules/@stylistic/eslint-plugin-js": {
|
||||||
"version": "4.4.0",
|
"version": "4.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-4.4.0.tgz",
|
"resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-4.2.0.tgz",
|
||||||
"integrity": "sha512-UeeQNRF73zJXnNGGbvwgUgzS+vzVGQoRuQKR6RhQCRHQmaBaVHxDDQVmN9RPLCnRxVjO/v8cqq/yMDqC7DikSQ==",
|
"integrity": "sha512-MiJr6wvyzMYl/wElmj8Jns8zH7Q1w8XoVtm+WM6yDaTrfxryMyb8n0CMxt82fo42RoLIfxAEtM6tmQVxqhk0/A==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -286,12 +269,6 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@types/luxon": {
|
|
||||||
"version": "3.6.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.2.tgz",
|
|
||||||
"integrity": "sha512-R/BdP7OxEMc44l2Ex5lSXHoIXTB2JLNa3y2QISIbr58U/YcsffyQrYW//hZSdrfxrjRZj3GcUoxMPGdO8gSYuw==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/@types/uuid": {
|
"node_modules/@types/uuid": {
|
||||||
"version": "10.0.0",
|
"version": "10.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
|
||||||
@@ -837,19 +814,6 @@
|
|||||||
"node": ">=6.6.0"
|
"node": ">=6.6.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/cron": {
|
|
||||||
"version": "4.3.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/cron/-/cron-4.3.1.tgz",
|
|
||||||
"integrity": "sha512-7x7DoEOxV11t3OPWWMjj1xrL1PGkTV5RV+/54IJTZD7gStiaMploY43EkeBSkDZTLRbUwk+OISbQ0TR133oXyA==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@types/luxon": "~3.6.0",
|
|
||||||
"luxon": "~3.6.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18.x"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/cross-spawn": {
|
"node_modules/cross-spawn": {
|
||||||
"version": "7.0.6",
|
"version": "7.0.6",
|
||||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
|
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
|
||||||
@@ -920,9 +884,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/debug": {
|
"node_modules/debug": {
|
||||||
"version": "4.4.1",
|
"version": "4.4.0",
|
||||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
|
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
|
||||||
"integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
|
"integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ms": "^2.1.3"
|
"ms": "^2.1.3"
|
||||||
@@ -1101,9 +1065,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/es-abstract": {
|
"node_modules/es-abstract": {
|
||||||
"version": "1.23.10",
|
"version": "1.23.9",
|
||||||
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.10.tgz",
|
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
|
||||||
"integrity": "sha512-MtUbM072wlJNyeYAe0mhzrD+M6DIJa96CZAOBBrhDbgKnB4MApIKefcyAB1eOdYn8cUNZgvwBvEzdoAYsxgEIw==",
|
"integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -1111,18 +1075,18 @@
|
|||||||
"arraybuffer.prototype.slice": "^1.0.4",
|
"arraybuffer.prototype.slice": "^1.0.4",
|
||||||
"available-typed-arrays": "^1.0.7",
|
"available-typed-arrays": "^1.0.7",
|
||||||
"call-bind": "^1.0.8",
|
"call-bind": "^1.0.8",
|
||||||
"call-bound": "^1.0.4",
|
"call-bound": "^1.0.3",
|
||||||
"data-view-buffer": "^1.0.2",
|
"data-view-buffer": "^1.0.2",
|
||||||
"data-view-byte-length": "^1.0.2",
|
"data-view-byte-length": "^1.0.2",
|
||||||
"data-view-byte-offset": "^1.0.1",
|
"data-view-byte-offset": "^1.0.1",
|
||||||
"es-define-property": "^1.0.1",
|
"es-define-property": "^1.0.1",
|
||||||
"es-errors": "^1.3.0",
|
"es-errors": "^1.3.0",
|
||||||
"es-object-atoms": "^1.1.1",
|
"es-object-atoms": "^1.0.0",
|
||||||
"es-set-tostringtag": "^2.1.0",
|
"es-set-tostringtag": "^2.1.0",
|
||||||
"es-to-primitive": "^1.3.0",
|
"es-to-primitive": "^1.3.0",
|
||||||
"function.prototype.name": "^1.1.8",
|
"function.prototype.name": "^1.1.8",
|
||||||
"get-intrinsic": "^1.3.0",
|
"get-intrinsic": "^1.2.7",
|
||||||
"get-proto": "^1.0.1",
|
"get-proto": "^1.0.0",
|
||||||
"get-symbol-description": "^1.1.0",
|
"get-symbol-description": "^1.1.0",
|
||||||
"globalthis": "^1.0.4",
|
"globalthis": "^1.0.4",
|
||||||
"gopd": "^1.2.0",
|
"gopd": "^1.2.0",
|
||||||
@@ -1138,13 +1102,13 @@
|
|||||||
"is-shared-array-buffer": "^1.0.4",
|
"is-shared-array-buffer": "^1.0.4",
|
||||||
"is-string": "^1.1.1",
|
"is-string": "^1.1.1",
|
||||||
"is-typed-array": "^1.1.15",
|
"is-typed-array": "^1.1.15",
|
||||||
"is-weakref": "^1.1.1",
|
"is-weakref": "^1.1.0",
|
||||||
"math-intrinsics": "^1.1.0",
|
"math-intrinsics": "^1.1.0",
|
||||||
"object-inspect": "^1.13.4",
|
"object-inspect": "^1.13.3",
|
||||||
"object-keys": "^1.1.1",
|
"object-keys": "^1.1.1",
|
||||||
"object.assign": "^4.1.7",
|
"object.assign": "^4.1.7",
|
||||||
"own-keys": "^1.0.1",
|
"own-keys": "^1.0.1",
|
||||||
"regexp.prototype.flags": "^1.5.4",
|
"regexp.prototype.flags": "^1.5.3",
|
||||||
"safe-array-concat": "^1.1.3",
|
"safe-array-concat": "^1.1.3",
|
||||||
"safe-push-apply": "^1.0.0",
|
"safe-push-apply": "^1.0.0",
|
||||||
"safe-regex-test": "^1.1.0",
|
"safe-regex-test": "^1.1.0",
|
||||||
@@ -1157,7 +1121,7 @@
|
|||||||
"typed-array-byte-offset": "^1.0.4",
|
"typed-array-byte-offset": "^1.0.4",
|
||||||
"typed-array-length": "^1.0.7",
|
"typed-array-length": "^1.0.7",
|
||||||
"unbox-primitive": "^1.1.0",
|
"unbox-primitive": "^1.1.0",
|
||||||
"which-typed-array": "^1.1.19"
|
"which-typed-array": "^1.1.18"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 0.4"
|
"node": ">= 0.4"
|
||||||
@@ -1263,23 +1227,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/eslint": {
|
"node_modules/eslint": {
|
||||||
"version": "9.28.0",
|
"version": "9.17.0",
|
||||||
"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.28.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
|
||||||
"integrity": "sha512-ocgh41VhRlf9+fVpe7QKzwLj9c92fDiqOj8Y3Sd4/ZmVA4Btx4PlUYPq4pp9JDyupkf1upbEXecxL2mwNV7jPQ==",
|
"integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint-community/eslint-utils": "^4.2.0",
|
"@eslint-community/eslint-utils": "^4.2.0",
|
||||||
"@eslint-community/regexpp": "^4.12.1",
|
"@eslint-community/regexpp": "^4.12.1",
|
||||||
"@eslint/config-array": "^0.20.0",
|
"@eslint/config-array": "^0.19.0",
|
||||||
"@eslint/config-helpers": "^0.2.1",
|
"@eslint/core": "^0.9.0",
|
||||||
"@eslint/core": "^0.14.0",
|
"@eslint/eslintrc": "^3.2.0",
|
||||||
"@eslint/eslintrc": "^3.3.1",
|
"@eslint/js": "9.17.0",
|
||||||
"@eslint/js": "9.28.0",
|
"@eslint/plugin-kit": "^0.2.3",
|
||||||
"@eslint/plugin-kit": "^0.3.1",
|
|
||||||
"@humanfs/node": "^0.16.6",
|
"@humanfs/node": "^0.16.6",
|
||||||
"@humanwhocodes/module-importer": "^1.0.1",
|
"@humanwhocodes/module-importer": "^1.0.1",
|
||||||
"@humanwhocodes/retry": "^0.4.2",
|
"@humanwhocodes/retry": "^0.4.1",
|
||||||
"@types/estree": "^1.0.6",
|
"@types/estree": "^1.0.6",
|
||||||
"@types/json-schema": "^7.0.15",
|
"@types/json-schema": "^7.0.15",
|
||||||
"ajv": "^6.12.4",
|
"ajv": "^6.12.4",
|
||||||
@@ -1287,7 +1250,7 @@
|
|||||||
"cross-spawn": "^7.0.6",
|
"cross-spawn": "^7.0.6",
|
||||||
"debug": "^4.3.2",
|
"debug": "^4.3.2",
|
||||||
"escape-string-regexp": "^4.0.0",
|
"escape-string-regexp": "^4.0.0",
|
||||||
"eslint-scope": "^8.3.0",
|
"eslint-scope": "^8.2.0",
|
||||||
"eslint-visitor-keys": "^4.2.0",
|
"eslint-visitor-keys": "^4.2.0",
|
||||||
"espree": "^10.3.0",
|
"espree": "^10.3.0",
|
||||||
"esquery": "^1.5.0",
|
"esquery": "^1.5.0",
|
||||||
@@ -1340,9 +1303,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/eslint-compat-utils/node_modules/semver": {
|
"node_modules/eslint-compat-utils/node_modules/semver": {
|
||||||
"version": "7.7.2",
|
"version": "7.7.1",
|
||||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
|
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
|
||||||
"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
|
"integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -1482,13 +1445,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/eslint-plugin-n": {
|
"node_modules/eslint-plugin-n": {
|
||||||
"version": "17.18.0",
|
"version": "17.15.0",
|
||||||
"resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.18.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.15.0.tgz",
|
||||||
"integrity": "sha512-hvZ/HusueqTJ7VDLoCpjN0hx4N4+jHIWTXD4TMLHy9F23XkDagR9v+xQWRWR57yY55GPF8NnD4ox9iGTxirY8A==",
|
"integrity": "sha512-xF3zJkOfLlFOm5TvmqmsnA9/fO+/z2pYs0dkuKXKN/ymS6UB1yEcaoIkqxLKQ9Dw/WmLX/Tdh6/5ZS5azVixFQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint-community/eslint-utils": "^4.5.0",
|
"@eslint-community/eslint-utils": "^4.4.1",
|
||||||
"enhanced-resolve": "^5.17.1",
|
"enhanced-resolve": "^5.17.1",
|
||||||
"eslint-plugin-es-x": "^7.8.0",
|
"eslint-plugin-es-x": "^7.8.0",
|
||||||
"get-tsconfig": "^4.8.1",
|
"get-tsconfig": "^4.8.1",
|
||||||
@@ -1547,9 +1510,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/eslint-plugin-n/node_modules/semver": {
|
"node_modules/eslint-plugin-n/node_modules/semver": {
|
||||||
"version": "7.7.2",
|
"version": "7.7.1",
|
||||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
|
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
|
||||||
"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
|
"integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -2053,9 +2016,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/get-tsconfig": {
|
"node_modules/get-tsconfig": {
|
||||||
"version": "4.10.1",
|
"version": "4.10.0",
|
||||||
"resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz",
|
"resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.0.tgz",
|
||||||
"integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==",
|
"integrity": "sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -2924,15 +2887,6 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/luxon": {
|
|
||||||
"version": "3.6.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz",
|
|
||||||
"integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/math-intrinsics": {
|
"node_modules/math-intrinsics": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
|
||||||
@@ -3054,15 +3008,6 @@
|
|||||||
"node": ">= 0.6"
|
"node": ">= 0.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/node-cron": {
|
|
||||||
"version": "4.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/node-cron/-/node-cron-4.1.0.tgz",
|
|
||||||
"integrity": "sha512-OS+3ORu+h03/haS6Di8Qr7CrVs4YaKZZOynZwQpyPZDnR3tqRbwJmuP2gVR16JfhLgyNlloAV1VTrrWlRogCFA==",
|
|
||||||
"license": "ISC",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=6.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/node-fetch": {
|
"node_modules/node-fetch": {
|
||||||
"version": "2.7.0",
|
"version": "2.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
|
||||||
@@ -3391,6 +3336,8 @@
|
|||||||
},
|
},
|
||||||
"node_modules/playwright": {
|
"node_modules/playwright": {
|
||||||
"version": "1.52.0",
|
"version": "1.52.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.52.0.tgz",
|
||||||
|
"integrity": "sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"playwright-core": "1.52.0"
|
"playwright-core": "1.52.0"
|
||||||
@@ -3407,6 +3354,8 @@
|
|||||||
},
|
},
|
||||||
"node_modules/playwright-core": {
|
"node_modules/playwright-core": {
|
||||||
"version": "1.52.0",
|
"version": "1.52.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz",
|
||||||
|
"integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"bin": {
|
"bin": {
|
||||||
"playwright-core": "cli.js"
|
"playwright-core": "cli.js"
|
||||||
@@ -3537,6 +3486,13 @@
|
|||||||
"url": "https://github.com/sponsors/ljharb"
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/regenerator-runtime": {
|
||||||
|
"version": "0.14.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
|
||||||
|
"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/regexp.prototype.flags": {
|
"node_modules/regexp.prototype.flags": {
|
||||||
"version": "1.5.4",
|
"version": "1.5.4",
|
||||||
"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
|
||||||
@@ -4106,9 +4062,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/tapable": {
|
"node_modules/tapable": {
|
||||||
"version": "2.2.2",
|
"version": "2.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz",
|
"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
|
||||||
"integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==",
|
"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
@@ -4328,9 +4284,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/user-agents": {
|
"node_modules/user-agents": {
|
||||||
"version": "1.1.557",
|
"version": "1.1.529",
|
||||||
"resolved": "https://registry.npmjs.org/user-agents/-/user-agents-1.1.557.tgz",
|
"resolved": "https://registry.npmjs.org/user-agents/-/user-agents-1.1.529.tgz",
|
||||||
"integrity": "sha512-7WD00n8KYmGlQEVgV4qRvH7NkcRt9KgEd7Sc95nRPcHCK8iOa5Ke85psgQKI6R+iWmBuuQKNKl2e46m6EvUTfA==",
|
"integrity": "sha512-8/ha9jnpBjUhC7+kpdAimo+mQVUMFhTJEkGVRSUsxK6YWuVZ6il+6ErVMjWpfX7q1Ft0m/4+XpPJhGuqZesFTQ==",
|
||||||
"license": "BSD-2-Clause",
|
"license": "BSD-2-Clause",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"lodash.clonedeep": "^4.5.0"
|
"lodash.clonedeep": "^4.5.0"
|
||||||
|
|||||||
2
tvapp2/node_modules/user-agents/dist/index.js
generated
vendored
2
tvapp2/node_modules/user-agents/dist/index.js
generated
vendored
File diff suppressed because one or more lines are too long
2
tvapp2/node_modules/user-agents/dist/index.js.map
generated
vendored
2
tvapp2/node_modules/user-agents/dist/index.js.map
generated
vendored
File diff suppressed because one or more lines are too long
2
tvapp2/node_modules/user-agents/package.json
generated
vendored
2
tvapp2/node_modules/user-agents/package.json
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "user-agents",
|
"name": "user-agents",
|
||||||
"version": "1.1.557",
|
"version": "1.1.529",
|
||||||
"description": "A JavaScript library for generating random user agents. ",
|
"description": "A JavaScript library for generating random user agents. ",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"repository": "git@github.com:intoli/user-agents.git",
|
"repository": "git@github.com:intoli/user-agents.git",
|
||||||
|
|||||||
BIN
tvapp2/node_modules/user-agents/src/user-agents.json.gz
generated
vendored
BIN
tvapp2/node_modules/user-agents/src/user-agents.json.gz
generated
vendored
Binary file not shown.
223
tvapp2/package-lock.json
generated
223
tvapp2/package-lock.json
generated
@@ -1,33 +1,30 @@
|
|||||||
{
|
{
|
||||||
"name": "tvapp2",
|
"name": "tvapp2",
|
||||||
"version": "1.5.2",
|
"version": "1.5.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "tvapp2",
|
"name": "tvapp2",
|
||||||
"version": "1.5.2",
|
"version": "1.5.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"chalk": "^5.4.1",
|
"chalk": "^5.3.0",
|
||||||
"cron": "^4.3.1",
|
|
||||||
"ejs": "^3.1.10",
|
"ejs": "^3.1.10",
|
||||||
"express": "5.1.0",
|
"express": "5.1.0",
|
||||||
"moment": "2.30.1",
|
"moment": "2.30.1",
|
||||||
"node-cron": "^4.1.0",
|
|
||||||
"playwright": "^1.52.0",
|
"playwright": "^1.52.0",
|
||||||
"user-agents": "^1.1.557"
|
"user-agents": "^1.1.529"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@aetherinox/noxenv": "^1.1.1",
|
"@stylistic/eslint-plugin-js": "^4.2.0",
|
||||||
"@stylistic/eslint-plugin-js": "^4.4.0",
|
|
||||||
"@types/uuid": "^10.0.0",
|
"@types/uuid": "^10.0.0",
|
||||||
"all-contributors-cli": "^6.26.1",
|
"all-contributors-cli": "^6.26.1",
|
||||||
"env-cmd": "^10.1.0",
|
"env-cmd": "^10.1.0",
|
||||||
"eslint": "9.28.0",
|
"eslint": "9.17.0",
|
||||||
"eslint-plugin-chai-friendly": "^1.0.1",
|
"eslint-plugin-chai-friendly": "^1.0.1",
|
||||||
"eslint-plugin-import": "2.31.0",
|
"eslint-plugin-import": "2.31.0",
|
||||||
"eslint-plugin-n": "17.18.0",
|
"eslint-plugin-n": "17.15.0",
|
||||||
"eslint-plugin-promise": "7.2.1",
|
"eslint-plugin-promise": "7.2.1",
|
||||||
"uuid": "^11.1.0"
|
"uuid": "^11.1.0"
|
||||||
},
|
},
|
||||||
@@ -35,26 +32,6 @@
|
|||||||
"node": ">=20"
|
"node": ">=20"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@aetherinox/noxenv": {
|
|
||||||
"version": "1.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@aetherinox/noxenv/-/noxenv-1.1.1.tgz",
|
|
||||||
"integrity": "sha512-oSk7rEI4xzC4R1IykulJf+H2hZ6/OQIqX2ZA60IIU3yy91l5UgjkeHIDQguIdC2zVfjPeW5JqI14NMZyH4WMfw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"cross-spawn": "^7.0.6",
|
|
||||||
"uuid": "^11.1.0"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"noxenv": "src/bin/noxenv.js",
|
|
||||||
"noxenv-shell": "src/bin/noxenv-shell.js"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=20.9.0",
|
|
||||||
"npm": ">=10",
|
|
||||||
"yarn": ">=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@babel/runtime": {
|
"node_modules/@babel/runtime": {
|
||||||
"version": "7.27.1",
|
"version": "7.27.1",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz",
|
||||||
@@ -108,9 +85,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@eslint/config-array": {
|
"node_modules/@eslint/config-array": {
|
||||||
"version": "0.20.0",
|
"version": "0.19.2",
|
||||||
"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
|
"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
|
||||||
"integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
|
"integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -122,20 +99,10 @@
|
|||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@eslint/config-helpers": {
|
|
||||||
"version": "0.2.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
|
|
||||||
"integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"engines": {
|
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@eslint/core": {
|
"node_modules/@eslint/core": {
|
||||||
"version": "0.14.0",
|
"version": "0.9.1",
|
||||||
"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
|
"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.1.tgz",
|
||||||
"integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
|
"integrity": "sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -170,16 +137,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@eslint/js": {
|
"node_modules/@eslint/js": {
|
||||||
"version": "9.28.0",
|
"version": "9.17.0",
|
||||||
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.28.0.tgz",
|
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz",
|
||||||
"integrity": "sha512-fnqSjGWd/CoIp4EXIxWVK/sHA6DOHN4+8Ix2cX5ycOY7LG0UY8nHCU5pIp2eaE1Mc7Qd8kHspYNzYXT2ojPLzg==",
|
"integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://eslint.org/donate"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@eslint/object-schema": {
|
"node_modules/@eslint/object-schema": {
|
||||||
@@ -193,19 +157,32 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@eslint/plugin-kit": {
|
"node_modules/@eslint/plugin-kit": {
|
||||||
"version": "0.3.1",
|
"version": "0.2.8",
|
||||||
"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
|
"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz",
|
||||||
"integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
|
"integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint/core": "^0.14.0",
|
"@eslint/core": "^0.13.0",
|
||||||
"levn": "^0.4.1"
|
"levn": "^0.4.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
|
||||||
|
"version": "0.13.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
|
||||||
|
"integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/json-schema": "^7.0.15"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@humanfs/core": {
|
"node_modules/@humanfs/core": {
|
||||||
"version": "0.19.1",
|
"version": "0.19.1",
|
||||||
"resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
|
"resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
|
||||||
@@ -259,9 +236,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@humanwhocodes/retry": {
|
"node_modules/@humanwhocodes/retry": {
|
||||||
"version": "0.4.3",
|
"version": "0.4.2",
|
||||||
"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
|
"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
|
||||||
"integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
|
"integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"engines": {
|
"engines": {
|
||||||
@@ -280,9 +257,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@stylistic/eslint-plugin-js": {
|
"node_modules/@stylistic/eslint-plugin-js": {
|
||||||
"version": "4.4.0",
|
"version": "4.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-4.4.0.tgz",
|
"resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-4.2.0.tgz",
|
||||||
"integrity": "sha512-UeeQNRF73zJXnNGGbvwgUgzS+vzVGQoRuQKR6RhQCRHQmaBaVHxDDQVmN9RPLCnRxVjO/v8cqq/yMDqC7DikSQ==",
|
"integrity": "sha512-MiJr6wvyzMYl/wElmj8Jns8zH7Q1w8XoVtm+WM6yDaTrfxryMyb8n0CMxt82fo42RoLIfxAEtM6tmQVxqhk0/A==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -317,12 +294,6 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@types/luxon": {
|
|
||||||
"version": "3.6.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.2.tgz",
|
|
||||||
"integrity": "sha512-R/BdP7OxEMc44l2Ex5lSXHoIXTB2JLNa3y2QISIbr58U/YcsffyQrYW//hZSdrfxrjRZj3GcUoxMPGdO8gSYuw==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/@types/uuid": {
|
"node_modules/@types/uuid": {
|
||||||
"version": "10.0.0",
|
"version": "10.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
|
||||||
@@ -868,19 +839,6 @@
|
|||||||
"node": ">=6.6.0"
|
"node": ">=6.6.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/cron": {
|
|
||||||
"version": "4.3.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/cron/-/cron-4.3.1.tgz",
|
|
||||||
"integrity": "sha512-7x7DoEOxV11t3OPWWMjj1xrL1PGkTV5RV+/54IJTZD7gStiaMploY43EkeBSkDZTLRbUwk+OISbQ0TR133oXyA==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@types/luxon": "~3.6.0",
|
|
||||||
"luxon": "~3.6.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18.x"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/cross-spawn": {
|
"node_modules/cross-spawn": {
|
||||||
"version": "7.0.6",
|
"version": "7.0.6",
|
||||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
|
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
|
||||||
@@ -951,9 +909,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/debug": {
|
"node_modules/debug": {
|
||||||
"version": "4.4.1",
|
"version": "4.4.0",
|
||||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
|
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
|
||||||
"integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
|
"integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ms": "^2.1.3"
|
"ms": "^2.1.3"
|
||||||
@@ -1132,9 +1090,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/es-abstract": {
|
"node_modules/es-abstract": {
|
||||||
"version": "1.23.10",
|
"version": "1.23.9",
|
||||||
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.10.tgz",
|
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
|
||||||
"integrity": "sha512-MtUbM072wlJNyeYAe0mhzrD+M6DIJa96CZAOBBrhDbgKnB4MApIKefcyAB1eOdYn8cUNZgvwBvEzdoAYsxgEIw==",
|
"integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -1142,18 +1100,18 @@
|
|||||||
"arraybuffer.prototype.slice": "^1.0.4",
|
"arraybuffer.prototype.slice": "^1.0.4",
|
||||||
"available-typed-arrays": "^1.0.7",
|
"available-typed-arrays": "^1.0.7",
|
||||||
"call-bind": "^1.0.8",
|
"call-bind": "^1.0.8",
|
||||||
"call-bound": "^1.0.4",
|
"call-bound": "^1.0.3",
|
||||||
"data-view-buffer": "^1.0.2",
|
"data-view-buffer": "^1.0.2",
|
||||||
"data-view-byte-length": "^1.0.2",
|
"data-view-byte-length": "^1.0.2",
|
||||||
"data-view-byte-offset": "^1.0.1",
|
"data-view-byte-offset": "^1.0.1",
|
||||||
"es-define-property": "^1.0.1",
|
"es-define-property": "^1.0.1",
|
||||||
"es-errors": "^1.3.0",
|
"es-errors": "^1.3.0",
|
||||||
"es-object-atoms": "^1.1.1",
|
"es-object-atoms": "^1.0.0",
|
||||||
"es-set-tostringtag": "^2.1.0",
|
"es-set-tostringtag": "^2.1.0",
|
||||||
"es-to-primitive": "^1.3.0",
|
"es-to-primitive": "^1.3.0",
|
||||||
"function.prototype.name": "^1.1.8",
|
"function.prototype.name": "^1.1.8",
|
||||||
"get-intrinsic": "^1.3.0",
|
"get-intrinsic": "^1.2.7",
|
||||||
"get-proto": "^1.0.1",
|
"get-proto": "^1.0.0",
|
||||||
"get-symbol-description": "^1.1.0",
|
"get-symbol-description": "^1.1.0",
|
||||||
"globalthis": "^1.0.4",
|
"globalthis": "^1.0.4",
|
||||||
"gopd": "^1.2.0",
|
"gopd": "^1.2.0",
|
||||||
@@ -1169,13 +1127,13 @@
|
|||||||
"is-shared-array-buffer": "^1.0.4",
|
"is-shared-array-buffer": "^1.0.4",
|
||||||
"is-string": "^1.1.1",
|
"is-string": "^1.1.1",
|
||||||
"is-typed-array": "^1.1.15",
|
"is-typed-array": "^1.1.15",
|
||||||
"is-weakref": "^1.1.1",
|
"is-weakref": "^1.1.0",
|
||||||
"math-intrinsics": "^1.1.0",
|
"math-intrinsics": "^1.1.0",
|
||||||
"object-inspect": "^1.13.4",
|
"object-inspect": "^1.13.3",
|
||||||
"object-keys": "^1.1.1",
|
"object-keys": "^1.1.1",
|
||||||
"object.assign": "^4.1.7",
|
"object.assign": "^4.1.7",
|
||||||
"own-keys": "^1.0.1",
|
"own-keys": "^1.0.1",
|
||||||
"regexp.prototype.flags": "^1.5.4",
|
"regexp.prototype.flags": "^1.5.3",
|
||||||
"safe-array-concat": "^1.1.3",
|
"safe-array-concat": "^1.1.3",
|
||||||
"safe-push-apply": "^1.0.0",
|
"safe-push-apply": "^1.0.0",
|
||||||
"safe-regex-test": "^1.1.0",
|
"safe-regex-test": "^1.1.0",
|
||||||
@@ -1188,7 +1146,7 @@
|
|||||||
"typed-array-byte-offset": "^1.0.4",
|
"typed-array-byte-offset": "^1.0.4",
|
||||||
"typed-array-length": "^1.0.7",
|
"typed-array-length": "^1.0.7",
|
||||||
"unbox-primitive": "^1.1.0",
|
"unbox-primitive": "^1.1.0",
|
||||||
"which-typed-array": "^1.1.19"
|
"which-typed-array": "^1.1.18"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 0.4"
|
"node": ">= 0.4"
|
||||||
@@ -1294,23 +1252,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/eslint": {
|
"node_modules/eslint": {
|
||||||
"version": "9.28.0",
|
"version": "9.17.0",
|
||||||
"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.28.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
|
||||||
"integrity": "sha512-ocgh41VhRlf9+fVpe7QKzwLj9c92fDiqOj8Y3Sd4/ZmVA4Btx4PlUYPq4pp9JDyupkf1upbEXecxL2mwNV7jPQ==",
|
"integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint-community/eslint-utils": "^4.2.0",
|
"@eslint-community/eslint-utils": "^4.2.0",
|
||||||
"@eslint-community/regexpp": "^4.12.1",
|
"@eslint-community/regexpp": "^4.12.1",
|
||||||
"@eslint/config-array": "^0.20.0",
|
"@eslint/config-array": "^0.19.0",
|
||||||
"@eslint/config-helpers": "^0.2.1",
|
"@eslint/core": "^0.9.0",
|
||||||
"@eslint/core": "^0.14.0",
|
"@eslint/eslintrc": "^3.2.0",
|
||||||
"@eslint/eslintrc": "^3.3.1",
|
"@eslint/js": "9.17.0",
|
||||||
"@eslint/js": "9.28.0",
|
"@eslint/plugin-kit": "^0.2.3",
|
||||||
"@eslint/plugin-kit": "^0.3.1",
|
|
||||||
"@humanfs/node": "^0.16.6",
|
"@humanfs/node": "^0.16.6",
|
||||||
"@humanwhocodes/module-importer": "^1.0.1",
|
"@humanwhocodes/module-importer": "^1.0.1",
|
||||||
"@humanwhocodes/retry": "^0.4.2",
|
"@humanwhocodes/retry": "^0.4.1",
|
||||||
"@types/estree": "^1.0.6",
|
"@types/estree": "^1.0.6",
|
||||||
"@types/json-schema": "^7.0.15",
|
"@types/json-schema": "^7.0.15",
|
||||||
"ajv": "^6.12.4",
|
"ajv": "^6.12.4",
|
||||||
@@ -1318,7 +1275,7 @@
|
|||||||
"cross-spawn": "^7.0.6",
|
"cross-spawn": "^7.0.6",
|
||||||
"debug": "^4.3.2",
|
"debug": "^4.3.2",
|
||||||
"escape-string-regexp": "^4.0.0",
|
"escape-string-regexp": "^4.0.0",
|
||||||
"eslint-scope": "^8.3.0",
|
"eslint-scope": "^8.2.0",
|
||||||
"eslint-visitor-keys": "^4.2.0",
|
"eslint-visitor-keys": "^4.2.0",
|
||||||
"espree": "^10.3.0",
|
"espree": "^10.3.0",
|
||||||
"esquery": "^1.5.0",
|
"esquery": "^1.5.0",
|
||||||
@@ -1371,9 +1328,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/eslint-compat-utils/node_modules/semver": {
|
"node_modules/eslint-compat-utils/node_modules/semver": {
|
||||||
"version": "7.7.2",
|
"version": "7.7.1",
|
||||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
|
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
|
||||||
"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
|
"integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -1513,13 +1470,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/eslint-plugin-n": {
|
"node_modules/eslint-plugin-n": {
|
||||||
"version": "17.18.0",
|
"version": "17.15.0",
|
||||||
"resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.18.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.15.0.tgz",
|
||||||
"integrity": "sha512-hvZ/HusueqTJ7VDLoCpjN0hx4N4+jHIWTXD4TMLHy9F23XkDagR9v+xQWRWR57yY55GPF8NnD4ox9iGTxirY8A==",
|
"integrity": "sha512-xF3zJkOfLlFOm5TvmqmsnA9/fO+/z2pYs0dkuKXKN/ymS6UB1yEcaoIkqxLKQ9Dw/WmLX/Tdh6/5ZS5azVixFQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint-community/eslint-utils": "^4.5.0",
|
"@eslint-community/eslint-utils": "^4.4.1",
|
||||||
"enhanced-resolve": "^5.17.1",
|
"enhanced-resolve": "^5.17.1",
|
||||||
"eslint-plugin-es-x": "^7.8.0",
|
"eslint-plugin-es-x": "^7.8.0",
|
||||||
"get-tsconfig": "^4.8.1",
|
"get-tsconfig": "^4.8.1",
|
||||||
@@ -1578,9 +1535,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/eslint-plugin-n/node_modules/semver": {
|
"node_modules/eslint-plugin-n/node_modules/semver": {
|
||||||
"version": "7.7.2",
|
"version": "7.7.1",
|
||||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
|
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
|
||||||
"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
|
"integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -2084,9 +2041,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/get-tsconfig": {
|
"node_modules/get-tsconfig": {
|
||||||
"version": "4.10.1",
|
"version": "4.10.0",
|
||||||
"resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz",
|
"resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.0.tgz",
|
||||||
"integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==",
|
"integrity": "sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -2955,15 +2912,6 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/luxon": {
|
|
||||||
"version": "3.6.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz",
|
|
||||||
"integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/math-intrinsics": {
|
"node_modules/math-intrinsics": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
|
||||||
@@ -3085,15 +3033,6 @@
|
|||||||
"node": ">= 0.6"
|
"node": ">= 0.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/node-cron": {
|
|
||||||
"version": "4.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/node-cron/-/node-cron-4.1.0.tgz",
|
|
||||||
"integrity": "sha512-OS+3ORu+h03/haS6Di8Qr7CrVs4YaKZZOynZwQpyPZDnR3tqRbwJmuP2gVR16JfhLgyNlloAV1VTrrWlRogCFA==",
|
|
||||||
"license": "ISC",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=6.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/node-fetch": {
|
"node_modules/node-fetch": {
|
||||||
"version": "2.7.0",
|
"version": "2.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
|
||||||
@@ -4137,9 +4076,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/tapable": {
|
"node_modules/tapable": {
|
||||||
"version": "2.2.2",
|
"version": "2.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz",
|
"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
|
||||||
"integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==",
|
"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
@@ -4359,9 +4298,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/user-agents": {
|
"node_modules/user-agents": {
|
||||||
"version": "1.1.557",
|
"version": "1.1.529",
|
||||||
"resolved": "https://registry.npmjs.org/user-agents/-/user-agents-1.1.557.tgz",
|
|
||||||
"integrity": "sha512-7WD00n8KYmGlQEVgV4qRvH7NkcRt9KgEd7Sc95nRPcHCK8iOa5Ke85psgQKI6R+iWmBuuQKNKl2e46m6EvUTfA==",
|
|
||||||
"license": "BSD-2-Clause",
|
"license": "BSD-2-Clause",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"lodash.clonedeep": "^4.5.0"
|
"lodash.clonedeep": "^4.5.0"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "tvapp2",
|
"name": "tvapp2",
|
||||||
"version": "1.5.2",
|
"version": "1.5.0",
|
||||||
"description": "This package allows you to generate M3U playlists and EPG guides from various online IPTV services.",
|
"description": "This package allows you to generate M3U playlists and EPG guides from various online IPTV services.",
|
||||||
"author": "BinaryNinja",
|
"author": "BinaryNinja",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@@ -72,27 +72,24 @@
|
|||||||
"iptv"
|
"iptv"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"cron": "^4.3.1",
|
|
||||||
"node-cron": "^4.1.0",
|
|
||||||
"playwright": "^1.52.0",
|
"playwright": "^1.52.0",
|
||||||
"user-agents": "^1.1.557",
|
"user-agents": "^1.1.529",
|
||||||
"chalk": "^5.4.1",
|
"chalk": "^5.3.0",
|
||||||
"ejs": "^3.1.10",
|
"ejs": "^3.1.10",
|
||||||
"moment": "2.30.1",
|
"moment": "2.30.1",
|
||||||
"express": "5.1.0"
|
"express": "5.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@aetherinox/noxenv": "^1.1.1",
|
|
||||||
"@types/uuid": "^10.0.0",
|
"@types/uuid": "^10.0.0",
|
||||||
"all-contributors-cli": "^6.26.1",
|
"all-contributors-cli": "^6.26.1",
|
||||||
"uuid": "^11.1.0",
|
"uuid": "^11.1.0",
|
||||||
"env-cmd": "^10.1.0",
|
"env-cmd": "^10.1.0",
|
||||||
"eslint": "9.28.0",
|
"eslint": "9.17.0",
|
||||||
"eslint-plugin-chai-friendly": "^1.0.1",
|
"eslint-plugin-chai-friendly": "^1.0.1",
|
||||||
"eslint-plugin-import": "2.31.0",
|
"eslint-plugin-import": "2.31.0",
|
||||||
"eslint-plugin-n": "17.18.0",
|
"eslint-plugin-n": "17.15.0",
|
||||||
"eslint-plugin-promise": "7.2.1",
|
"eslint-plugin-promise": "7.2.1",
|
||||||
"@stylistic/eslint-plugin-js": "^4.4.0"
|
"@stylistic/eslint-plugin-js": "^4.2.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=20"
|
"node": ">=20"
|
||||||
|
|||||||
@@ -18,14 +18,14 @@
|
|||||||
<nav class="navbar sticky-top container">
|
<nav class="navbar sticky-top container">
|
||||||
<div class="navbar-brand">
|
<div class="navbar-brand">
|
||||||
<i data-bs-toggle="tooltip" title="v<%= appVersion %>" class="logo fa-sharp-duotone fa-regular fa-tv" style="--fa-primary-color: rgb(255, 255, 255); --fa-secondary-color: rgb(255, 255, 255);" aria-hidden="true"></i>
|
<i data-bs-toggle="tooltip" title="v<%= appVersion %>" class="logo fa-sharp-duotone fa-regular fa-tv" style="--fa-primary-color: rgb(255, 255, 255); --fa-secondary-color: rgb(255, 255, 255);" aria-hidden="true"></i>
|
||||||
<a target="_blank" data-bs-toggle="tooltip" title="View Github Repository" class="header-name" href="<%= appUrlGithub %>">TVApp2 for Docker</a>
|
<a class="header-name" href="<%= appUrlGithub %>">TVApp2 for Docker</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="navbar-social">
|
<div class="navbar-social">
|
||||||
<a href=""><i id="action-health" data-bs-toggle="tooltip" title="Health" class="heart logo health fa-duotone fa-solid fa-heart" style="--fa-primary-color: rgb(255, 255, 255); --fa-secondary-color: rgb(255, 255, 255);" aria-hidden="true"></i></a>
|
<a href=""><i id="action-health" data-bs-toggle="tooltip" title="Health" class="heart logo health fa-duotone fa-solid fa-heart" style="--fa-primary-color: rgb(255, 255, 255); --fa-secondary-color: rgb(255, 255, 255);" aria-hidden="true"></i></a>
|
||||||
<a href="javascript:runResync();"><i id="action-resync" data-bs-toggle="tooltip" title="Resync" class="restart fa-solid fa-rotate" style="--fa-primary-color: rgb(255, 255, 255); --fa-secondary-color: rgb(255, 255, 255);" aria-hidden="true"></i></a>
|
<a href="javascript:runResync();"><i id="action-resync" data-bs-toggle="tooltip" title="Resync" class="restart fa-solid fa-rotate" style="--fa-primary-color: rgb(255, 255, 255); --fa-secondary-color: rgb(255, 255, 255);" aria-hidden="true"></i></a>
|
||||||
<a target="_blank" href="<%= appUrlDocs %>"><i data-bs-toggle="tooltip" title="Documentation" class="logo fa-duotone fa-solid fa-book-open-cover" style="--fa-primary-color: rgb(255, 255, 255); --fa-secondary-color: rgb(255, 255, 255);" aria-hidden="true"></i></a>
|
<a href="<%= appUrlDocs %>"><i data-bs-toggle="tooltip" title="Documentation" class="logo fa-duotone fa-solid fa-book-open-cover" style="--fa-primary-color: rgb(255, 255, 255); --fa-secondary-color: rgb(255, 255, 255);" aria-hidden="true"></i></a>
|
||||||
<a target="_blank" href="<%= appUrlGithub %>"><i data-bs-toggle="tooltip" title="Github" class="logo fa-logos fa-github" style="--fa-primary-color: rgb(255, 255, 255); --fa-secondary-color: rgb(255, 255, 255);" aria-hidden="true"></i></a>
|
<a href="<%= appUrlGithub %>"><i data-bs-toggle="tooltip" title="Github" class="logo fa-logos fa-github" style="--fa-primary-color: rgb(255, 255, 255); --fa-secondary-color: rgb(255, 255, 255);" aria-hidden="true"></i></a>
|
||||||
<a target="_blank" href="<%= appUrlDiscord %>"><i data-bs-toggle="tooltip" title="Discord" class="logo fa-logos fa-discord" style="--fa-primary-color: rgb(255, 255, 255); --fa-secondary-color: rgb(255, 255, 255);" aria-hidden="true"></i></a>
|
<a href="<%= appUrlDiscord %>"><i data-bs-toggle="tooltip" title="Discord" class="logo fa-logos fa-discord" style="--fa-primary-color: rgb(255, 255, 255); --fa-secondary-color: rgb(255, 255, 255);" aria-hidden="true"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
@@ -124,7 +124,7 @@
|
|||||||
<div class="footer-inner">
|
<div class="footer-inner">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="col text-center text-muted text-small text-nowrap">
|
<div class="col text-center text-muted text-small text-nowrap">
|
||||||
<small>Developed by BinaryNinja - <a data-bs-toggle="tooltip" title="v<%= appVersion %> <%= appRelease %> (<%= appGitHashShort %>)" href="<%= appUrlGithub %>"><%= appName %> (<%= appRelease %>)</a> v<%= appVersion %> <a target="_blank" data-bs-toggle="tooltip" title="View Github commit" href="<%= appUrlGithub %>/commit/<%= appGitHashLong %>"><%= appGitHashShort %></a></small><br />
|
<small>Developed by BinaryNinja - <a data-bs-toggle="tooltip" title="<%= appRelease %> build" href="<%= appUrlGithub %>"><%= appName %> (<%= appRelease %>)</a> - v<%= appVersion %></small><br />
|
||||||
<small>This utility is for educational purposes only</small>
|
<small>This utility is for educational purposes only</small>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user