icedream
/
ts3bot
mirror of https://github.com/icedream/ts3bot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into space 

Conflicts:
	Dockerfile
pull/3/head
Icedream 2015-10-24 11:03:08 +02:00
parent 14623b59cc b0feeb7fe6
commit 144e10763d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,7 +1,7 @@
FROM phusion/passenger-nodejs:0.9.17 FROM phusion/passenger-nodejs:0.9.17
ENV TS3CLIENT_VERSION 3.0.18.2 ENV TS3CLIENT_VERSION 3.0.18.2
ENV TS3BOT_COMMIT 6695fbd83ee07677e6ef920d7687de6a24011d90 ENV TS3BOT_COMMIT 1892b56e4cffc583e7faa1ca7fe7cf2534b30c1b
ADD setup.sh / ADD setup.sh /
RUN sh /setup.sh RUN sh /setup.sh