From f50397562ebb201636e3bdb2fdd72e5e1cb18732 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@pm.me>
Date: Sun, 26 Jun 2022 17:55:35 +0200
Subject: [PATCH] Rework image to use s6-overlay to run TMServer and Xaseco

- Adds S6-Overlay
- Bundles Xaseco into the image
---
 Dockerfile | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fb14013..334d726 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,24 @@
-FROM debian:buster-slim 
+FROM php:5.6-alpine
+ARG S6_OVERLAY_VERSION=3.1.1.1
 
-COPY tmserver/ /opt/tmserver
-COPY entrypoint-tmserver.sh /opt/tmserver/
+RUN apk add --no-cache pwgen gettext xmlstarlet bash xz
+RUN docker-php-ext-install mysql
 
-RUN apt update \
-	&& apt install -y pwgen gettext-base xmlstarlet
+COPY tmserver/ /var/lib/tmserver
+COPY xaseco/ /var/lib/xaseco
 
-RUN groupadd trackmania
-RUN useradd -M -g trackmania trackmania
-RUN chown -R trackmania:trackmania /opt/tmserver
-
-USER trackmania
+RUN addgroup -S trackmania && adduser -D -H -S trackmania -G trackmania
+RUN chown -R trackmania:trackmania /var/lib/tmserver /var/lib/xaseco
 
 EXPOSE 5000
 
-CMD ["/opt/tmserver/entrypoint-tmserver.sh"]
+CMD ["/var/lib/tmserver/entrypoint.sh"]
+
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
+RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
+RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
+ENTRYPOINT ["/init"]
+
+RUN touch /etc/s6-overlay/s6-rc.d/user/contents.d/xaseco
+COPY services.d/xaseco/ /etc/s6-overlay/s6-rc.d/xaseco/