Merge pull request #2 from vineela-afk/develop

Added the unlink and packaging
PSNAppz · Mar 28, 2024 · 583e153 · 583e153
2 parents 88a0587 + 88a37da
commit 583e153
Show file tree

Hide file tree

Showing 37 changed files with 394 additions and 745 deletions.
diff --git a/openg2p-spar-mapper-api/Dockerfile → Dockerfile b/openg2p-spar-mapper-api/Dockerfile → Dockerfile
@@ -17,11 +17,14 @@ RUN chown -R ${container_user}:${container_user_group} /app
 USER ${container_user}
 
 ADD --chown=${container_user}:${container_user_group} . /app/src
-ADD --chown=${container_user}:${container_user_group} main.py /app
+ADD --chown=${container_user}:${container_user_group} openg2p-spar-mapper-api/main.py /app
 
 RUN python3 -m venv venv \
   && . ./venv/bin/activate
-RUN python3 -m pip install ./src
-
+RUN python3 -m pip install \
+  git+https://github.com/openg2p/openg2p-fastapi-common.git@develop\#egg=openg2p-fastapi-common\&subdirectory=openg2p-fastapi-common \
+  git+https://github.com/openg2p/openg2p-fastapi-common.git@develop\#egg=openg2p-fastapi-auth\&subdirectory=openg2p-fastapi-auth \
+  git+https://github.com/openg2p/openg2p-fastapi-common.git@develop\#egg=openg2p-common-g2pconnect-id-mapper\&subdirectory=openg2p-common-g2pconnect-id-mapper \
+  ./src/openg2p-spar-mapper-api
 CMD python3 main.py migrate; \
   python3 main.py run
diff --git a/main.py b/main.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+# ruff: noqa: I001
+
+from openg2p_spar_mapper_api.app import Initializer
+# from openg2p_fastapi_common.ping import PingInitializer
+
+main_init = Initializer()
+
+main_init.main()
diff --git a/openg2p-spar-mapper-api/.copier-answers.yml b/openg2p-spar-mapper-api/.copier-answers.yml
diff --git a/openg2p-spar-mapper-api/CODE-OF-CONDUCT.md b/openg2p-spar-mapper-api/CODE-OF-CONDUCT.md
diff --git a/openg2p-spar-mapper-api/CONTRIBUTING.md b/openg2p-spar-mapper-api/CONTRIBUTING.md