Update Docker files.

Signed-off-by: Carl Kittelberger <icedream@icedream.pw>

.dockerignore

@@ -1,6 +1,7 @@
 .git
-.gitignore
-node_modules
-*.log
-*.ini
-*.md
+**/.gitignore
+Dockerfile
+src/node_modules
+**/*.log
+**/*.ini
+**/*.md

Dockerfile

@@ -10,7 +10,9 @@ RUN mkdir -p /tmp/empty &&\
 	rmdir /tmp/empty
 
 ADD setup.sh /
-RUN sh /setup.sh
+COPY src/ /home/app/src/
+RUN sed -i 's,\r,,g' /setup.sh &&\
+	sh /setup.sh
 
 # Copy over configuration for other daemons
 COPY etc/ /etc

setup.sh

@@ -31,7 +31,7 @@ rm ./ts3client.run
 
 # Install TS3Bot via Git
 npm_config_wcjs_runtime="node" npm_config_wcjs_runtime_version="$(node --version | tr -d 'v')" \
-	npm install --unsafe-perm -g "https://github.com/icedream/ts3bot-control#${TS3BOT_COMMIT}"
+	npm link --unsafe-perm ~app/src
 
 # Fix for youtube-dl
 chmod a+rx "$(dirname "$(readlink -f "$(which ts3bot)")")/node_modules/youtube-dl/bin/youtube-dl"