Merge branch 'hotfix/2.0.9'

KarmaKamikaze · Sep 25, 2024 · cdbf107 · cdbf107
2 parents 1f37e5e + e068187
commit cdbf107
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/MoxfieldPriceScraper/Dockerfile b/MoxfieldPriceScraper/Dockerfile
@@ -11,7 +11,7 @@ COPY *.csproj ./
 RUN DOTNET_EnableWriteXorExecute=0 dotnet restore
 
 COPY . ./
-RUN DOTNET_EnableWriteXorExecute=0 dotnet publish -c $BUILD_CONFIGURATION -o out --no-restore
+RUN DOTNET_EnableWriteXorExecute=0 dotnet publish -c $BUILD_CONFIGURATION -o out --no-restore -p:DOCKER_BUILD=true
 
 FROM mcr.microsoft.com/dotnet/runtime:8.0 AS runtime
 WORKDIR /app

diff --git a/MoxfieldPriceScraper/MoxfieldPriceScraper.csproj b/MoxfieldPriceScraper/MoxfieldPriceScraper.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+    <PropertyGroup Condition="'$(DOCKER_BUILD)' == 'true'">
+        <DefineConstants>DOCKER</DefineConstants>
+    </PropertyGroup>
+
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net8.0</TargetFramework>

diff --git a/MoxfieldPriceScraper/MoxfieldScraper.cs b/MoxfieldPriceScraper/MoxfieldScraper.cs
@@ -1,6 +1,5 @@
 using System.Drawing;
 using System.Globalization;
-using System.Runtime.InteropServices;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Chrome;
 using Serilog;
@@ -121,12 +120,11 @@ private void InitializeWebDriver()
         };
         chromeOptions.AddUserProfilePreference("prefs", preferences);
 
+#if DOCKER
         // Skip driver setup for ARM architecture
-        if (!(RuntimeInformation.OSArchitecture == Architecture.Arm &&
-              RuntimeInformation.OSArchitecture == Architecture.Arm64))
-        {
-            new DriverManager().SetUpDriver(new ChromeConfig());
-        }
+#else
+        new DriverManager().SetUpDriver(new ChromeConfig());
+#endif
 
         _driver = new ChromeDriver(chromeOptions);
         _driver.Manage().Timeouts().ImplicitWait = _elementSeekTimeout;