chore(deploy): streamline logback deployment files

Author: xeruf

gradle/build.gradle.kts

@@ -67,7 +67,7 @@ tasks {
     val release by creating {
         dependsOn(clean, check)
         group = "distribution"
-        description = "Prepares a new Release by bumping the version and creating and pushing a commit tagged with the new version"
+        description = "Prepares a new Release by bumping the version and pushing a commit tagged with the new version"
         doLast {
             var newVersion = version
             fun String.editVersion(version: String, new: Int) =

helpers/push_to_server.sh

@@ -20,4 +20,4 @@ ssh -S ssh-ctrl-socket -O exit $server
 #scp docker-compose-production.yml $server:./docker-compose.yml
 ssh $server 'sudo docker pull localhost:5000/swc_game-server' && \
 # NOTE This requires the other services (client-controller and gameserver) in the compose file also already deployed
-ssh $server 'sudo docker service update --image localhost:5000/swc_game-server:latest --with-registry-auth deploy_gameserver'
+ssh $server 'sudo docker service update --image localhost:5000/swc_game-server:latest --with-registry-auth contest_gameserver'

server/build.gradle.kts

@@ -86,6 +86,7 @@ tasks {
                 include("?ocker*")
                 include("logback-production.xml")
                 include("server.properties.production")
+                rename("logback-production.xml", "logback.xml")
                 into(workingDir)
             }
         }

server/configuration/Dockerfile

@@ -9,7 +9,7 @@ ADD $game_server_dir /app
 WORKDIR /app
 # the following files from the configuration directory will be copied to the
 # docker working directory before build
-ADD logback-production.xml /app/logback-production.xml
+ADD logback.xml /app/logback.xml
 # This will be overwritten by the docker secret with the real password in production:
 ADD server.properties.production /run/secrets/gameserver_properties
 RUN rm /app/server.properties && \
@@ -18,7 +18,6 @@ RUN rm /app/server.properties && \
 ENTRYPOINT ["java"]
 
 CMD ["-Dfile.encoding=UTF-8", \
-     "-Dlogback.configurationFile=logback-production.xml", \
      "-Djava.security.egd=file:/dev/./urandom", \
      "-server", \
      "-Xmx16g", \