diff --git a/ContainerContents/main.py b/ContainerContents/main.py index 7b82e46..dcd8ad6 100644 --- a/ContainerContents/main.py +++ b/ContainerContents/main.py @@ -9,7 +9,7 @@ import os year_donation = int(str(datetime.datetime.now().year)[2:]) + 1 # gets the last two digits of the current year then adds 1 for the current season # name based off the 2025 naming system # Define the path to the Excel file and the lock file -file_name = f"./Interviews/OR{year_donation}-L-Interview Data.xlsx" +file_name = f"/Interviews/OR{year_donation}-L-Interview Data.xlsx" if not os.path.isfile(file_name): os.makedirs(os.path.dirname(file_name), exist_ok=True) NoSheet(file_name) diff --git a/ContainerContents/requirements.txt b/ContainerContents/requirements.txt index 5b1ff2d..682708d 100644 --- a/ContainerContents/requirements.txt +++ b/ContainerContents/requirements.txt @@ -1,4 +1,5 @@ fastapi[standard] pandas openpyxl -PyYAML \ No newline at end of file +PyYAML +filelock \ No newline at end of file diff --git a/ContainerContents/send_email.py b/ContainerContents/send_email.py index a506b71..eb209d5 100644 --- a/ContainerContents/send_email.py +++ b/ContainerContents/send_email.py @@ -20,7 +20,7 @@ def send_email(interviewee_email="darkicewolf50@gmail.com", interviewee_name="br ``Contact``: ahmad.ahmad1@ucalgary.ca """ # Define static email for notifications and Gmail credentials - static_email = "uofcbaja.noreply@gmail.com" + static_email = "uofcbaja@gmail.com" gmail_user = "uofcbaja.noreply@gmail.com" gmail_apppassword = "pver lpnt upjd zvld" diff --git a/Dockerfile b/Dockerfile index f65975b..12f5ae0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,9 @@ COPY ./ContainerContents /BajaCloudBackend RUN pip install --no-cache-dir -r requirements.txt # Expose port 8080 for the container to listen on -EXPOSE 8080 +EXPOSE 8000 # Command to run the Python server when the container starts +#CMD ["fastapi", "run" "main.py"] CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--reload"] diff --git a/bajacloud.tar.gz b/bajacloud.tar.gz new file mode 100644 index 0000000..5ad7021 Binary files /dev/null and b/bajacloud.tar.gz differ diff --git a/docker-compose.yaml b/docker-compose.yaml index f05e221..11dba58 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,7 +2,7 @@ services: bajacloud: container_name: bajacloud ports: - - 8080:8080 + - 8080:8000 volumes: - ./mock:/Interviews build: . diff --git a/mock/OR25-L-Interview Data.xlsx b/mock/OR25-L-Interview Data.xlsx new file mode 100644 index 0000000..9628e08 Binary files /dev/null and b/mock/OR25-L-Interview Data.xlsx differ diff --git a/mock/OR25-L-Interview Data.xlsx.lock b/mock/OR25-L-Interview Data.xlsx.lock new file mode 100644 index 0000000..e69de29