diff --git a/Dockerfile b/Dockerfile index 5a8b31a7..c2833b52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ # @repo https://github.com/iFlip721/tvapp2 # https://github.com/aetherinox/tvapp2 # https://github.com/aetherinox/docker-base-alpine -# https://git.binaryninja.net/pub_projects/tvapp2 +# https://git.binaryninja.net/BinaryNinja/tvapp2 # # you can build your own image by running # amd64 docker build --build-arg VERSION=1.0.0 --build-arg BUILDDATE=20250218 -t tvapp2:latest -t tvapp2:1.0.0 -t tvapp2:1.0.0-amd64 -f Dockerfile . @@ -39,11 +39,11 @@ LABEL org.opencontainers.image.authors="aetherinox, iFlip721" LABEL org.opencontainers.image.vendor="BinaryNinja" LABEL org.opencontainers.image.title="TVApp2" LABEL org.opencontainers.image.description="Automatic m3u and xml guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client." -LABEL org.opencontainers.image.source="https://git.binaryninja.net/pub_projects/tvapp2" +LABEL org.opencontainers.image.source="https://git.binaryninja.net/BinaryNinja/tvapp2" LABEL org.opencontainers.image.repo.1="https://github.com/iFlip721/tvapp2" LABEL org.opencontainers.image.repo.2="https://github.com/Aetherinox/tvapp2" -LABEL org.opencontainers.image.repo.3="https://git.binaryninja.net/pub_projects/tvapp2" -LABEL org.opencontainers.image.documentation="https://git.binaryninja.net/pub_projects/tvapp2/wiki" +LABEL org.opencontainers.image.repo.3="https://git.binaryninja.net/BinaryNinja/tvapp2" +LABEL org.opencontainers.image.documentation="https://git.binaryninja.net/BinaryNinja/tvapp2/wiki" LABEL org.opencontainers.image.url="https://github.com/Aetherinox/tvapp2/pkgs/container/tvapp2" LABEL org.opencontainers.image.licenses="MIT" LABEL BUILDVERSION="TVApp2 v${VERSION} Build ${BUILDDATE}" @@ -54,7 +54,7 @@ LABEL BUILDVERSION="TVApp2 v${VERSION} Build ${BUILDDATE}" ENV TZ="Etc/UTC" ENV URL_REPO_BASE="https://github.com/aetherinox/alpine-base/pkgs/container/alpine-base" -ENV URL_REPO_APP="https://git.binaryninja.net/pub_projects/tvapp2" +ENV URL_REPO_APP="https://git.binaryninja.net/BinaryNinja/tvapp2" ENV FILE_NAME="index.html" ENV PORT_HTTP=4124 ENV NODE_VERSION=18.20.5 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 724c5265..52cbb6d9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -8,7 +8,7 @@ # @repo https://github.com/iFlip721/tvapp2 # https://github.com/aetherinox/tvapp2 # https://github.com/aetherinox/docker-base-alpine -# https://git.binaryninja.net/pub_projects/tvapp2 +# https://git.binaryninja.net/BinaryNinja/tvapp2 # # you can build your own image by running # amd64 docker build --build-arg VERSION=1.0.0 --build-arg BUILDDATE=20250218 -t tvapp2:latest -t tvapp2:1.0.0 -t tvapp2:1.0.0-amd64 -f Dockerfile . @@ -38,11 +38,11 @@ LABEL org.opencontainers.image.authors="aetherinox, iFlip721" LABEL org.opencontainers.image.vendor="BinaryNinja" LABEL org.opencontainers.image.title="TVApp2" LABEL org.opencontainers.image.description="Automatic m3u and xml guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client." -LABEL org.opencontainers.image.source="https://git.binaryninja.net/pub_projects/tvapp2" +LABEL org.opencontainers.image.source="https://git.binaryninja.net/BinaryNinja/tvapp2" LABEL org.opencontainers.image.repo.1="https://github.com/iFlip721/tvapp2" LABEL org.opencontainers.image.repo.2="https://github.com/Aetherinox/tvapp2" -LABEL org.opencontainers.image.repo.3="https://git.binaryninja.net/pub_projects/tvapp2" -LABEL org.opencontainers.image.documentation="https://git.binaryninja.net/pub_projects/tvapp2/wiki" +LABEL org.opencontainers.image.repo.3="https://git.binaryninja.net/BinaryNinja/tvapp2" +LABEL org.opencontainers.image.documentation="https://git.binaryninja.net/BinaryNinja/tvapp2/wiki" LABEL org.opencontainers.image.url="https://github.com/Aetherinox/tvapp2/pkgs/container/tvapp2" LABEL org.opencontainers.image.licenses="MIT" LABEL BUILDVERSION="TVApp2 v${VERSION} Build ${BUILDDATE}" @@ -53,7 +53,7 @@ LABEL BUILDVERSION="TVApp2 v${VERSION} Build ${BUILDDATE}" ENV TZ="Etc/UTC" ENV URL_REPO_BASE="https://github.com/aetherinox/alpine-base/pkgs/container/alpine-base" -ENV URL_REPO_APP="https://git.binaryninja.net/pub_projects/tvapp2" +ENV URL_REPO_APP="https://git.binaryninja.net/BinaryNinja/tvapp2" ENV FILE_NAME="index.html" ENV PORT_HTTP=4124 ENV NODE_VERSION=18.20.5 diff --git a/LICENSE b/LICENSE index 596b532d..276b3955 100644 --- a/LICENSE +++ b/LICENSE @@ -1,9 +1,21 @@ MIT License -Copyright (c) 2025 pub_projects +Copyright (c) 2025 BinaryNinja -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index 19d95c2a..9406f84a 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ This project contains several repositories which all share the same code; use th - [https://github.com/iFlip721/tvapp2](https://github.com/iFlip721/tvapp2) - [https://github.com/Aetherinox/tvapp2](https://github.com/Aetherinox/tvapp2) -- [https://git.binaryninja.net/pub_projects/tvapp2](https://git.binaryninja.net/pub_projects/tvapp2) +- [https://git.binaryninja.net/BinaryNinja/tvapp2](https://git.binaryninja.net/BinaryNinja/tvapp2)
@@ -81,8 +81,8 @@ This project contains several repositories which all share the same code; use th
-- TVApp2 makes fetch request to [tvapp2-externals](https://git.binaryninja.net/pub_projects/tvapp2-externals 'tvapp2-externals') making updates to external formats agnostic to pushing a new container image. -- TVApp2 makes fetch request to [XMLTV-EPG](https://git.binaryninja.net/pub_projects/XMLTV-EPG 'XMLTV-EPG') making updates to EPG data based on customized channel ids. Channel ids are specific to each EPG record which makes obfuscating channel ids difficult. +- TVApp2 makes fetch request to [tvapp2-externals](https://git.binaryninja.net/BinaryNinja/tvapp2-externals 'tvapp2-externals') making updates to external formats agnostic to pushing a new container image. +- TVApp2 makes fetch request to [XMLTV-EPG](https://git.binaryninja.net/BinaryNinja/XMLTV-EPG 'XMLTV-EPG') making updates to EPG data based on customized channel ids. Channel ids are specific to each EPG record which makes obfuscating channel ids difficult.
@@ -128,7 +128,7 @@ flowchart TB subgraph GRAPH_TVAPP ["Build tvapp2:latest"] direction TB - obj_step10["`> git clone git.binaryninja.net/pub_projects/tvapp2.git`"] + obj_step10["`> git clone git.binaryninja.net/BinaryNinja/tvapp2.git`"] obj_step11["`**Dockerfile Dockerfile.aarch64**`"] obj_step12["`> docker build \ @@ -212,7 +212,7 @@ Prior to building the docker image, you **must** ensure the sections below are You cannot utilize Windows' `Carriage Return Line Feed`. All files must be converted to Unix' `Line Feed`. This can be done with **[Visual Studio Code](https://code.visualstudio.com/)**. OR; you can run the Linux terminal command `dos2unix` to convert these files. -If you cloned the files from the official repository **[iflip721/tvapp2](https://git.binaryninja.net/pub_projects/tvapp2)** and have not edited them, then you should not need to do this step. +If you cloned the files from the official repository **[iflip721/tvapp2](https://git.binaryninja.net/BinaryNinja/tvapp2)** and have not edited them, then you should not need to do this step.
@@ -265,7 +265,7 @@ sudo chmod +x /root/etc/s6-overlay/s6-rc.d/svc-php-fpm/run
### Build `tvapp` Image -After completing the items above, you can now build the **[iflip721/tvapp2](https://git.binaryninja.net/pub_projects/tvapp2)** image. You can now build the TvApp2 docker image. Pick your platform below and run the associated command. Most people will want to use [amd64](#amd64). +After completing the items above, you can now build the **[iflip721/tvapp2](https://git.binaryninja.net/BinaryNinja/tvapp2)** image. You can now build the TvApp2 docker image. Pick your platform below and run the associated command. Most people will want to use [amd64](#amd64).
@@ -314,7 +314,7 @@ All of the needed Docker files already exist in the repository. To get started, mkdir tvapp2 && cd tvapp2 # to clone from our gitea website -git clone https://git.binaryninja.net/pub_projects/tvapp2.git ./ +git clone https://git.binaryninja.net/BinaryNinja/tvapp2.git ./ # to clone from our github website git clone https://github.com/iFlip721/tvapp2.git ./ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 7acdf94c..b6048188 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -8,7 +8,7 @@ # @repo https://github.com/iFlip721/tvapp2 # https://github.com/aetherinox/tvapp2 # https://github.com/aetherinox/docker-base-alpine -# https://git.binaryninja.net/pub_projects/tvapp2 +# https://git.binaryninja.net/BinaryNinja/tvapp2 # # you can build your own image by running # amd64 docker build --build-arg VERSION=1.0.0 --build-arg BUILDDATE=20250218 -t tvapp2:latest -t tvapp2:1.0.0 -t tvapp2:1.0.0-amd64 -f Dockerfile . diff --git a/root/custom-cont-init.d/plugins b/root/custom-cont-init.d/plugins index d8dcf570..50bdfb7e 100644 --- a/root/custom-cont-init.d/plugins +++ b/root/custom-cont-init.d/plugins @@ -6,7 +6,7 @@ # @file plugins # @repo.1 https://github.com/iFlip721/tvapp2 # @repo.2 https://github.com/Aetherinox/tvapp2 -# @repo.3 https://git.binaryninja.net/pub_projects/tvapp2 +# @repo.3 https://git.binaryninja.net/BinaryNinja/tvapp2 # @repo.alpine https://github.com/Aetherinox/docker-base-alpine # # diff --git a/root/defaults/nginx/nginx.conf.sample b/root/defaults/nginx/nginx.conf.sample index c4cd05b5..cb58f091 100644 --- a/root/defaults/nginx/nginx.conf.sample +++ b/root/defaults/nginx/nginx.conf.sample @@ -4,7 +4,7 @@ # @file nginx.conf.sample # @repo.1 https://github.com/iFlip721/tvapp2 # @repo.2 https://github.com/Aetherinox/tvapp2 -# @repo.3 https://git.binaryninja.net/pub_projects/tvapp2 +# @repo.3 https://git.binaryninja.net/BinaryNinja/tvapp2 # @repo.alpine https://github.com/Aetherinox/docker-base-alpine # # diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 6c9d367c..5843cded 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -4,7 +4,7 @@ # @file default.conf.sample # @repo.1 https://github.com/iFlip721/tvapp2 # @repo.2 https://github.com/Aetherinox/tvapp2 -# @repo.3 https://git.binaryninja.net/pub_projects/tvapp2 +# @repo.3 https://git.binaryninja.net/BinaryNinja/tvapp2 # @repo.alpine https://github.com/Aetherinox/docker-base-alpine # # diff --git a/root/defaults/nginx/ssl.conf.sample b/root/defaults/nginx/ssl.conf.sample index e8b33e23..fe8c5dc3 100644 --- a/root/defaults/nginx/ssl.conf.sample +++ b/root/defaults/nginx/ssl.conf.sample @@ -4,7 +4,7 @@ # @file nginx.conf.sample # @repo.1 https://github.com/iFlip721/tvapp2 # @repo.2 https://github.com/Aetherinox/tvapp2 -# @repo.3 https://git.binaryninja.net/pub_projects/tvapp2 +# @repo.3 https://git.binaryninja.net/BinaryNinja/tvapp2 # @repo.alpine https://github.com/Aetherinox/docker-base-alpine # # diff --git a/root/etc/s6-overlay/s6-rc.d/init-adduser/branding b/root/etc/s6-overlay/s6-rc.d/init-adduser/branding index 6e09a07c..cde8df00 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-adduser/branding +++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/branding @@ -13,7 +13,7 @@ TVApp2 Repo 1 https://github.com/iFlip721/tvapp2 TVApp2 Repo 2 https://github.com/Aetherinox/tvapp2 - TVApp2 Repo 3 https://git.binaryninja.net/pub_projects/tvapp2 + TVApp2 Repo 3 https://git.binaryninja.net/BinaryNinja/tvapp2 Base Alpine Image https://github.com/Aetherinox/docker-base-alpine If you are making this container available on a public-facing domain, diff --git a/root/etc/s6-overlay/s6-rc.d/init-keygen/run b/root/etc/s6-overlay/s6-rc.d/init-keygen/run index 29753990..98bd917e 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-keygen/run +++ b/root/etc/s6-overlay/s6-rc.d/init-keygen/run @@ -7,7 +7,7 @@ # @file run # @repo.1 https://github.com/iFlip721/tvapp2 # @repo.2 https://github.com/Aetherinox/tvapp2 -# @repo.3 https://git.binaryninja.net/pub_projects/tvapp2 +# @repo.3 https://git.binaryninja.net/BinaryNinja/tvapp2 # @repo.alpine https://github.com/Aetherinox/docker-base-alpine # # diff --git a/root/etc/s6-overlay/s6-rc.d/init-samples/run b/root/etc/s6-overlay/s6-rc.d/init-samples/run index 8e0d201b..e118d3fe 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-samples/run +++ b/root/etc/s6-overlay/s6-rc.d/init-samples/run @@ -7,6 +7,6 @@ # @file run # @repo.1 https://github.com/iFlip721/tvapp2 # @repo.2 https://github.com/Aetherinox/tvapp2 -# @repo.3 https://git.binaryninja.net/pub_projects/tvapp2 +# @repo.3 https://git.binaryninja.net/BinaryNinja/tvapp2 # @repo.alpine https://github.com/Aetherinox/docker-base-alpine # #