Use custom fprime-gds install

ReggieMarr · Sep 29, 2024 · f74d528 · f74d528
1 parent 8ec4474
commit f74d528
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,6 @@
 # Exclude the submodule since we'll use git to grab it or mount it in a container
 fprime
+fprime-gds
 
 # Exclude large parts of .git, but keep essential files
 **/.git/objects/pack/

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "fprime"]
 	path = fprime
 	url = [email protected]:ReggieMarr/fprime.git
+[submodule "fprime-gds"]
+	path = fprime-gds
+	url = [email protected]:nasa/fprime-gds.git
diff --git a/Dockerfile b/Dockerfile
@@ -74,9 +74,9 @@ ENV PATH="/home/user/.local/bin:${PATH}"
 USER root
 RUN pip install setuptools setuptools_scm wheel pip fprime-tools && \
     pip install -r $FSW_WDIR/fprime/requirements.txt && \
+    pip install -e $FSW_WDIR/fprime-gds && \
     pip install pytest debugpy pyinfra asyncio asyncssh gitpython python-dotenv
 
-
 FROM fprime_src AS stars_base
 
 ENV TZ='America/Montreal'

diff --git a/fprime b/fprime
diff --git a/fprime-gds b/fprime-gds