From cd875bd0f97182e2c8d33472faf2bcc0c41e50d2 Mon Sep 17 00:00:00 2001 From: Joe-Dowd Date: Sun, 5 Jul 2020 04:37:57 +0100 Subject: [PATCH 1/4] docker --- Dockerfile | 9 +++++++++ entrypoint.sh | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 Dockerfile create mode 100644 entrypoint.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b32fe20 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM node:12 +WORKDIR /usr/src/app +COPY package.json . +RUN npm install +COPY index.js . +COPY src . +COPY entrypoint.sh . +EXPOSE 8080 +ENTRYPOINT ./entrypoint.sh \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000..516cdfc --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,4 @@ +#!bin/bash +set -e +cp /etc/config.json . +node index.js \ No newline at end of file From b03daa3c710e45526a4f19429857a9ed101d8244 Mon Sep 17 00:00:00 2001 From: Joe-Dowd Date: Sun, 5 Jul 2020 04:40:56 +0100 Subject: [PATCH 2/4] executable entrypoint --- entrypoint.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 entrypoint.sh diff --git a/entrypoint.sh b/entrypoint.sh old mode 100644 new mode 100755 From 9a168aae456fb283b5365407a78fdbec01cb111b Mon Sep 17 00:00:00 2001 From: Joe-Dowd Date: Sun, 5 Jul 2020 05:09:06 +0100 Subject: [PATCH 3/4] change mount point for config --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 516cdfc..f6d846f 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,4 @@ #!bin/bash set -e -cp /etc/config.json . +cp /etc/sponsorblock/config.json . node index.js \ No newline at end of file From 8e89d2bf92cba6eecc56204bb117386134db85a5 Mon Sep 17 00:00:00 2001 From: Joe-Dowd Date: Sun, 5 Jul 2020 09:25:57 +0100 Subject: [PATCH 4/4] Added default config for docker --- Dockerfile | 4 ++-- entrypoint.sh | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b32fe20..efca3de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ WORKDIR /usr/src/app COPY package.json . RUN npm install COPY index.js . -COPY src . +COPY src src COPY entrypoint.sh . EXPOSE 8080 -ENTRYPOINT ./entrypoint.sh \ No newline at end of file +CMD ./entrypoint.sh \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh index f6d846f..5e14a9e 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,39 @@ -#!bin/bash +#!/bin/bash set -e -cp /etc/sponsorblock/config.json . +echo 'Entrypoint script' +cd /usr/src/app +cp /etc/sponsorblock/config.json . || cat < config.json +{ + "port": 8080, + "mysql": { + "host": "127.0.0.1", + "port": 3306, + "database": "sponsorblock", + "user": "sponsorblock", + "password": "sponsorblock" + }, + "privateMysql": { + "host": "127.0.0.1", + "port": 3306, + "database": "sponsorblock_private", + "user": "sponsorblock", + "password": "sponsorblock" + }, + "globalSalt": "", + "adminUserID": "", + "youtubeAPIKey": "", + "discordReportChannelWebhookURL": null, + "discordFirstTimeSubmissionsWebhookURL": null, + "discordAutoModWebhookURL": null, + "behindProxy": true, + "db": null, + "privateDB": null, + "createDatabaseIfNotExist": true, + "schemaFolder": null, + "dbSchema": null, + "privateDBSchema": null, + "mode": "development", + "readOnly": false +} +EOF node index.js \ No newline at end of file