From a31c1018c76eba8965ff5eb0b8ec20178ff2be5b Mon Sep 17 00:00:00 2001
From: Daniel afx <daniel.krastev@luckbox.com>
Date: Wed, 23 Mar 2022 03:26:09 +0200
Subject: [PATCH] merge dockerfile

---
 Dockerfile          | 21 ++++++++++++++++++---
 Dockerfile.base     | 18 ------------------
 RedditRadio.js      |  2 +-
 config.example.toml |  8 +-------
 4 files changed, 20 insertions(+), 29 deletions(-)
 delete mode 100644 Dockerfile.base

diff --git a/Dockerfile b/Dockerfile
index 731ef49..25242cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,24 @@
-FROM codecatt/reddit-radio:base
-
-ENV CONFIG_FILE="./config/config.toml"
+FROM node:16-alpine
 
 WORKDIR /app
 
+COPY ./package.json /app/package.json
+
+RUN apk add --no-cache ffmpeg \
+    && apk add --no-cache --virtual .build-deps \
+        g++ \
+        gcc \
+        libgcc \
+        make \
+        autoconf \
+        libtool \
+        automake \
+        python3 \
+    && npm install \
+    && apk del .build-deps
+
+ENV CONFIG_FILE="./config/config.toml"
+
 COPY . /app
 
 CMD ["node", "index.js"]
diff --git a/Dockerfile.base b/Dockerfile.base
deleted file mode 100644
index fa55f3e..0000000
--- a/Dockerfile.base
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM node:16-alpine
-
-WORKDIR /app
-
-COPY ./package.json /app/package.json
-
-RUN apk add --no-cache ffmpeg \
-    && apk add --no-cache --virtual .build-deps \
-        g++ \
-        gcc \
-        libgcc \
-        make \
-        autoconf \
-        libtool \
-        automake \
-        python3 \
-    && npm install \
-    && apk del .build-deps
diff --git a/RedditRadio.js b/RedditRadio.js
index 33a650c..0731341 100644
--- a/RedditRadio.js
+++ b/RedditRadio.js
@@ -352,7 +352,7 @@ class RedditRadio
 
 	onCmdGithub(msg)
 	{
-		msg.channel.send("My code is on Github! :robot: https://github.com/codecat/reddit-radio");
+		msg.channel.send("My code is on Github! :robot: https://github.com/deflax/radiobot");
 	}
 
 	/*
diff --git a/config.example.toml b/config.example.toml
index 5074960..deb5389 100644
--- a/config.example.toml
+++ b/config.example.toml
@@ -4,15 +4,9 @@ timezone = "Europe/Amsterdam"
 logchannel = "647767937054277642"
 dmchannel = "736529983706628146"
 
-#[database]
-#url = "mongodb://localhost:27017"
-#db = "redditradio"
-
 [filter]
 badwords = "(thepiratebay|badwords)"
 
-[[modules.qdance]]
-
 #[[modules.event]]
 #file = "events/Qlimax2019.json"
 
@@ -23,7 +17,7 @@ badwords = "(thepiratebay|badwords)"
 token = "radio_bot_1_token"
 channel = "330121740758024193"
 name = "Q-dance Radio"
-url = "http://audio.true.nl/qdance-hard"
+url = "http://example.net"
 
 [voice]
 passes = 2