updated 3.1.0-Beta-1 to newest Dockerfile format

3.1.0/Dockerfile

@@ -1,40 +1,39 @@
-FROM alpine:3.6 AS builder
+FROM alpine:3.7
+
+RUN apk add --no-cache ca-certificates libstdc++ su-exec
+RUN set -eux; \
+ addgroup -g 9987 ts3server; \
+ adduser -u 9987 -Hh /var/ts3server -G ts3server -s /sbin/nologin -D ts3server; \
+ mkdir -p /var/ts3server /var/run/ts3server; \
+ chown ts3server:ts3server /var/ts3server /var/run/ts3server; \
+ chmod 777 /var/ts3server /var/run/ts3server
+
+ENV PATH "${PATH}:/opt/ts3server"
 
-ARG TEAMSPEAK_VERSION=3.1.0.0
 ARG TEAMSPEAK_CHECKSUM=e32bf1af76654ce51fc0a3560385a247c36d682eeac1979649d522a88fef9d9c
 ARG TEAMSPEAK_URL=http://dl.4players.de/ts/releases/pre_releases/server/3.1.0-Beta-1/teamspeak3-server_linux_alpine-3.1.0.tar.bz2
 
-RUN apk add --update tar ca-certificates
-
-# download and unpack ts3server
-RUN wget "${TEAMSPEAK_URL}" -O server.tar.bz2
-RUN echo "${TEAMSPEAK_CHECKSUM}  server.tar.bz2" | sha256sum -c -
-RUN mkdir -p /opt/ts3server
-RUN tar -xf server.tar.bz2 --strip-components=1 -C /opt/ts3server
-
-COPY entrypoint.sh /opt/ts3server
-
-FROM alpine:latest
-
-COPY --from=builder /opt/ts3server /opt/ts3server
+RUN set -eux; \
+ apk add --no-cache --virtual .fetch-deps tar; \
+ wget "${TEAMSPEAK_URL}" -O server.tar.bz2; \
+ echo "${TEAMSPEAK_CHECKSUM} *server.tar.bz2" | sha256sum -c -; \
+ mkdir -p /opt/ts3server; \
+ tar -xf server.tar.bz2 --strip-components=1 -C /opt/ts3server; \
+ rm server.tar.bz2; \
+ apk del .fetch-deps; \
+ mv /opt/ts3server/*.so /opt/ts3server/redist/* /usr/local/lib; \
+ ldconfig /usr/local/lib; \
+ chown -R ts3server:ts3server /opt/ts3server
 
 # setup directory where user data is stored
 VOLUME /var/ts3server/
 WORKDIR /var/ts3server/
 
-# install depencies, and add ts3server user/group
-RUN apk add --no-cache libstdc++ ca-certificates su-exec \
- && mv /opt/ts3server/*.so /opt/ts3server/redist/* /usr/local/lib && ldconfig /usr/local/lib \
- && addgroup ts3server \
- && adduser -Hh /var/ts3server -G ts3server -s /sbin/nologin -D ts3server \
- && chown -R ts3server:ts3server /opt/ts3server /var/ts3server
-
 #  9987 default voice
 # 10011 server query
 # 30033 file transport
 EXPOSE 9987/udp 10011 30033 
 
-ENV PATH "${PATH}:/opt/ts3server"
-
-ENTRYPOINT [ "/opt/ts3server/entrypoint.sh" ]
+COPY entrypoint.sh /opt/ts3server
+ENTRYPOINT [ "entrypoint.sh" ]
 CMD [ "ts3server" ]

3.1.0/entrypoint.sh

@@ -9,7 +9,7 @@ fi
 
 # have the default inifile as the last parameter
 if [ "$1" = 'ts3server' ]; then
-    set -- "$@" inifile=/opt/ts3server/ts3server.ini
+    set -- "$@" inifile=/var/run/ts3server/ts3server.ini
 fi
 
 # usage: file_env VAR [DEFAULT]
@@ -43,34 +43,30 @@ if [ "$1" = 'ts3server' ]; then
 	file_env 'TS3SERVER_DB_PASSWORD'
 	file_env 'TS3SERVER_DB_NAME'
 	
-	if [ ! -f '/opt/ts3server/ts3server.ini' ]; then
-		cat <<- EOF >/opt/ts3server/ts3server.ini
-			licensepath=${TS3SERVER_LICENSEPATH}
-			query_ip_whitelist=${TS3SERVER_IP_WHITELIST:-query_ip_whitelist.txt}
-			query_ip_blacklist=${TS3SERVER_IP_BLACKLIST:-query_ip_blacklist.txt}
-			dbplugin=${TS3SERVER_DB_PLUGIN:-ts3db_sqlite3}
-			dbpluginparameter=${TS3SERVER_DB_PLUGINPARAMETER:-/opt/ts3server/ts3db.ini}
-			dbsqlpath=${TS3SERVER_DB_SQLPATH:-/opt/ts3server/sql/}
-			dbsqlcreatepath=${TS3SERVER_DB_SQLCREATEPATH:-create_sqlite}
-			dbconnections=${TS3SERVER_DB_CONNECTIONS:-10}
-			dbclientkeepdays=${TS3SERVER_DB_CLIENTKEEPDAYS:-30}
-			logpath=${TS3SERVER_LOG_PATH:-/var/ts3server/logs}
-			logquerycommands=${TS3SERVER_LOG_QUERY_COMMANDS:-0}
-			logappend=${TS3SERVER_LOG_APPEND:-0}
-		EOF
-	fi
-	if [ ! -f '/opt/ts3server/ts3db.ini' ]; then
-		cat <<- EOF >/opt/ts3server/ts3db.ini
-			[config]
-			host='${TS3SERVER_DB_HOST}'
-			port='${TS3SERVER_DB_PORT:-3306}'
-			username='${TS3SERVER_DB_USER}'
-			password='${TS3SERVER_DB_PASSWORD}'
-			database='${TS3SERVER_DB_NAME}'
-			socket=
-			wait_until_ready='${TS3SERVER_DB_WAITUNTILREADY:-30}'
-		EOF
-	fi
+	cat <<- EOF >/var/run/ts3server/ts3server.ini
+		licensepath=${TS3SERVER_LICENSEPATH}
+		query_ip_whitelist=${TS3SERVER_IP_WHITELIST:-query_ip_whitelist.txt}
+		query_ip_blacklist=${TS3SERVER_IP_BLACKLIST:-query_ip_blacklist.txt}
+		dbplugin=${TS3SERVER_DB_PLUGIN:-ts3db_sqlite3}
+		dbpluginparameter=${TS3SERVER_DB_PLUGINPARAMETER:-/var/run/ts3server/ts3db.ini}
+		dbsqlpath=${TS3SERVER_DB_SQLPATH:-/opt/ts3server/sql/}
+		dbsqlcreatepath=${TS3SERVER_DB_SQLCREATEPATH:-create_sqlite}
+		dbconnections=${TS3SERVER_DB_CONNECTIONS:-10}
+		dbclientkeepdays=${TS3SERVER_DB_CLIENTKEEPDAYS:-30}
+		logpath=${TS3SERVER_LOG_PATH:-/var/ts3server/logs}
+		logquerycommands=${TS3SERVER_LOG_QUERY_COMMANDS:-0}
+		logappend=${TS3SERVER_LOG_APPEND:-0}
+	EOF
+	cat <<- EOF >/var/run/ts3server/ts3db.ini
+		[config]
+		host='${TS3SERVER_DB_HOST}'
+		port='${TS3SERVER_DB_PORT:-3306}'
+		username='${TS3SERVER_DB_USER}'
+		password='${TS3SERVER_DB_PASSWORD}'
+		database='${TS3SERVER_DB_NAME}'
+		socket=
+		wait_until_ready='${TS3SERVER_DB_WAITUNTILREADY:-30}'
+	EOF
 fi
 
 exec "$@"