From bed72fbe3d18121c4842e2d0a89d5dc4e3b6f373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicente=20Fern=C3=A1ndez=20Guerra?= Date: Wed, 1 Dec 2021 00:10:27 +0100 Subject: [PATCH 01/10] Add user home --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 692ccc7..6df1be7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -87,7 +87,7 @@ RUN apt clean && \ ##############BASE IMAGE############## # Create user -RUN adduser --disabled-password --shell /bin/bash --disabled-login --gecos "" sfserver +RUN adduser -m --disabled-password --shell /bin/bash --disabled-login --gecos "" sfserver # Base dir WORKDIR /home/sfserver From 3b62bdfbc98946513db88ae0ed4e373a67cabb13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicente=20Fern=C3=A1ndez=20Guerra?= Date: Wed, 1 Dec 2021 00:29:21 +0100 Subject: [PATCH 02/10] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6df1be7..7caaf7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -87,7 +87,7 @@ RUN apt clean && \ ##############BASE IMAGE############## # Create user -RUN adduser -m --disabled-password --shell /bin/bash --disabled-login --gecos "" sfserver +RUN adduser --disabled-password --shell /bin/bash --disabled-login --gecos "" sfserver # Base dir WORKDIR /home/sfserver @@ -112,4 +112,4 @@ EXPOSE 15777/udp 15000/udp 7777/udp #Shared folders to host VOLUME /home/sfserver/serverfiles/ /home/sfserver/log/ /home/sfserver/lgsm/backup/ /home/sfserver/lgsm/config-lgsm/sfserver/ /home/sfserver/.config/Epic/FactoryGame/Saved/SaveGames ##############EXTRA CONFIG############## -ENTRYPOINT ["/home/sfserver/user.sh", "/home/sfserver/install.sh"] +CMD ["/home/sfserver/user.sh", "/home/sfserver/install.sh"] From 6a5fa9cc304adba93f720312845e0fbd8c3d9b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicente=20Fern=C3=A1ndez=20Guerra?= Date: Wed, 1 Dec 2021 00:31:24 +0100 Subject: [PATCH 03/10] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7caaf7f..692ccc7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,4 +112,4 @@ EXPOSE 15777/udp 15000/udp 7777/udp #Shared folders to host VOLUME /home/sfserver/serverfiles/ /home/sfserver/log/ /home/sfserver/lgsm/backup/ /home/sfserver/lgsm/config-lgsm/sfserver/ /home/sfserver/.config/Epic/FactoryGame/Saved/SaveGames ##############EXTRA CONFIG############## -CMD ["/home/sfserver/user.sh", "/home/sfserver/install.sh"] +ENTRYPOINT ["/home/sfserver/user.sh", "/home/sfserver/install.sh"] From 0afe6b2151d31a2c72034f8bafe7d6abc4260842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicente=20Fern=C3=A1ndez=20Guerra?= Date: Wed, 1 Dec 2021 00:32:13 +0100 Subject: [PATCH 04/10] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 692ccc7..1940afb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,6 +55,7 @@ ENV VERSION=public ENV MONITOR=yes ENV BACKUP=yes ENV LANG=en_US.utf8 +ENV HOME=/home/sfserver ##Need use xterm for LinuxGSM## ENV TERM=xterm From 8ab1408003723407e56a0559a61746a5baaf64d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicente=20Fern=C3=A1ndez=20Guerra?= Date: Wed, 1 Dec 2021 00:36:16 +0100 Subject: [PATCH 05/10] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1940afb..692ccc7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,7 +55,6 @@ ENV VERSION=public ENV MONITOR=yes ENV BACKUP=yes ENV LANG=en_US.utf8 -ENV HOME=/home/sfserver ##Need use xterm for LinuxGSM## ENV TERM=xterm From 4613869f90bfec87a520f0a6468ddd0a9a54d578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicente=20Fern=C3=A1ndez=20Guerra?= Date: Wed, 1 Dec 2021 00:44:39 +0100 Subject: [PATCH 06/10] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 692ccc7..ec720f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -87,7 +87,7 @@ RUN apt clean && \ ##############BASE IMAGE############## # Create user -RUN adduser --disabled-password --shell /bin/bash --disabled-login --gecos "" sfserver +RUN adduser --home /home/sfserver --disabled-password --shell /bin/bash --disabled-login --gecos "" sfserver # Base dir WORKDIR /home/sfserver From e96f40ff468c1658a29e98d5a7e3a1e816272adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicente=20Fern=C3=A1ndez=20Guerra?= Date: Wed, 1 Dec 2021 00:54:00 +0100 Subject: [PATCH 07/10] Update Dockerfile --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index ec720f3..d351148 100644 --- a/Dockerfile +++ b/Dockerfile @@ -89,6 +89,9 @@ RUN apt clean && \ # Create user RUN adduser --home /home/sfserver --disabled-password --shell /bin/bash --disabled-login --gecos "" sfserver +# Set HOME +ENV HOME /home/sfserver + # Base dir WORKDIR /home/sfserver From a765aceffe3e7eae8de93bf578333586483aae89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicente=20Fern=C3=A1ndez=20Guerra?= Date: Wed, 1 Dec 2021 01:00:42 +0100 Subject: [PATCH 08/10] Update Dockerfile --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d351148..ec720f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -89,9 +89,6 @@ RUN apt clean && \ # Create user RUN adduser --home /home/sfserver --disabled-password --shell /bin/bash --disabled-login --gecos "" sfserver -# Set HOME -ENV HOME /home/sfserver - # Base dir WORKDIR /home/sfserver From de683a996492bc54d31c70bdb9324c1976912224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicente=20Fern=C3=A1ndez=20Guerra?= Date: Wed, 1 Dec 2021 01:12:35 +0100 Subject: [PATCH 09/10] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index ec720f3..8fae110 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,6 +55,7 @@ ENV VERSION=public ENV MONITOR=yes ENV BACKUP=yes ENV LANG=en_US.utf8 +ENV HOME=/home/sfserver ##Need use xterm for LinuxGSM## ENV TERM=xterm From d2e15c0f10ea2990dbe749fee6aabb76591fec96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicente=20Fern=C3=A1ndez=20Guerra?= Date: Wed, 1 Dec 2021 01:15:32 +0100 Subject: [PATCH 10/10] Update Dockerfile --- Dockerfile | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8fae110..8484d28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,25 @@ FROM steamcmd/steamcmd:ubuntu-18 STOPSIGNAL SIGTERM +####Environments#### + +ENV PUID=1000 +ENV PGID=1000 +ENV START_MODE=1 +ENV TEST_ALERT=no +ENV TimeZone=Europe/Madrid +ENV VERSION=public +ENV MONITOR=yes +ENV BACKUP=yes +ENV LANG=en_US.utf8 +ENV HOME=/home/sfserver + +##Need use xterm for LinuxGSM## +ENV TERM=xterm +ENV DEBIAN_FRONTEND noninteractive + +####Environments#### + ##############BASE IMAGE############## ####Labels#### @@ -44,25 +63,6 @@ RUN dpkg --add-architecture i386 && \ libsdl2-2.0-0:i386 \ xz-utils -####Environments#### - -ENV PUID=1000 -ENV PGID=1000 -ENV START_MODE=1 -ENV TEST_ALERT=no -ENV TimeZone=Europe/Madrid -ENV VERSION=public -ENV MONITOR=yes -ENV BACKUP=yes -ENV LANG=en_US.utf8 -ENV HOME=/home/sfserver - -##Need use xterm for LinuxGSM## -ENV TERM=xterm -ENV DEBIAN_FRONTEND noninteractive - -####Environments#### - # Install latest su-exec RUN set -ex; \ \