added protobufs instructions to Dockerfile

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "tts-protobufs"]
+	path = tts-protobufs
+	url = https://github.com/NIAEFEUP/tts-protobufs.git

django/Dockerfile

@@ -1,39 +1,45 @@
 # deps
 FROM python:3.11-slim AS deps
 
-WORKDIR /usr/src/django/ 
+WORKDIR /usr/src/django/
 
-# Get's the output from the django in realtime. 
+# Get's the output from the django in realtime.
 ENV PYTHONUNBUFFERED=1
 
-# Copy requirements 
-COPY ./requirements.txt ./requirements.txt 
+# Copy requirements
+COPY ./django/requirements.txt ./requirements.txt
+
+COPY ./tts-protobufs protos  
 
 # Dependencies for building the requirements
 RUN apt-get update
-RUN apt-get -y install build-essential
+RUN apt-get -y install build-essential protobuf-compiler git
+
+RUN git init
+RUN git submodule init
+RUN git submodule update
 
 # Install postgres dependencies (pgsql client and development files)
-COPY ./etc/pgdg.sh /tmp/pgdg.sh
+COPY ./django/etc/pgdg.sh /tmp/pgdg.sh
 RUN /tmp/pgdg.sh
 
 RUN apt -y install libpq-dev postgresql-client-16
 RUN apt -y clean && rm -rf /var/lib/apt/lists/*
 
-# Install the requirements
 RUN pip install -r requirements.txt
 
 EXPOSE 8000
 
-COPY ./entrypoint.sh ./entrypoint.sh  
+# Install the requirements
+COPY ./django/entrypoint.sh ./entrypoint.sh
 ENTRYPOINT ["/usr/src/django/entrypoint.sh"]
 
 # prod
 FROM deps AS prod
 
-COPY tts_be/ ./tts_be
-COPY university/ ./university
-COPY manage.py tasks.py ./
+COPY django/tts_be/ ./tts_be
+COPY django/university/ ./university
+COPY django/manage.py django/tasks.py ./
 
-COPY ./entrypoint_prod.sh ./entrypoint_prod.sh
-ENTRYPOINT ["/usr/src/django/entrypoint_prod.sh"]
+COPY ./django/entrypoint_prod.sh ./entrypoint_prod.sh
+ENTRYPOINT ["/usr/src/django/entrypoint_prod.sh"]

django/entrypoint.sh

@@ -16,9 +16,13 @@ until PGPASSWORD="${POSTGRES_PASSWORD}" psql -h "${POSTGRES_HOST}" -U "${POSTGRE
 	>&2 echo "PostgreSQL is unavailable - sleeping"
 	sleep 4
 done
->&2 echo "PostgreSQL is up - executing command"
 
-echo "ENTRYPOINT RAN"
+>&2 echo "PostgreSQL is up - executing commands" 
+
+# Compile protobuf files
+echo "Compiling protobuf files..."
+protoc --python_out=generated -I=./protos/ ./protos/**/*.proto
+echo "Protobuf files compiled successfully."
 
 # Migrate the Django.
 python manage.py makemigrations

django/entrypoint_prod.sh

@@ -7,6 +7,11 @@ until PGPASSWORD="${POSTGRES_PASSWORD}" psql -h "${POSTGRES_HOST}" -U "${POSTGRE
 done
 >&2 echo "PostgreSQL is up - executing command"
 
+# Compile protobuf files
+echo "Compiling protobuf files..."
+protoc --python_out=generated -I=./protos/ ./protos/**/*.proto
+echo "Protobuf files compiled successfully."
+
 # Migrate the Django.
 python manage.py inspectdb >university/models.py
 python manage.py makemigrations

docker-compose.yaml

@@ -36,13 +36,17 @@ services:
       - ./nginx/certs/:/etc/nginx/certs/
 
   django:
-    build: ./django
+    build:
+      context: ./
+      dockerfile: django/Dockerfile
     container_name: tts_django
     env_file:
       - django/.env.dev
     command: ["python", "manage.py", "runserver", "0.0.0.0:8000"]
     volumes:
       - ./django/:/usr/src/django/
+      - ./tts-protobufs/protos/:/usr/src/django/protos/
+      - ./protos/:/usr/src/django/generated/
     ports:
       - 8100:8000