From 2e1683d4015a3f358e904f9f8e45f5de92de2a78 Mon Sep 17 00:00:00 2001
From: Nathan Woodruff <nathan.woodruff@inl.gov>
Date: Wed, 20 Dec 2023 18:01:31 -0700
Subject: [PATCH] Pendulum issue

---
 .gitattributes                 | 1 +
 app/Dockerfiles/Dockerfile.dev | 6 ++----
 app/entrypoint.local.sh        | 7 +------
 app/install/julia.sh           | 4 +++-
 app/spine/.gitignore           | 4 ++++
 5 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 .gitattributes
 create mode 100644 app/spine/.gitignore

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..526c8a3
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.sh text eol=lf
\ No newline at end of file
diff --git a/app/Dockerfiles/Dockerfile.dev b/app/Dockerfiles/Dockerfile.dev
index 10d3169..d5c5462 100644
--- a/app/Dockerfiles/Dockerfile.dev
+++ b/app/Dockerfiles/Dockerfile.dev
@@ -11,7 +11,7 @@ COPY . .
 
 # App dependencies
 RUN pip install -r requirements.dev.txt
-RUN pip install --src /opt/spine -r requirements.spine.txt
+RUN pip install --src /opt/resilience_calculator/spine -r requirements.spine.txt
 ENV PATH=$PATH:/opt/spine
 
 # # Config
@@ -20,9 +20,7 @@ COPY ./install/SpineToolbox.conf /root/.spinetoolbox/SpineProject
 
 # # Julia
 WORKDIR /opt
-RUN wget https://julialang-s3.julialang.org/bin/linux/x64/1.9/julia-1.9.3-linux-x86_64.tar.gz
-RUN tar zxvf julia-1.9.3-linux-x86_64.tar.gz
-ENV PATH=$PATH:/opt/julia-1.9.3/bin
+RUN python3 -m jill install --confirm
 RUN . ./resilience_calculator/install/julia.sh
 
 # Environment
diff --git a/app/entrypoint.local.sh b/app/entrypoint.local.sh
index 9867933..f276a51 100644
--- a/app/entrypoint.local.sh
+++ b/app/entrypoint.local.sh
@@ -1,9 +1,4 @@
 #!/bin/sh
 # Copyright 2023, Battelle Energy Alliance, LLC
 
-mv /opt/spine/spine-engine /opt/resilience_calculator/spine/
-mv /opt/spine/spine-items /opt/resilience_calculator/spine/
-mv /opt/spine/spinedb-api /opt/resilience_calculator/spine/
-mv /opt/spine/spinetoolbox /opt/resilience_calculator/spine/
-
-tail -f /dev/null
\ No newline at end of file
+flask run --host=0.0.0.0 --no-reload --debugger
\ No newline at end of file
diff --git a/app/install/julia.sh b/app/install/julia.sh
index f29fe48..3322b68 100644
--- a/app/install/julia.sh
+++ b/app/install/julia.sh
@@ -1,3 +1,5 @@
+julia -e 'using Pkg; Pkg.rm("SpineInterface")' || true
+julia -e 'using Pkg; Pkg.rm("SpineOpt")' || true
 julia -e 'using Pkg; Pkg.add(url="https://github.com/spine-tools/SpineInterface.jl.git")'
 julia -e 'using Pkg; Pkg.add(url="https://github.com/spine-tools/SpineOpt.jl.git")'
-julia -e 'using Pkg; Pkg.add(["XLSX", "DataFrames", "Distributions", "CSV", "Revise", "Cbc", "Clp"])'
+julia -e 'using Pkg; Pkg.add(["XLSX", "DataFrames", "Distributions", "CSV", "Revise", "Cbc", "Clp"])'
\ No newline at end of file
diff --git a/app/spine/.gitignore b/app/spine/.gitignore
new file mode 100644
index 0000000..c809ab2
--- /dev/null
+++ b/app/spine/.gitignore
@@ -0,0 +1,4 @@
+spine-engine
+spine-items
+spinedb-api
+spinetoolbox
\ No newline at end of file