From 0924e3d0b7b58eb638b8f8e1643660e20c998137 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Thu, 6 Mar 2025 12:48:32 -0600
Subject: [PATCH] fix flips

---
 .dockerignore                           |  1 -
 ALttPRandomizer/appsettings.Docker.json |  1 +
 Apr2025Randomizer                       |  2 +-
 Dockerfile                              | 15 +++++++++++----
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index ba29cf6..79fe4c6 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,7 +7,6 @@ ALttPRandomizer/[Bb]in
 
 */__pycache__
 */.github
-*/_vendor
 */DR_*
 */ER_*
 */OR_*
diff --git a/ALttPRandomizer/appsettings.Docker.json b/ALttPRandomizer/appsettings.Docker.json
index da3f10e..aa6bec2 100644
--- a/ALttPRandomizer/appsettings.Docker.json
+++ b/ALttPRandomizer/appsettings.Docker.json
@@ -5,6 +5,7 @@
     "flipsPath": "/flips/flips",
     "allowedCors": [
       "https://new.alttpr.gwaa.kiwi",
+      "https://api.alttpr.gwaa.kiwi",
       "http://localhost:8082"
     ],
     "azureSettings": {
diff --git a/Apr2025Randomizer b/Apr2025Randomizer
index 1d84a6b..fc12f26 160000
--- a/Apr2025Randomizer
+++ b/Apr2025Randomizer
@@ -1 +1 @@
-Subproject commit 1d84a6b348268c26cf0c4779710f8b1fe866d873
+Subproject commit fc12f2627ba855a2cdc2314c64f7423461cc504a
diff --git a/Dockerfile b/Dockerfile
index a74cc02..1cf3798 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,12 @@
 FROM mcr.microsoft.com/dotnet/sdk:8.0-azurelinux3.0 AS build
 
+RUN tdnf install -y wget unzip g++ build-essential
+RUN wget https://github.com/Alcaro/Flips/archive/refs/tags/v198.zip -O flips.zip
+RUN unzip flips.zip -d /flips
+WORKDIR /flips/Flips-198
+ARG TARGET=cli
+RUN ./make-linux.sh
+
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 
@@ -12,10 +19,10 @@ FROM mcr.microsoft.com/dotnet/aspnet:8.0-azurelinux3.0 AS final
 EXPOSE 8080
 EXPOSE 8081
 
-RUN tdnf install -y python3 wget unzip
-RUN wget https://github.com/Alcaro/Flips/releases/download/v198/flips-linux.zip
-RUN unzip flips-linux.zip -d /flips
-RUN rm flips-linux.zip
+RUN tdnf install -y python3
+
+RUN mkdir -p /flips
+COPY --from=build /flips/Flips-198/flips /flips/flips
 
 RUN mkdir -p /randomizer/data
 RUN touch /randomizer/data/base2current.json