diff --git a/Dockerfile b/Dockerfile index 6a99bb1..472cf9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,6 @@ FROM debian:12.11-slim ARG SERVER_VERSION ARG SERVER_PORT -# This one is used at run-time -ENV SERVER_VERSION ${SERVER_VERSION} - RUN apt-get update && apt-get install -y wget ENV MAX_LOGS="20" @@ -22,8 +19,9 @@ COPY ./scripts/download_server.sh ./ COPY ./scripts/server_script.sh ./ RUN chmod 777 ./*.sh +RUN echo Building glassminers sever $SERVER_VERSION RUN ./download_server.sh $SERVER_VERSION -CMD ./server_script.sh ${SERVER_VERSION} +CMD [ "./server_script.sh" ] EXPOSE $SERVER_PORT \ No newline at end of file diff --git a/scripts/download_server.sh b/scripts/download_server.sh index ef48c3f..9abb2f5 100644 --- a/scripts/download_server.sh +++ b/scripts/download_server.sh @@ -2,7 +2,7 @@ echo "[Info] Downloading server executable..." -LOCAL_EXECUTABLE_NAME="server_$1.out" +LOCAL_EXECUTABLE_NAME="server.out" if [ "$1" = "stable" ]; then wget https://github.com/surrealtm/Glassminers/releases/latest/download/GMServer.out -O $LOCAL_EXECUTABLE_NAME diff --git a/scripts/server_script.sh b/scripts/server_script.sh index 2946386..224eb17 100644 --- a/scripts/server_script.sh +++ b/scripts/server_script.sh @@ -4,7 +4,7 @@ MAX_LOGS=${MAX_LOGS:-20} LOG_DIR=${LOG_DIR:-"/var/log/glassminers"} LOG_DATE_FORMAT=${LOG_DATE_FORMAT:-"%Y-%m-%d-%H-%M-%S"} -EXEC=./server_$1.out +EXEC=./server.out TIMESTAMP=$(date +"$LOG_DATE_FORMAT") delete_old_logs() {