From d19c96ac3f632ca0a2d989fec37bf808aec15c4d Mon Sep 17 00:00:00 2001 From: Jan Stabenow Date: Tue, 19 Jul 2022 16:58:36 +0200 Subject: [PATCH 1/9] Add dev build --- .github/workflows/build_restreamer_dev.yaml | 80 +++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 .github/workflows/build_restreamer_dev.yaml diff --git a/.github/workflows/build_restreamer_dev.yaml b/.github/workflows/build_restreamer_dev.yaml new file mode 100644 index 0000000..39afffc --- /dev/null +++ b/.github/workflows/build_restreamer_dev.yaml @@ -0,0 +1,80 @@ +name: 'Build datarhei/restreamer-ui:dev' + +on: + workflow_dispatch: + workflow_call: + push: + branches: + - dev + +jobs: + docker: + runs-on: [self-hosted] + strategy: + matrix: + branch: + - dev + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + ref: ${{ matrix.branch }} + + - uses: actions-ecosystem/action-get-latest-tag@v1 + id: get-latest-tag + with: + semver_only: true + + - uses: cardinalby/export-env-action@v1 + with: + envFile: '.github_build/Build.alpine.env' + export: 'true' + expandWithJobEnv: 'true' + expand: 'true' + + - name: Docker meta + id: meta + uses: docker/metadata-action@v4 + with: + images: | + datarhei/restreamer-ui + tags: | + type=raw,value=dev,enable=${{ matrix.branch == 'dev' }} + - name: Set up QEMU + uses: docker/setup-qemu-action@master + with: + platforms: all + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@master + + - name: Cache Docker layers + uses: actions/cache@v2 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Login to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build Multi-Arch + uses: docker/build-push-action@v2 + with: + builder: ${{ steps.buildx.outputs.name }} + context: . + file: ./Dockerfile + build-args: | + PUBLIC_URL=/ui + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new From b4ecf7309a8086476028cdcd40a3d8b45cedd6ed Mon Sep 17 00:00:00 2001 From: Jan Stabenow Date: Tue, 19 Jul 2022 17:01:06 +0200 Subject: [PATCH 2/9] Fix drops static env --- .github/workflows/build_restreamer_dev.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/build_restreamer_dev.yaml b/.github/workflows/build_restreamer_dev.yaml index 39afffc..e3f5663 100644 --- a/.github/workflows/build_restreamer_dev.yaml +++ b/.github/workflows/build_restreamer_dev.yaml @@ -26,13 +26,6 @@ jobs: with: semver_only: true - - uses: cardinalby/export-env-action@v1 - with: - envFile: '.github_build/Build.alpine.env' - export: 'true' - expandWithJobEnv: 'true' - expand: 'true' - - name: Docker meta id: meta uses: docker/metadata-action@v4 From d348e702a2390808fae9c4a99a4c8b79e3d093ba Mon Sep 17 00:00:00 2001 From: Jan Stabenow Date: Fri, 30 Sep 2022 10:09:26 +0200 Subject: [PATCH 3/9] Update Build.restreamer-ui.env --- .github_build/Build.restreamer-ui.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github_build/Build.restreamer-ui.env b/.github_build/Build.restreamer-ui.env index 348b6f2..39a0076 100644 --- a/.github_build/Build.restreamer-ui.env +++ b/.github_build/Build.restreamer-ui.env @@ -1,3 +1,3 @@ # RESTREAMER UI -RELEASE=1.2.0 -NODE_IMAGE=node:18.6.0-alpine3.15 +RELEASE=1.3.0 +NODE_IMAGE=node:18.10.0-alpine3.15 From 7f1d2c7df1f5f68b1733aec2d2bb60e18d562b01 Mon Sep 17 00:00:00 2001 From: Jan Stabenow Date: Fri, 30 Sep 2022 10:20:07 +0200 Subject: [PATCH 4/9] Mod uses node:18.9.0-alpine3.15 (no armv7 support) --- .github_build/Build.restreamer-ui.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github_build/Build.restreamer-ui.env b/.github_build/Build.restreamer-ui.env index 39a0076..cb2a9dc 100644 --- a/.github_build/Build.restreamer-ui.env +++ b/.github_build/Build.restreamer-ui.env @@ -1,3 +1,3 @@ # RESTREAMER UI RELEASE=1.3.0 -NODE_IMAGE=node:18.10.0-alpine3.15 +NODE_IMAGE=node:18.9.0-alpine3.15 From df9ae03900e8b89f03bf35a76a0f5c5dbf63696d Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Tue, 11 Oct 2022 15:39:52 +0200 Subject: [PATCH 5/9] Fix use of TLS for input from local RTMP server --- src/views/Edit/Sources/Network.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Edit/Sources/Network.js b/src/views/Edit/Sources/Network.js index 46e52a0..b92a089 100644 --- a/src/views/Edit/Sources/Network.js +++ b/src/views/Edit/Sources/Network.js @@ -384,7 +384,7 @@ const getLocalHLS = (config, name) => { }; const getLocalRTMP = (config) => { - return getRTMPAddress(config.rtmp.local, config.rtmp.app, config.rtmp.name, config.rtmp.token, config.rtmp.secure); + return getRTMPAddress(config.rtmp.local, config.rtmp.app, config.rtmp.name, config.rtmp.token, false); }; const getLocalSRT = (config) => { From 71bfb9d1f135bfbf9e0eaf5f1ac3c2896abe0c6a Mon Sep 17 00:00:00 2001 From: Jan Stabenow Date: Tue, 8 Nov 2022 16:33:58 +0100 Subject: [PATCH 6/9] Mod removes armv6 from :dev --- .github/workflows/build_restreamer_dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_restreamer_dev.yaml b/.github/workflows/build_restreamer_dev.yaml index e3f5663..97c3944 100644 --- a/.github/workflows/build_restreamer_dev.yaml +++ b/.github/workflows/build_restreamer_dev.yaml @@ -65,7 +65,7 @@ jobs: file: ./Dockerfile build-args: | PUBLIC_URL=/ui - platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 + platforms: linux/amd64,linux/arm64,linux/arm/v7 push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From fcd4231a3c74111b69843f770ae63a34fbeb387b Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 16 Mar 2023 20:42:24 +0000 Subject: [PATCH 7/9] fix: upgrade video.js from 8.0.4 to 8.1.0 Snyk has created this PR to upgrade video.js from 8.0.4 to 8.1.0. See this package in npm: See this project in Snyk: https://app.snyk.io/org/j.stabenow/project/204cdfb1-d11d-4cbe-87df-f862f7880c39?utm_source=github&utm_medium=referral&page=upgrade-pr --- package.json | 2 +- yarn.lock | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 7476df0..228754f 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "typescript": "^4.9.5", "url-parse": "^1.5.10", "uuid": "^9.0.0", - "video.js": "^8.0.4", + "video.js": "^8.1.0", "videojs-overlay": "^3.0.0" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index 951c6d1..8d0438f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2840,6 +2840,20 @@ mux.js "6.2.0" video.js "^7 || ^8" +"@videojs/http-streaming@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-3.0.2.tgz#3498dacf4bc66ec1b663b1ec710ca62a037ea8b2" + integrity sha512-iSZkwTLGg3Rx78ypCCq/GsMME89ElNvU02xj7reCE2PlITMQjyYsER1w5AsySvT1A694u5yuSzEzLLGF1cL4pg== + dependencies: + "@babel/runtime" "^7.12.5" + "@videojs/vhs-utils" "4.0.0" + aes-decrypter "4.0.1" + global "^4.4.0" + m3u8-parser "^6.0.0" + mpd-parser "^1.0.1" + mux.js "6.3.0" + video.js "^7 || ^8" + "@videojs/vhs-utils@4.0.0", "@videojs/vhs-utils@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-4.0.0.tgz#4d4dbf5d61a9fbd2da114b84ec747c3a483bc60d" @@ -7736,7 +7750,7 @@ mux.js@6.2.0: "@babel/runtime" "^7.11.2" global "^4.4.0" -mux.js@^6.2.0: +mux.js@6.3.0, mux.js@^6.2.0: version "6.3.0" resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-6.3.0.tgz#b0a46bc468402f7ce2be4e0f87ce903f8683bfeb" integrity sha512-/QTkbSAP2+w1nxV+qTcumSDN5PA98P0tjrADijIzQHe85oBK3Akhy9AHlH0ne/GombLMz1rLyvVsmrgRxoPDrQ== @@ -10541,7 +10555,7 @@ vfile@^5.0.0: unist-util-stringify-position "^3.0.0" vfile-message "^3.0.0" -"video.js@^6 || ^7 || ^8", "video.js@^7 || ^8", video.js@^8.0.4: +"video.js@^6 || ^7 || ^8", "video.js@^7 || ^8": version "8.0.4" resolved "https://registry.yarnpkg.com/video.js/-/video.js-8.0.4.tgz#d95a30c40aa5045769e4c9937ced0ed250518a1f" integrity sha512-fvvWauPanrKDps1HQGGL+9CIAK8G0YVwlNme0hvY0k3moXQryaRcJSLHIlPKV2j9ZFTHl32VbN43jL3TaUllfg== @@ -10561,6 +10575,26 @@ vfile@^5.0.0: videojs-font "3.2.0" videojs-vtt.js "0.15.4" +video.js@^8.1.0: + version "8.2.1" + resolved "https://registry.yarnpkg.com/video.js/-/video.js-8.2.1.tgz#6b1a664381968d81d1f6231baa213e2ee01620b3" + integrity sha512-RFy5Apgs5ircnTp804r8arnIHBBnG405bXj48RIQWoGFnf2LslLcajXsla/9Rh3OfDwh7hEh4UpEt+UhoDbddA== + dependencies: + "@babel/runtime" "^7.12.5" + "@videojs/http-streaming" "3.0.2" + "@videojs/vhs-utils" "^4.0.0" + "@videojs/xhr" "2.6.0" + aes-decrypter "^4.0.1" + global "4.4.0" + keycode "2.2.0" + m3u8-parser "^6.0.0" + mpd-parser "^1.0.1" + mux.js "^6.2.0" + safe-json-parse "4.0.0" + videojs-contrib-quality-levels "3.0.0" + videojs-font "4.1.0" + videojs-vtt.js "0.15.4" + videojs-contrib-quality-levels@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-3.0.0.tgz#bc66f1333b763754b4425455bee4ef6e5ba53984" @@ -10573,6 +10607,11 @@ videojs-font@3.2.0: resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.2.0.tgz#212c9d3f4e4ec3fa7345167d64316add35e92232" integrity sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA== +videojs-font@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-4.1.0.tgz#3ae1dbaac60b4f0f1c4e6f7ff9662a89df176015" + integrity sha512-X1LuPfLZPisPLrANIAKCknZbZu5obVM/ylfd1CN+SsCmPZQ3UMDPcvLTpPBJxcBuTpHQq2MO1QCFt7p8spnZ/w== + videojs-overlay@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/videojs-overlay/-/videojs-overlay-3.0.0.tgz#546ce34d72cdbb07c33eb189e94a37847dfbebe8" From 99c90b4cab74a50d031ca510a7df0f48b5ed3ff7 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 18 Mar 2023 01:59:35 +0000 Subject: [PATCH 8/9] fix: upgrade @lingui/macro from 3.17.1 to 3.17.2 Snyk has created this PR to upgrade @lingui/macro from 3.17.1 to 3.17.2. See this package in npm: See this project in Snyk: https://app.snyk.io/org/j.stabenow/project/204cdfb1-d11d-4cbe-87df-f862f7880c39?utm_source=github&utm_medium=referral&page=upgrade-pr --- package.json | 2 +- yarn.lock | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7476df0..9a9fe49 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@fortawesome/free-solid-svg-icons": "^6.3.0", "@fortawesome/react-fontawesome": "^0.2.0", "@lingui/core": "^3.17.1", - "@lingui/macro": "^3.17.1", + "@lingui/macro": "^3.17.2", "@lingui/react": "^3.17.1", "@mui/icons-material": "^5.11.9", "@mui/lab": "^5.0.0-alpha.120", diff --git a/yarn.lock b/yarn.lock index 951c6d1..2e6e95a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1914,6 +1914,18 @@ jest-validate "^26.5.2" lodash.get "^4.4.2" +"@lingui/conf@3.17.2": + version "3.17.2" + resolved "https://registry.yarnpkg.com/@lingui/conf/-/conf-3.17.2.tgz#0a26343e2fdb20ad2e7b0f23b008b86416bcd792" + integrity sha512-q3ADfpMYCYMgiu/lrYOOvE3ptxXIqYhA1ozyAq6ynguL8ppqfyaTluLoHfVJVWxnTMI/es9s2W9Kg81QH+nuXQ== + dependencies: + "@babel/runtime" "^7.20.13" + chalk "^4.1.0" + cosmiconfig "^8.0.0" + cosmiconfig-typescript-loader "^4.3.0" + jest-validate "^26.5.2" + lodash.get "^4.4.2" + "@lingui/core@3.17.1", "@lingui/core@^3.17.1": version "3.17.1" resolved "https://registry.yarnpkg.com/@lingui/core/-/core-3.17.1.tgz#7c8db6ddc61ecd8c2f445ddaf53c23cf647fd749" @@ -1923,14 +1935,14 @@ "@messageformat/parser" "^5.0.0" make-plural "^6.2.2" -"@lingui/macro@^3.17.1": - version "3.17.1" - resolved "https://registry.yarnpkg.com/@lingui/macro/-/macro-3.17.1.tgz#c42570eece439d4f4035d610e70033ecf512f7a8" - integrity sha512-C2Zt31p8iBHRCQrv2WR24wrbuhw1Z1YWOrOBdO7z93mxfUeySwlgIKyhMB8OJc1prD1QB7tPvXRa3PrR7k3lKQ== +"@lingui/macro@^3.17.2": + version "3.17.2" + resolved "https://registry.yarnpkg.com/@lingui/macro/-/macro-3.17.2.tgz#b0c358335fa190df8364a66fa17fca2266561b0a" + integrity sha512-kk1ZtwYSx5Knu/5LsRGisTqfNoLIeVkJJPn6xjZXcItoxUgRsykyKb3BqCJwxqYUClz4i4A8Ld/aA4xBi4apRQ== dependencies: "@babel/runtime" "^7.20.13" "@babel/types" "^7.20.7" - "@lingui/conf" "3.17.1" + "@lingui/conf" "3.17.2" ramda "^0.27.1" "@lingui/react@^3.17.1": From 87f4e443b5fcf8ce24f238e3a2601b61bc2d47c3 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 18 Mar 2023 01:59:38 +0000 Subject: [PATCH 9/9] fix: upgrade @lingui/react from 3.17.1 to 3.17.2 Snyk has created this PR to upgrade @lingui/react from 3.17.1 to 3.17.2. See this package in npm: See this project in Snyk: https://app.snyk.io/org/j.stabenow/project/204cdfb1-d11d-4cbe-87df-f862f7880c39?utm_source=github&utm_medium=referral&page=upgrade-pr --- package.json | 2 +- yarn.lock | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7476df0..5d8fd6e 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@fortawesome/react-fontawesome": "^0.2.0", "@lingui/core": "^3.17.1", "@lingui/macro": "^3.17.1", - "@lingui/react": "^3.17.1", + "@lingui/react": "^3.17.2", "@mui/icons-material": "^5.11.9", "@mui/lab": "^5.0.0-alpha.120", "@mui/material": "^5.11.10", diff --git a/yarn.lock b/yarn.lock index 951c6d1..f4572e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1923,6 +1923,15 @@ "@messageformat/parser" "^5.0.0" make-plural "^6.2.2" +"@lingui/core@3.17.2": + version "3.17.2" + resolved "https://registry.yarnpkg.com/@lingui/core/-/core-3.17.2.tgz#275aa19520477910ddf41a838ef91a8204bea7eb" + integrity sha512-YOd068NanznN8lLQqOKPlAY0ill3rrgmiAvPRKuYkrxzJMIHqlIFO/2Kcc/RH5vClOmLfg+wgR4rsHK/kLKelQ== + dependencies: + "@babel/runtime" "^7.20.13" + "@messageformat/parser" "^5.0.0" + make-plural "^6.2.2" + "@lingui/macro@^3.17.1": version "3.17.1" resolved "https://registry.yarnpkg.com/@lingui/macro/-/macro-3.17.1.tgz#c42570eece439d4f4035d610e70033ecf512f7a8" @@ -1933,13 +1942,13 @@ "@lingui/conf" "3.17.1" ramda "^0.27.1" -"@lingui/react@^3.17.1": - version "3.17.1" - resolved "https://registry.yarnpkg.com/@lingui/react/-/react-3.17.1.tgz#3aa07dc22db39b5b1bfd169a4887451c9a4aa41b" - integrity sha512-5kThGxJ91hkmxP8rzeC0Wx20LfOz1z3RGjoss6S4hTk9YtOKV2Jy5F+2d+L1vTc7479fZ/P7HJEuXfCF2ZvxdA== +"@lingui/react@^3.17.2": + version "3.17.2" + resolved "https://registry.yarnpkg.com/@lingui/react/-/react-3.17.2.tgz#b795f3a90aa4d199ad2dd1bf42cd208285420578" + integrity sha512-+PECPknIiQn/zdXgrXVTCbcJUSjPFZTtPOuIO72huGNh/QA+iRVsGTvef0/Q+pWkiPEOU6CmaGHkwdtgFMtJ8g== dependencies: "@babel/runtime" "^7.20.13" - "@lingui/core" "3.17.1" + "@lingui/core" "3.17.2" "@messageformat/parser@^5.0.0": version "5.0.0"