EnSitePy (EnLitePy)

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "EVI-EnLitePy"]
+	path = EVI-EnLitePy
+	url = https://github.nrel.gov/AVCI/EVI-EnLitePy.git
+    branch = server_version

Dockerfile

@@ -1,4 +1,4 @@
-FROM reopt/py38
+FROM python:3.11
 
 # Install NREL root certs for machines running on NREL's network.
 ARG NREL_ROOT_CERT_URL_ROOT=""
@@ -9,12 +9,17 @@ ENV SRC_DIR=/opt/reopt/reo/src
 ENV LD_LIBRARY_PATH="/opt/reopt/reo/src:${LD_LIBRARY_PATH}"
 
 # Copy all code
-ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONDONTWRITEBYTECODE=1
 COPY . /opt/reopt
 
 # Install python packages
 WORKDIR /opt/reopt
 RUN ["pip", "install", "-r", "requirements.txt"]
 
+# Install EVI-EnLitePy using pip (recommended best practice)
+RUN if [ -d "/opt/reopt/EVI-EnLitePy" ] && [ "$(ls -A /opt/reopt/EVI-EnLitePy)" ]; then \
+    cd /opt/reopt/EVI-EnLitePy && pip install -e .; \
+fi
+
 EXPOSE 8000
 ENTRYPOINT ["/bin/bash", "-c"]

docker-compose.yml

@@ -20,7 +20,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: base-api-image
+    image: new-base-api-image
     command:  >
       "celery -A reopt_api worker -l info"
     environment:
@@ -39,7 +39,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: base-api-image
+    image: new-base-api-image
     command:  >
       "python manage.py migrate
       && /opt/reopt/bin/wait-for-it.bash -t 0 julia:8081 -- python manage.py runserver 0.0.0.0:8000"