From 50d64ae23b285e19e1f95e8bf8b5d13c52322dd5 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 5 Jul 2023 21:45:05 +0100
Subject: [PATCH] refactor: update Dockerfile for Ubuntu 18.04, 20.04, and
22.04
- Refactored the Dockerfile for Ubuntu 18.04, 20.04, and 22.04.
- Replaced `wget` with `curl` to download linuxgsm.sh.
- Updated package installation by replacing `vim` with `nvim`.
- Updated README.md to reflect changes in the base LinuxGSM image.
Co-authored-by: [Author Name]
---
Dockerfile.ubuntu-1804 | 2 +-
Dockerfile.ubuntu-2004 | 2 +-
Dockerfile.ubuntu-2204 | 4 ++--
README.md | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Dockerfile.ubuntu-1804 b/Dockerfile.ubuntu-1804
index 8538236..3f9bac1 100644
--- a/Dockerfile.ubuntu-1804
+++ b/Dockerfile.ubuntu-1804
@@ -102,7 +102,7 @@ HEALTHCHECK --interval=1m --timeout=1m --start-period=2m --retries=1 CMD /app/en
## Download linuxgsm.sh
RUN echo "**** Download linuxgsm.sh ****" \
&& set -ex \
- && wget -O linuxgsm.sh "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${LGSM_GITHUBBRANCH}/linuxgsm.sh" \
+ && curl -Lo linuxgsm.sh "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${LGSM_GITHUBBRANCH}/linuxgsm.sh" \
&& chmod +x linuxgsm.sh
RUN echo "**** Get LinuxGSM Modules ****" \
diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004
index 88d4bef..521cf5c 100644
--- a/Dockerfile.ubuntu-2004
+++ b/Dockerfile.ubuntu-2004
@@ -102,7 +102,7 @@ HEALTHCHECK --interval=1m --timeout=1m --start-period=2m --retries=1 CMD /app/en
## Download linuxgsm.sh
RUN echo "**** Download linuxgsm.sh ****" \
&& set -ex \
- && wget -O linuxgsm.sh "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${LGSM_GITHUBBRANCH}/linuxgsm.sh" \
+ && curl -Lo linuxgsm.sh "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${LGSM_GITHUBBRANCH}/linuxgsm.sh" \
&& chmod +x linuxgsm.sh
RUN echo "**** Get LinuxGSM Modules ****" \
diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204
index b5c3d2e..9fc9347 100644
--- a/Dockerfile.ubuntu-2204
+++ b/Dockerfile.ubuntu-2204
@@ -61,7 +61,7 @@ RUN echo "**** Install Base LinuxGSM Requirements ****" \
iproute2 \
iputils-ping \
nano \
- vim \
+ nvim \
&& apt-get -y autoremove \
&& apt-get -y clean \
&& rm -rf /var/lib/apt/lists/* \
@@ -102,7 +102,7 @@ HEALTHCHECK --interval=1m --timeout=1m --start-period=2m --retries=1 CMD /app/en
## Download linuxgsm.sh
RUN echo "**** Download linuxgsm.sh ****" \
&& set -ex \
- && wget -O linuxgsm.sh "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${LGSM_GITHUBBRANCH}/linuxgsm.sh" \
+ && curl -o linuxgsm.sh "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${LGSM_GITHUBBRANCH}/linuxgsm.sh" \
&& chmod +x linuxgsm.sh
RUN echo "**** Get LinuxGSM Modules ****" \
diff --git a/README.md b/README.md
index 816e3e8..482b878 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# LinuxGSM Docker Image
+# LinuxGSM Base Docker Image
## This is the base LinuxGSM image only.
## Use <a href="https://github.com/GameServerManagers/docker-gameserver">docker-gameserver</a> for full game servers