From 6147a76d16931993a1dbe648526ba53f79b6809a Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Wed, 7 Feb 2024 09:52:36 +0100
Subject: [PATCH] chore: adjustments to build scripts

---
 .run/Server_Dockerfile.run.xml                   | 16 ----------------
 .run/build images.run.xml                        |  4 ++--
 ...ocker-compose.yml_ Compose Deployment.run.xml |  4 +++-
 3 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 .run/Server_Dockerfile.run.xml

diff --git a/.run/Server_Dockerfile.run.xml b/.run/Server_Dockerfile.run.xml
deleted file mode 100644
index a509d2d..0000000
--- a/.run/Server_Dockerfile.run.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Server/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="continuity" />
-        <option name="buildCliOptions" value="--platform linux/amd64" />
-        <option name="buildKitEnabled" value="true" />
-        <option name="buildOnly" value="true" />
-        <option name="contextFolderPath" value="." />
-        <option name="sourceFilePath" value="Server/Dockerfile" />
-      </settings>
-    </deployment>
-    <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/build images.run.xml b/.run/build images.run.xml
index 52e5d56..b529cb6 100644
--- a/.run/build images.run.xml	
+++ b/.run/build images.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="build images" type="PowerShellRunType" factoryName="PowerShell" scriptUrl="C:\Users\Timot\Projects\Continuity\build-image.ps1" workingDirectory="C:\Users\Timot\Projects\Continuity" executablePath="C:\Users\Timot\scoop\apps\pwsh\current\pwsh.exe">
+  <configuration default="false" name="build images" type="PowerShellRunType" factoryName="PowerShell" scriptUrl="$PROJECT_DIR$\build-image.ps1" workingDirectory="$PROJECT_DIR$">
     <envs />
     <method v="2" />
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/.run/docker-compose.yml_ Compose Deployment.run.xml b/.run/docker-compose.yml_ Compose Deployment.run.xml
index b09ae53..1d769e6 100644
--- a/.run/docker-compose.yml_ Compose Deployment.run.xml	
+++ b/.run/docker-compose.yml_ Compose Deployment.run.xml	
@@ -4,12 +4,14 @@
       <settings>
         <option name="buildKitEnabledForCompose" value="true" />
         <option name="envFilePath" value="" />
+        <option name="removeImagesOnComposeDown" value="LOCAL" />
         <option name="sourceFilePath" value="docker-compose.yml" />
         <option name="upDetach" value="false" />
+        <option name="upForceRecreate" value="true" />
         <option name="upRemoveOrphans" value="true" />
       </settings>
     </deployment>
-    <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
+    <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="false" isSslEnabled="false" />
     <method v="2">
       <option name="Build" default="false" projectName="Wonderking" projectPath="$PROJECT_DIR$/Wonderking/Wonderking.csproj" />
       <option name="Build" default="false" projectName="Server" projectPath="$PROJECT_DIR$/Server/Server.csproj" />