Complete rework

.dockerignore

@@ -1,2 +1,7 @@
-live/
+tests/
+.gitignore
+docker-compose.yml
+LICENSE
+linuxgsm-docker.sh
 README.md
+

.gitignore

@@ -1 +1,4 @@
 *~
+tests/results
+**/*.log
+tests/steam_test_credentials

Dockerfile

@@ -1,102 +1,79 @@
-#
-# LinuxGSM Base Dockerfile
-#
-# https://github.com/GameServerManagers/LinuxGSM-Docker
-#
-
-FROM ubuntu:20.04
-
-LABEL maintainer="LinuxGSM <[email protected]>"
-
-ENV DEBIAN_FRONTEND noninteractive
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-RUN set -ex; \
-apt-get update; \
-apt-get install -y locales; \
-rm -rf /var/lib/apt/lists/*; \
-localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-
-RUN apt-get update \
-    && apt-get install -y locales apt-utils debconf-utils
-RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-
-## Base System
-RUN apt-get update; \
-    apt-get upgrade -y
-
-RUN apt-get update \
-    && apt-get install -y software-properties-common \
-    && add-apt-repository multiverse \
-    && apt-get update \
-    && apt-get install -y \
-    sudo \
-    curl \
-    wget \
-    file \
-    tar \
-    bzip2 \
-    gzip \
-    unzip \
-    cpio \
-    bsdmainutils \
-    python \
-    util-linux \
-    ca-certificates \
-    binutils \
-    bc \
-    jq \
-    tmux \
-    netcat \
-    lib32gcc1 \
-    lib32stdc++6 \
-    iproute2 \
-    nano \
-    iputils-ping \
-
-# Install SteamCMD
-&& echo steam steam/question select "I AGREE" | debconf-set-selections \
-&& echo steam steam/license note '' | debconf-set-selections \
-&& dpkg --add-architecture i386 \
-&& apt-get update -y \
-&& apt-get install -y --no-install-recommends ca-certificates locales steamcmd \
-
-# Install Gamedig https://docs.linuxgsm.com/requirements/gamedig
-&& curl -sL https://deb.nodesource.com/setup_16.x | bash - \
-&& apt-get update && apt-get install -y nodejs \
-&& npm install -g gamedig \
-
-# Cleanup
-&& apt-get -y autoremove \
-&& apt-get -y clean \
-&& rm -rf /var/lib/apt/lists/* \
-&& rm -rf /tmp/* \
-&& rm -rf /var/tmp/*
-
-## user config
-RUN adduser \
---disabled-login \
---disabled-password \
---shell /bin/bash \
---gecos "" \
-linuxgsm \
-&& usermod -G tty linuxgsm \
-&& echo "linuxgsm ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
-&& chown -R linuxgsm:linuxgsm /home/linuxgsm \
-
-## linuxgsm.sh
-RUN set -ex; \
-mkdir /opt/linuxgsm; \
-chown linuxgsm:linuxgsm /opt/linuxgsm; \
-wget -O /opt/linuxgsm/linuxgsm.sh https://linuxgsm.sh; \
-chmod +x /opt/linuxgsm/linuxgsm.sh
-
-USER linuxgsm
-
-WORKDIR /home/linuxgsm
-
-# need use xterm for LinuxGSM
-ENV TERM=xterm
-
-## Docker Details
-ENV PATH=$PATH:/home/linuxgsm
+# download / build / verify dependencies
+# own stage = additional deps needed which are only here used
+FROM ubuntu:21.04 as dependencyStage
+
+COPY setup/installGosu.sh \
+     setup/installSupercronic.sh \
+     /
+RUN set -eux; \
+    ./installGosu.sh 1.14; \
+    ./installSupercronic.sh v0.1.12 8d3a575654a6c93524c410ae06f681a3507ca5913627fa92c7086fd140fa12ce
+
+# create linuxgsm image
+# this stage should be usable by existing developers
+FROM ubuntu:21.04 as linuxgsm
+
+ARG ARG_LGSM_VERSION="master"
+ENV LGSM_VERSION="${ARG_LGSM_VERSION:?}" \
+    LGSM_GAMESERVER="" \
+    LGSM_CONFIG_PATTERN_GAME="" \
+    USER_ID="750" \
+    GROUP_ID="750" \
+    LGSM_DEBUG="false" \
+    \
+    USER_NAME="linuxgsm" \
+    LGSM_PATH="/home/linuxgsm" \
+    LGSM_SCRIPTS="/home/linuxgsm-scripts" \
+    PATH="$PATH:/home/linuxgsm-scripts/" \
+    LANG="en_US.UTF-8" \
+    LANGUAGE="en_US.UTF-8" \
+    LC_ALL="en_US.UTF-8" \
+    TERM="xterm" \
+    SUPERCRONIC_CONFIG="/home/linuxgsm-scripts/cron.config" \
+    LGSM_STARTED="/home/linuxgsm/server.started"
+
+COPY --from=dependencyStage \
+     /usr/local/bin/gosu \
+     /usr/local/bin/supercronic \
+     /usr/local/bin/
+COPY setup/installMinimalDependencies.sh \
+     setup/setupUser.sh \
+     setup/installLGSM.sh \
+     setup/installGamedig.sh \
+     setup/cleanImage.sh \
+     setup/installDependencies.sh \
+     setup/createAlias.sh \
+     setup/entrypoint.sh \
+     \
+     commands/lgsm-cron-init \
+     commands/lgsm-cron-start \
+     commands/lgsm-init \
+     commands/lgsm-fix-permission \
+     commands/lgsm-load-config \
+     commands/lgsm-tmux-attach \
+     commands/lgsm-update-uid-gid \
+     "$LGSM_SCRIPTS"/
+
+RUN set -eux; \
+    installMinimalDependencies.sh; \
+    setupUser.sh; \
+    installLGSM.sh; \
+    installGamedig.sh; \
+    cleanImage.sh
+
+VOLUME "$LGSM_PATH"
+WORKDIR "$LGSM_PATH"
+
+# install server specific dependencies
+FROM linuxgsm as specific
+ARG ARG_LGSM_GAMESERVER=""
+ENV LGSM_GAMESERVER="${ARG_LGSM_GAMESERVER:?}"
+RUN set -eux; \
+    installDependencies.sh "$LGSM_GAMESERVER"; \
+    createAlias.sh "$LGSM_GAMESERVER"; \
+    cleanImage.sh
+
+HEALTHCHECK --start-period=3600s --interval=60s --timeout=900s --retries=3 \
+    CMD [ -f "$LGSM_STARTED" ] && lgsm-monitor || exit 1
+
+ENTRYPOINT ["./../linuxgsm-scripts/entrypoint.sh"]

commands/lgsm-cron-init

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+if "$LGSM_DEBUG"; then
+    set -o xtrace
+fi
+
+LOG="$LGSM_PATH/log/cron.log"
+gosu "$USER_NAME" mkdir -p "$(dirname "$LOG")"
+gosu "$USER_NAME" touch "$LOG"
+
+echo "0 0 * * * [ \"$(du -s "$LOG" | grep -oE "^[0-9]*")\" -gt 1000 ] && savelog -c 3 '$LOG'" > "$SUPERCRONIC_CONFIG"
+# allow every CRON_ variable as cronjob
+for cron_var in $(env | grep -Eo '^CRON_[^=]*'); do
+    eval echo "\"\$$cron_var >> '$LOG'\"" >> "$SUPERCRONIC_CONFIG"
+done
+chown "$USER_NAME:$USER_NAME" "$SUPERCRONIC_CONFIG"
+
+gosu "$USER_NAME" supercronic -test -debug "$SUPERCRONIC_CONFIG"

commands/lgsm-cron-start

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+if "$LGSM_DEBUG"; then
+    set -o xtrace
+fi
+
+gosu "$USER_NAME" supercronic -debug "$SUPERCRONIC_CONFIG"

commands/lgsm-fix-permission

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+if "$LGSM_DEBUG"; then
+    set -o xtrace
+fi
+
+# only volume needs to be fixed, everything else can be fixed by recreating the container
+
+GROUP_NAME="$USER_NAME"
+chown -R "$USER_NAME:$GROUP_NAME" "$LGSM_PATH"
+chmod 750 "$LGSM_PATH"
+if [ -f "$LGSM_PATH/$LGSM_GAMESERVER" ]; then
+    chmod 750 "$LGSM_PATH/$LGSM_GAMESERVER"
+fi
+chmod -R ug+rw,o= "$LGSM_PATH"

commands/lgsm-init

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+if "$LGSM_DEBUG"; then
+    set -o xtrace
+fi
+
+# is gameserver already installed ?
+# if linuxgsm.sh is changed = update -> remove lgsm folder
+# if linuxgsm.sh isn't there this will also fail -> forced lgsm download
+if ! echo "$(sha256sum "$LGSM_SCRIPTS/linuxgsm.sh" | grep -Eo '^[^ ]*')  linuxgsm.sh" | sha256sum -c > /dev/null 2>&1; then
+    echo "[info][lgsm-init] force uninstall lgsm, either linuxgsm changed or file to determine installed version is removed"
+    rm -rf "lgsm" || true
+fi
+# remove gameserver executable to not install 2nd one 
+rm "$LGSM_GAMESERVER" > /dev/null 2>&1 || true
+
+gosu "$USER_NAME" cp -f "$LGSM_SCRIPTS/linuxgsm.sh" .
+gosu "$USER_NAME" ./linuxgsm.sh "$LGSM_GAMESERVER"