Adds instance support to docker

.editorconfig

@@ -1,13 +1,13 @@
-# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs.
-# Atom: Please assure your Atom's config setting Tab Type is set to auto, otherwise Atom-EditorConfig may not work as expected. Also disable whitespace package.
-# http://editorconfig.org/
-
-root = true
-
-[*]
-charset = utf-8
-indent_style = tab
-indent_size = 4
-trim_trailing_whitespace = true
-end_of_line = lf
+# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs.
+# Atom: Please assure your Atom's config setting Tab Type is set to auto, otherwise Atom-EditorConfig may not work as expected. Also disable whitespace package.
+# http://editorconfig.org/
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+end_of_line = lf
 insert_final_newline = true

.github/workflows/docker-image.yml

@@ -0,0 +1,33 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout 
+        uses: actions/checkout@v3
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Build and push
+        uses: docker/[email protected]
+        with:
+          context: .
+          platforms: linux/amd64
+          file: ./Dockerfile
+          push: true
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/linuxgsm-docker:latest

Dockerfile

@@ -1,133 +1,14 @@
-#
-# LinuxGSM Base Dockerfile
-#
-# https://github.com/GameServerManagers/LinuxGSM-Docker
-#
-
-FROM ubuntu:20.04
-
-LABEL maintainer="LinuxGSM <[email protected]>"
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV TERM=xterm
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-# Install UTF-8 unicode
-RUN echo "**** Install UTF-8 ****" \
-    && 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
-
-## Upgrade Ubuntu
-RUN echo "**** apt upgrade ****" \
-    && apt-get update; \
-    apt-get upgrade -y
-
-## Install Base LinuxGSM Requirements
-RUN echo "**** Install Base LinuxGSM Requirements ****" \
-    && apt-get update \
-    && apt-get install -y software-properties-common \
-    && add-apt-repository multiverse \
-    && apt-get update \
-    && apt-get install -y \
-    bc \
-    binutils \
-    bsdmainutils \
-    bzip2 \
-    ca-certificates \
-	cron \
-    cpio \
-    curl \
-    distro-info \
-    file \
-    gzip \
-    hostname \
-    jq \
-    lib32gcc1 \
-    lib32stdc++6 \
-    netcat \
-    python3 \
-    tar \
-    tmux \
-    unzip \
-    util-linux \
-    wget \
-    xz-utils \
-    # Docker Extras
-    cron \
-    iproute2 \
-    iputils-ping \
-    nano \
-    vim \
-    sudo \
-    tini
-
-# Install SteamCMD
-RUN echo "**** 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 libsdl2-2.0-0:i386 steamcmd \
-    && ln -s /usr/games/steamcmd /usr/bin/steamcmd
-
-# Install NodeJS
-RUN echo "**** Install NodeJS ****" \
-    && curl -sL https://deb.nodesource.com/setup_16.x | bash - \
-    && apt-get update && apt-get install -y nodejs
-
-# Install GameDig https://docs.linuxgsm.com/requirements/gamedig
-RUN echo "**** Install GameDig ****" \
-    && npm install -g gamedig
-
-# Install Cleanup
-RUN echo "**** Cleanup ****"  \
-    && apt-get -y autoremove \
-    && apt-get -y clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && rm -rf /tmp/* \
-    && rm -rf /var/tmp/*
-
-##Need use xterm for LinuxGSM##
-
-ENV DEBIAN_FRONTEND noninteractive
-
-ARG USERNAME=linuxgsm
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-
-## Add linuxgsm user
-RUN echo "**** Add linuxgsm user ****" \
-# Create the user
-    && groupadd --gid $USER_GID $USERNAME \
-    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
-    #
-    # [Optional] Add sudo support. Omit if you don't need to install software after connecting.
-    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
-    && chmod 0440 /etc/sudoers.d/$USERNAME \
-    && chown $USERNAME:$USERNAME /home/$USERNAME
-
-# Create /opt/linuxgsm
-#RUN echo "**** Create /opt/linuxgsm ****" \
-#    && mkdir -p /opt/linuxgsm \
-#    && chown linuxgsm:linuxgsm /opt/linuxgsm
-
-## Download linuxgsm.sh
-RUN echo "**** Download linuxgsm.sh ****" \
-    && set -ex \
-    && wget -O linuxgsm.sh https://linuxgsm.sh \
-    && chmod +x /linuxgsm.sh
-
-WORKDIR /home/linuxgsm
-ENV PATH=$PATH:/home/linuxgsm
-USER linuxgsm
-
-# Add LinuxGSM cronjobs
-RUN (crontab -l 2>/dev/null; echo "*/5 * * * * /home/linuxgsm/*server monitor > /dev/null 2>&1") | crontab -
-RUN (crontab -l 2>/dev/null; echo "*/30 * * * * /home/linuxgsm/*server update > /dev/null 2>&1") | crontab -
-RUN (crontab -l 2>/dev/null; echo "0 1 * * 0 /home/linuxgsm/*server update-lgsm > /dev/null 2>&1") | crontab -
-
-COPY entrypoint.sh /home/linuxgsm/entrypoint.sh
-
-ENTRYPOINT [ "/usr/bin/tini", "--" ]
-CMD [ "bash","./entrypoint.sh" ]
+#
+# LinuxGSM Base Dockerfile
+#
+# https://github.com/GameServerManagers/LinuxGSM-Docker
+#
+
+FROM gameservermanagers/linuxgsm-docker:latest
+
+LABEL maintainer="Rasmus Koit <[email protected]>"
+
+COPY entrypoint.sh /home/linuxgsm/entrypoint.sh
+
+ENTRYPOINT [ "/usr/bin/tini", "--" ]
+CMD [ "bash","./entrypoint.sh" ]

LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2017-2022 Daniel Gibbs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2017-2022 Daniel Gibbs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.