Merge #3808 Default GAME env var to KSP in Inflator Dockerfile, fix r…

…edeploy
KSP-CKAN · Mar 11, 2023 · efb7fc8 · efb7fc8
2 parents 897b789 + 5abc901
commit efb7fc8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file.
 - [Multiple] Italian translation and other localization fixes (#3780, #3781 by: frankieorabona, WujekFoliarz, vinix38, Kalessin1; reviewed: HebaruSan)
 - [Core] Fix mkbundle executable crash (#3767 by: memchr; reviewed: HebaruSan)
 - [GUI] Show conflicts in changeset (#3727 by: HebaruSan; reviewed: techman83)
-- [Multiple] KSP2 support (#3797 by: HebaruSan; reviewed: techman83)
+- [Multiple] KSP2 support (#3797, #3808 by: HebaruSan; reviewed: techman83)
 
 ### Bugfixes
 

diff --git a/Dockerfile.netkan b/Dockerfile.netkan
@@ -5,6 +5,6 @@ RUN useradd -ms /bin/bash netkan
 USER netkan
 WORKDIR /home/netkan
 ADD netkan.exe .
-ENTRYPOINT /usr/bin/mono netkan.exe --game $GAME --queues $QUEUES \
+ENTRYPOINT /usr/bin/mono netkan.exe --game ${GAME:-KSP} --queues $QUEUES \
   --net-useragent 'Mozilla/5.0 (compatible; Netkanbot/1.0; CKAN; +https://github.com/KSP-CKAN/NetKAN-Infra)' \
   --github-token $GH_Token --gitlab-token "$GL_Token" --cachedir ckan_cache -v
diff --git a/build.cake b/build.cake
@@ -78,20 +78,23 @@ Task("docker-inflator")
     // Restart the Inflator
     var netkanImage = "kspckan/netkan";
     DockerPull(netkanImage);
-    DockerRun(new DockerContainerRunSettings()
+    var runSettings = new DockerContainerRunSettings()
+    {
+        Env = new string[]
         {
-            Env = new string[]
-            {
-                "AWS_ACCESS_KEY_ID",
-                "AWS_SECRET_ACCESS_KEY",
-                "AWS_DEFAULT_REGION"
-            }
-        },
-        netkanImage,
+            "AWS_ACCESS_KEY_ID",
+            "AWS_SECRET_ACCESS_KEY",
+            "AWS_DEFAULT_REGION"
+        }
+    };
+    DockerRun(runSettings, netkanImage,
         "redeploy-service",
         "--cluster",      "NetKANCluster",
-        "--service-name", "Inflator"
-    );
+        "--service-name", "InflatorKsp");
+    DockerRun(runSettings, netkanImage,
+        "redeploy-service",
+        "--cluster",      "NetKANCluster",
+        "--service-name", "InflatorKsp2");
 });
 
 Task("docker-metadata")