From c5f3713d28ac49b2b45a9d579106d2057504e0ef Mon Sep 17 00:00:00 2001 From: srgooglo Date: Sat, 28 May 2022 20:25:33 +0200 Subject: [PATCH 1/6] rename `streamingKey` --- .../src/schemas/{StreamingKey => streamingKey}/index.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/streaming-server/src/schemas/{StreamingKey => streamingKey}/index.js (100%) mode change 100644 => 100755 diff --git a/packages/streaming-server/src/schemas/StreamingKey/index.js b/packages/streaming-server/src/schemas/streamingKey/index.js old mode 100644 new mode 100755 similarity index 100% rename from packages/streaming-server/src/schemas/StreamingKey/index.js rename to packages/streaming-server/src/schemas/streamingKey/index.js From be1ae1c5bd1a646a32690b0ce062ec0d0f571deb Mon Sep 17 00:00:00 2001 From: srgooglo Date: Sat, 28 May 2022 20:26:11 +0200 Subject: [PATCH 2/6] added docker-compose and Dockerfile --- packages/streaming-server/Dockerfile | 16 ++++++++++++++++ packages/streaming-server/docker-compose.yml | 9 +++++++++ 2 files changed, 25 insertions(+) create mode 100644 packages/streaming-server/Dockerfile create mode 100644 packages/streaming-server/docker-compose.yml diff --git a/packages/streaming-server/Dockerfile b/packages/streaming-server/Dockerfile new file mode 100644 index 00000000..2755a528 --- /dev/null +++ b/packages/streaming-server/Dockerfile @@ -0,0 +1,16 @@ +FROM node:16-alpine + +RUN apk add git +RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app + +WORKDIR /home/node/app +USER node + +EXPOSE 3010 + +COPY package.json ./ +COPY --chown=node:node . . + +RUN chmod -R 777 /home/node/app && npm install + +CMD ["/home/node/app/node_modules/corenode/bin/corenode-node", "/home/node/app/src/index.js"] \ No newline at end of file diff --git a/packages/streaming-server/docker-compose.yml b/packages/streaming-server/docker-compose.yml new file mode 100644 index 00000000..1bf73fd8 --- /dev/null +++ b/packages/streaming-server/docker-compose.yml @@ -0,0 +1,9 @@ +version: "3" + +services: + node: + build: "." + ports: + - "3010:3010" + volumes: + - "./.env:/home/node/app/.env" \ No newline at end of file From da689b31ddde34a7887d2a8ece9622e4243b36df Mon Sep 17 00:00:00 2001 From: srgooglo Date: Sat, 28 May 2022 20:37:07 +0200 Subject: [PATCH 3/6] added dotenv --- packages/streaming-server/package.json | 3 ++- packages/streaming-server/src/index.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/streaming-server/package.json b/packages/streaming-server/package.json index b58ba962..2167e717 100644 --- a/packages/streaming-server/package.json +++ b/packages/streaming-server/package.json @@ -16,7 +16,8 @@ "dateformat": "^3.0.3", "minimist": "^1.2.5", "mkdirp": "1.0.3", - "ws": "^7.4.6" + "ws": "^7.4.6", + "dotenv": "16.0.1" }, "devDependencies": { "cross-env": "^7.0.3", diff --git a/packages/streaming-server/src/index.js b/packages/streaming-server/src/index.js index bad0c572..9702e9ab 100644 --- a/packages/streaming-server/src/index.js +++ b/packages/streaming-server/src/index.js @@ -1,3 +1,4 @@ +require("dotenv").config() const ffmpeg = require("@ffmpeg-installer/ffmpeg") import express from "express" From 6f939105d2ac95df15781affa757349d3fb4d4ae Mon Sep 17 00:00:00 2001 From: srgooglo Date: Sat, 28 May 2022 20:37:12 +0200 Subject: [PATCH 4/6] update ports --- packages/streaming-server/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/streaming-server/docker-compose.yml b/packages/streaming-server/docker-compose.yml index 1bf73fd8..b0d637f3 100644 --- a/packages/streaming-server/docker-compose.yml +++ b/packages/streaming-server/docker-compose.yml @@ -4,6 +4,7 @@ services: node: build: "." ports: - - "3010:3010" + - "1935:1935" + - "3002:3002" volumes: - "./.env:/home/node/app/.env" \ No newline at end of file From 672b778ae480815d7c3aa6026561e882b3783f7e Mon Sep 17 00:00:00 2001 From: srgooglo Date: Sat, 28 May 2022 20:39:09 +0200 Subject: [PATCH 5/6] added corenode dep & added build script --- packages/streaming-server/package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/streaming-server/package.json b/packages/streaming-server/package.json index 2167e717..4d92da3a 100644 --- a/packages/streaming-server/package.json +++ b/packages/streaming-server/package.json @@ -4,7 +4,8 @@ "version": "0.17.2", "main": "dist/index.js", "scripts": { - "dev": "nodemon --ignore dist/ --exec corenode-node ./src/index.js" + "dev": "nodemon --ignore dist/ --exec corenode-node ./src/index.js", + "build": "corenode-cli build" }, "dependencies": { "@ffmpeg-installer/ffmpeg": "^1.1.0", @@ -21,6 +22,7 @@ }, "devDependencies": { "cross-env": "^7.0.3", - "nodemon": "^2.0.15" + "nodemon": "^2.0.15", + "corenode": "0.28.26" } } From 130097f5df8ecd816edb36a755f19a1394eff0a5 Mon Sep 17 00:00:00 2001 From: srgooglo Date: Sat, 28 May 2022 20:43:26 +0200 Subject: [PATCH 6/6] update build cmds --- packages/streaming-server/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/streaming-server/Dockerfile b/packages/streaming-server/Dockerfile index 2755a528..0ed4e6ac 100644 --- a/packages/streaming-server/Dockerfile +++ b/packages/streaming-server/Dockerfile @@ -11,6 +11,8 @@ EXPOSE 3010 COPY package.json ./ COPY --chown=node:node . . -RUN chmod -R 777 /home/node/app && npm install +RUN chmod -R 777 /home/node/app +RUN npm install +RUN npm run build -CMD ["/home/node/app/node_modules/corenode/bin/corenode-node", "/home/node/app/src/index.js"] \ No newline at end of file +CMD ["node", "/home/node/app/dist/index.js"] \ No newline at end of file