From 8bafb174d224972a85bfe6fcde7795b3ab3beba8 Mon Sep 17 00:00:00 2001 From: Nathan Caldwell Date: Sun, 20 Sep 2015 17:53:13 -0600 Subject: [PATCH 1/3] Fix ini creation because of missing backslash --- scripts/docker-ts3.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker-ts3.sh b/scripts/docker-ts3.sh index 7231d7b..0f4b090 100644 --- a/scripts/docker-ts3.sh +++ b/scripts/docker-ts3.sh @@ -34,7 +34,7 @@ else query_ip_whitelist="/teamspeak3/query_ip_whitelist.txt" \ query_ip_backlist="/teamspeak3/query_ip_blacklist.txt" \ logpath="/teamspeak3/logs/" \ - licensepath="/teamspeak3/" + licensepath="/teamspeak3/" \ inifile="/teamspeak3/ts3server.ini" \ createinifile=1 fi From b9a878e508494d140fcd62fe66b952e7f20f444e Mon Sep 17 00:00:00 2001 From: Nathan Caldwell Date: Sun, 20 Sep 2015 17:58:48 -0600 Subject: [PATCH 2/3] Use 'tar -C' instead of 'cd && tar' to extract the server --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f8417f9..e1d96ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ VOLUME ["/teamspeak3"] # Download TS3 file and extract it into /opt. ADD ${TEAMSPEAK_URL} /opt/ -RUN cd /opt && tar -xzf /opt/teamspeak3-server_linux-amd64-3*.tar.gz +RUN tar -C /opt -xzf /opt/teamspeak3-server_linux-amd64-3*.tar.gz ADD /scripts/ /opt/scripts/ RUN chmod -R 774 /opt/scripts/ From 6b955a6bcac9d8d8ef72d018b847e8d31e025d8a Mon Sep 17 00:00:00 2001 From: Nathan Caldwell Date: Sun, 20 Sep 2015 17:59:32 -0600 Subject: [PATCH 3/3] Cleanup tar archive after extracting it --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index e1d96ad..ce70109 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,9 @@ RUN tar -C /opt -xzf /opt/teamspeak3-server_linux-amd64-3*.tar.gz ADD /scripts/ /opt/scripts/ RUN chmod -R 774 /opt/scripts/ +# Cleanup +RUN rm -f /opt/teamspeak3-server_linux-amd64-3*.tar.gz + ENTRYPOINT ["/opt/scripts/docker-ts3.sh"] #CMD ["-w", "/teamspeak3/query_ip_whitelist.txt", "-b", "/teamspeak3/query_ip_blacklist.txt", "-o", "/teamspeak3/logs/", "-l", "/teamspeak3/"]