From ce9eb50e0bc9d8bf42430c6fb05b28f9f0a0f179 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 11 Sep 2023 22:45:56 +0100
Subject: [PATCH] feat: Add LGSM_DATADIR environment variable
This commit adds the LGSM_DATADIR environment variable to the Dockerfiles and entrypoint.sh script. The variable is set to "/data/data" in all three Dockerfiles, and it is exported in the entrypoint.sh script. This allows for easy configuration of the data directory path for LinuxGSM.
---
Dockerfile.ubuntu-1804 | 3 ++-
Dockerfile.ubuntu-2004 | 1 +
Dockerfile.ubuntu-2204 | 1 +
entrypoint.sh | 2 ++
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Dockerfile.ubuntu-1804 b/Dockerfile.ubuntu-1804
index f1509f5..555446f 100644
--- a/Dockerfile.ubuntu-1804
+++ b/Dockerfile.ubuntu-1804
@@ -14,6 +14,7 @@ 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 GAMESERVER=jc2server
ENV UPDATE_CHECK=1800
@@ -31,13 +32,13 @@ RUN echo "**** Install Base LinuxGSM Requirements ****" \
&& add-apt-repository ppa:git-core/ppa \
&& apt-get update \
&& apt-get install -y \
- cron \
bc \
binutils \
bsdmainutils \
bzip2 \
ca-certificates \
cpio \
+ cron \
curl \
distro-info \
file \
diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004
index 4bfe593..1b8ecea 100644
--- a/Dockerfile.ubuntu-2004
+++ b/Dockerfile.ubuntu-2004
@@ -14,6 +14,7 @@ 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 GAMESERVER=jc2server
ENV UPDATE_CHECK=1800
diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204
index 679f936..ba62507 100644
--- a/Dockerfile.ubuntu-2204
+++ b/Dockerfile.ubuntu-2204
@@ -14,6 +14,7 @@ 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 GAMESERVER=jc2server
ENV UPDATE_CHECK=1800
diff --git a/entrypoint.sh b/entrypoint.sh
index 7cfa8e6..b1742b8 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -30,6 +30,7 @@ echo -e "LGSM_GITHUBREPO: ${LGSM_GITHUBREPO}"
echo -e "LGSM_GITHUBBRANCH: ${LGSM_GITHUBBRANCH}"
echo -e "LGSM_LOGDIR: ${LGSM_LOGDIR}"
echo -e "LGSM_SERVERFILES: ${LGSM_SERVERFILES}"
+echo -e "LGSM_DATADIR: ${LGSM_DATADIR}"
echo -e "LGSM_CONFIG: ${LGSM_CONFIG}"
echo -e ""
@@ -41,6 +42,7 @@ export LGSM_GITHUBREPO=${LGSM_GITHUBREPO}
export LGSM_GITHUBBRANCH=${LGSM_GITHUBBRANCH}
export LGSM_LOGDIR=${LGSM_LOGDIR}
export LGSM_SERVERFILES=${LGSM_SERVERFILES}
+export LGSM_DATADIR=${LGSM_DATADIR}
export LGSM_CONFIG=${LGSM_CONFIG}
cd /app || exit