diff --git a/.gitignore b/.gitignore
index 45dd6f38..1e05cd98 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
# #
node_modules/
+tvapp2/node_modules/
jspm_packages/
# #
diff --git a/README.md b/README.md
index cb54dd15..80f4f10e 100644
--- a/README.md
+++ b/README.md
@@ -403,7 +403,7 @@ Prior to building the docker image, you **must** ensure the sections below are
- If the listed tasks above are not performed, your docker container will throw the following errors when started:
+If the listed tasks above are not performed, your docker container will throw the following errors when started:
- `Failed to open apk database: Permission denied`
- `s6-rc: warning: unable to start service init-adduser: command exited 127`
@@ -466,9 +466,13 @@ sudo chmod +x ./root/etc/s6-overlay/s6-rc.d/init-adduser/run \
./root/etc/s6-overlay/s6-rc.d/init-samples/run \
./root/etc/s6-overlay/s6-rc.d/init-version-checks/run \
./root/etc/s6-overlay/s6-rc.d/svc-cron/run \
- ./root/etc/services.d/tvapp2/run
+ ./root/etc/s6-overlay/s6-rc.d/svc-php-fpm/run \
+ ./root/etc/s6-overlay/s6-rc.d/svc-nginx/run \
+ ./root/etc/s6-overlay/s6-rc.d/init-php/run \
+ ./root/etc/s6-overlay/s6-rc.d/init-nginx/run
```
+
### Build Images
@@ -755,7 +759,7 @@ You should see your name:
-Next, in order to build the `amd64` and `arm64` images on the same machine; you must install **QEMU** using:
+Next, in order to build the `amd64` and `arm64` images on the same machine; you must install **QEMU** which is an emulator. Open your terminal and run the following command:
```shell
docker run --privileged --rm tonistiigi/binfmt --install all
@@ -763,6 +767,16 @@ docker run --privileged --rm tonistiigi/binfmt --install all
+If you are building these docker images using Github workflow, you will also need to use `QEMU` with the following action:
+
+```yml
+ - name: '⚙️ Set up QEMU'
+ id: task_release_gh_qemu
+ uses: docker/setup-qemu-action@v3
+```
+
+
+
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.3-amd64`
@@ -1781,7 +1795,7 @@ Sign into the Authentik admin panel, go to the left-side navigation, select **Ap
-
Authentik: Select Applications › Providers
+
Authentik: Select Applications › Providers
@@ -1817,7 +1831,7 @@ Once finished, click **Create**. Then on the left-side menu, select **Applicatio
-
Authentik: Select Applications › Applications
+
Authentik: Select Applications › Applications
@@ -1843,7 +1857,7 @@ Save, and then on the left-side menu, select **Applications** -> **Outposts**:
-
Authentik: Select Applications › Outposts
+
Authentik: Select Applications › Outposts
diff --git a/tvapp2/package-lock.json b/tvapp2/package-lock.json
index 64ebc9b2..b00dd465 100755
--- a/tvapp2/package-lock.json
+++ b/tvapp2/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "tvapp2",
- "version": "1.5.3",
+ "version": "1.5.4",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "tvapp2",
- "version": "1.5.3",
+ "version": "1.5.4",
"license": "MIT",
"dependencies": {
"chalk": "^5.4.1",
@@ -474,9 +474,9 @@
}
},
"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+ "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -878,9 +878,9 @@
}
},
"node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "version": "1.1.12",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+ "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
"license": "MIT",
"dependencies": {
"balanced-match": "^1.0.0",
@@ -1783,9 +1783,9 @@
}
},
"node_modules/eslint-plugin-n/node_modules/brace-expansion": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+ "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -2153,9 +2153,9 @@
}
},
"node_modules/filelist/node_modules/brace-expansion": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+ "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
"license": "MIT",
"dependencies": {
"balanced-match": "^1.0.0"
diff --git a/tvapp2/package.json b/tvapp2/package.json
index 2d90e97d..fe16bc89 100755
--- a/tvapp2/package.json
+++ b/tvapp2/package.json
@@ -1,6 +1,6 @@
{
"name": "tvapp2",
- "version": "1.5.3",
+ "version": "1.5.4",
"description": "This package allows you to generate M3U playlists and EPG guides from various online IPTV services.",
"author": "BinaryNinja",
"license": "MIT",
@@ -48,6 +48,7 @@
],
"scripts": {
"start": "node index.js",
+ "start:debug": "noxenv LOG_LEVEL=6 node index.js",
"docker:buildx:amd64": "docker buildx create --driver docker-container --name container --bootstrap --use && docker buildx build --build-arg ARCH=amd64 --build-arg VERSION=$npm_config_version --build-arg BUILDDATE=$npm_config_builddate --tag tvapp2:$npm_config_version-amd64 --attest type=provenance,disabled=true --attest type=sbom,disabled=true --file Dockerfile --platform linux/amd64 --output type=docker --allow network.host --network host --no-cache --pull .",
"docker:buildx:arm64": "docker buildx create --driver docker-container --name container --bootstrap --use && docker buildx build --build-arg ARCH=arm64 --build-arg VERSION=$npm_config_version --build-arg BUILDDATE=$npm_config_builddate --tag tvapp2:$npm_config_version-arm64 --attest type=provenance,disabled=true --attest type=sbom,disabled=true --file Dockerfile --platform linux/arm64 --output type=docker --allow network.host --network host --no-cache --pull .",
"contrib:add": "all-contributors add",