From cdae876e4db3ccb982d3e9b83d4c0cdd23ba5472 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 18 Feb 2024 00:16:52 +0000 Subject: [PATCH] chore: deprecate Ubuntu 18.04 as not used by any LinuxGSM images a --- .github/workflows/docker-publish.yml | 42 +------- Dockerfile.ubuntu-1804 | 141 --------------------------- README.md | 1 - 3 files changed, 1 insertion(+), 183 deletions(-) delete mode 100644 Dockerfile.ubuntu-1804 diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index bcf940f..1ce37df 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -94,49 +94,9 @@ jobs: gameservermanagers/linuxgsm:ubuntu-20.04 ghcr.io/gameservermanagers/linuxgsm:ubuntu-20.04 - build-ubuntu-1804: - name: Build Ubuntu 18.04 - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup QEMU - uses: docker/setup-qemu-action@v3 - - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v3.0.0 - - - name: Build - run: docker build -t gameservermanagers/linuxgsm:ubuntu-18.04 -f ./Dockerfile.ubuntu-1804 . - - - name: Login to DockerHub - uses: docker/login-action@v3.0.0 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3.0.0 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push (Ubuntu 18.04) - uses: docker/build-push-action@v5.1.0 - with: - context: . - file: ./Dockerfile.ubuntu-1804 - platforms: linux/amd64 - push: true - tags: | - gameservermanagers/linuxgsm:ubuntu-18.04 - ghcr.io/gameservermanagers/linuxgsm:ubuntu-18.04 - package-cleanup: name: Cleanup Old GitHub Packages - needs: [ build-ubuntu-1804, build-ubuntu-2004, build-ubuntu-2204 ] + needs: [ build-ubuntu-2004, build-ubuntu-2204 ] runs-on: ubuntu-latest steps: - name: Delete Package Versions diff --git a/Dockerfile.ubuntu-1804 b/Dockerfile.ubuntu-1804 deleted file mode 100644 index 2496544..0000000 --- a/Dockerfile.ubuntu-1804 +++ /dev/null @@ -1,141 +0,0 @@ -# -# LinuxGSM Base Dockerfile -# -# https://github.com/GameServerManagers/docker-linuxgsm -# - -FROM gameservermanagers/steamcmd:ubuntu-18.04 - -LABEL maintainer="LinuxGSM " -ENV DEBIAN_FRONTEND noninteractive -ENV TERM=xterm -ENV LGSM_GITHUBUSER=GameServerManagers -ENV LGSM_GITHUBREPO=LinuxGSM -ENV LGSM_GITHUBBRANCH=master -ENV LGSM_LOGDIR=/data/log -ENV LGSM_SERVERFILES=/data/serverfiles -ENV LGSM_DATADIR=/data/data -ENV LGSM_CONFIG=/data/config-lgsm -ENV LGSM_DEV=false -ENV GAMESERVER=jc2server -ENV UPDATE_CHECK=60 -ENV USER=linuxgsm -ENV UID=1000 -ENV GID=1000 - -SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -## Install Base LinuxGSM Requirements -RUN echo "**** Install Base LinuxGSM Requirements ****" \ - && apt-get update \ - && apt-get install -y software-properties-common \ - && add-apt-repository multiverse \ - && add-apt-repository ppa:git-core/ppa \ - && apt-get update \ - && apt-get install -y \ - bc \ - binutils \ - bsdmainutils \ - bzip2 \ - ca-certificates \ - cpio \ - cron \ - curl \ - distro-info \ - file \ - git \ - gosu \ - gzip \ - hostname \ - jq \ - lib32gcc1 \ - lib32stdc++6 \ - netcat \ - python3 \ - sudo \ - tar \ - tmux \ - unzip \ - util-linux \ - uuid-runtime \ - wget \ - xz-utils \ - # Docker Extras - iproute2 \ - iputils-ping \ - nano \ - vim \ - && apt-get -y autoremove \ - && apt-get -y clean \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf /tmp/* \ - && rm -rf /var/tmp/* - -# Install Node.js -RUN echo "**** Install Node.js ****" \ - && set -uex \ - && mkdir -p /etc/apt/keyrings \ - && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ - && NODE_MAJOR=16 \ - && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \ - && apt-get update \ - && apt-get install nodejs -y \ - && apt-get -y autoremove \ - && apt-get -y clean \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf /tmp/* \ - && rm -rf /var/tmp/* \ - && npm install -g npm@latest - -# Install GameDig https://docs.linuxgsm.com/requirements/gamedig -RUN echo "**** Install GameDig ****" \ - && npm install -g gamedig@4.3.1 -WORKDIR /app/lgsm \ - wget -N --no-check-certificate "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${LGSM_GITHUBBRANCH}/package.json" \ - && npm install - -WORKDIR /app - -## Add linuxgsm user -RUN echo "**** Add linuxgsm user ****" \ - && mkdir /data \ - # Create the user - && groupadd --gid $GID $USER \ - && useradd --uid $UID --gid $GID -m $USER \ - # - # [Optional] Add sudo support. Omit if you don't need to install software after connecting. - && echo $USER ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USER \ - && chmod 0440 /etc/sudoers.d/$USER \ - && chown $USER:$USER /data - -HEALTHCHECK --interval=1m --timeout=1m --start-period=2m --retries=1 CMD /app/entrypoint-healthcheck.sh || exit 1 - -## Download linuxgsm.sh -RUN echo "**** Download linuxgsm.sh ****" \ - && set -ex \ - && curl -Lo linuxgsm.sh "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${LGSM_GITHUBBRANCH}/linuxgsm.sh" \ - && chmod +x linuxgsm.sh - -RUN echo "**** Get LinuxGSM Modules ****" \ - && git clone --filter=blob:none --no-checkout --sparse https://github.com/GameServerManagers/LinuxGSM.git \ - && cd LinuxGSM \ - && git sparse-checkout set --cone \ - && git sparse-checkout set lgsm/modules \ - && git checkout ${LGSM_GITHUBBRANCH} \ - && mkdir -p /app/lgsm/modules \ - && mv lgsm/modules/* /app/lgsm/modules \ - && chmod +x /app/lgsm/modules/* \ - && cd ../ \ - && rm -rf LinuxGSM \ - && chown -R $USER:$USER /app - -ARG CACHEBUST=1 -RUN echo "$CACHEBUST" - -COPY entrypoint.sh /app/entrypoint.sh -COPY entrypoint-user.sh /app/entrypoint-user.sh -COPY entrypoint-healthcheck.sh /app/entrypoint-healthcheck.sh - -RUN date > /build-time.txt - -ENTRYPOINT ["/bin/bash", "./entrypoint.sh"] diff --git a/README.md b/README.md index 482b878..7c4d910 100644 --- a/README.md +++ b/README.md @@ -21,4 +21,3 @@ LinuxGSM is a command-line tool for quick, simple deployment and management of L - `latest`, `ubuntu` - Latest Ubuntu LTS release - `ubuntu-22.04` - Ubuntu 22.04 LTS 'Jammy Jackalope' - `ubuntu-20.04` - Ubuntu 20.04 LTS 'Focal Fossa' -- `ubuntu-18.04` - Ubuntu 18.04 LTS 'Bionic Beaver'