From 5fd57dc11acaa677593c72fc420384bdc2e87fec Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Tue, 10 Mar 2026 15:23:13 -0400
Subject: [PATCH] chore: Updated ae_api orchestration to use project-internal
 build context and Dockerfile.

---
 aether_fastapi_gunicorn.Dockerfile   | 45 -----------------
 conf/aether_fastapi_requirements.txt | 73 ----------------------------
 docker-compose.yml                   |  4 +-
 3 files changed, 2 insertions(+), 120 deletions(-)
 delete mode 100644 aether_fastapi_gunicorn.Dockerfile
 delete mode 100644 conf/aether_fastapi_requirements.txt

diff --git a/aether_fastapi_gunicorn.Dockerfile b/aether_fastapi_gunicorn.Dockerfile
deleted file mode 100644
index 34a6828..0000000
--- a/aether_fastapi_gunicorn.Dockerfile
+++ /dev/null
@@ -1,45 +0,0 @@
-# FROM tiangolo/uvicorn-gunicorn-fastapi:latest
-FROM tiangolo/uvicorn-gunicorn-fastapi:python3.11
-
-LABEL maintainer="Scott Idem <scott.idem@oneskyit.com>"
-
-WORKDIR /srv/aether_api
-
-RUN apt-get update; \
-    apt-get install -y \
-    imagemagick ffmpeg curl \
-    ; \
-    rm -rf /var/lib/apt/lists/*;
-
-RUN apt-get update; \
-    apt-get install -y \
-        poppler-utils \
-    ; \
-    rm -rf /var/lib/apt/lists/*;
-
-# RUN pdftoppm -h
-
-COPY conf/aether_fastapi_requirements.txt /tmp/requirements.txt
-RUN pip install --no-cache-dir -r /tmp/requirements.txt
-
-# Freeze the requirements and then export them to a file that is accessible to the host
-RUN pip freeze >> /tmp/aether_fastapi_requirements_current.txt
-# docker cp ae_api_dev:/tmp/aether_fastapi_requirements_current.txt /home/scott/tmp/docker
-
-# RUN pip freeze > /tmp/aether_fastapi_requirements_new.txt
-# RUN cp /tmp/aether_fastapi_requirements_new.txt /tmp/aether_fastapi_requirements_new_copy.txt
-
-# RUN pip freeze > /tmp/aether_fastapi_requirements_current.txt
-# RUN cp /aether_fastapi_requirements_current.txt /var/aether_fastapi_requirements_current.txt
-# RUN pip freeze >> /var/aether_fastapi_requirements_current.txt
-
-# VOLUME ["/export"]
-
-# RUN pip freeze > /logs/aether_fastapi_requirements_current.txt
-# RUN pip freeze > /temp/aether_fastapi_requirements_current.txt
-# RUN pip freeze > /tmp/aether_fastapi_requirements_current.txt
-# RUN pip freeze > /var/aether_fastapi_requirements_current.txt
-
-# RUN pip freeze
-
-CMD ["gunicorn", "--conf", "/conf/gunicorn_fastapi_conf.py"]
diff --git a/conf/aether_fastapi_requirements.txt b/conf/aether_fastapi_requirements.txt
deleted file mode 100644
index 7b6c4cb..0000000
--- a/conf/aether_fastapi_requirements.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-# Updated manually 2024-04-26 with a lot of trial and error.
-# A few are commented out even though they are actually used and required. Other packages already pull them in.
-# SQLAlchemy needs to be upgraded to 2.x. There are issues with async IO or something related to that.
-# https://docs.sqlalchemy.org/en/14/changelog/migration_20.html
-
-# aioredis # BAD! Not maintained!
-aiofiles
-# aiohttp # added 2024-04-24
-# anyio
-argon2-cffi
-argon2-cffi-bindings
-# asgiref
-# async-timeout
-# baize # added 2023-08-17
-# certifi
-# cffi
-charset-normalizer
-click
-Deprecated
-dnspython
-email-validator
-et-xmlfile
-fastapi==0.115.5 # working 0.110.2 0.94.1, 0.88.0; testing 0.111.1 0.112.4; not working >= 0.95.0
-# greenlet>=2.0.2
-# gevent
-gunicorn # working >=21.2.0
-h11
-html2text
-httpcore
-httptools
-httpx
-idna
-# itsdangerous
-# Jinja2>=3.1.2
-MarkupSafe
-mysqlclient
-numpy
-openpyxl
-orjson
-# packaging
-pandas
-passlib
-pdf2image
-Pillow
-pycparser
-pydantic==1.* # working 1.10.0, 1.10.15, 1.10.19; not 2.x.x
-PyJWT
-pyparsing
-python-dateutil
-# python-dotenv
-python-multipart
-pytz
-PyYAML
-qrcode
-redis[hiredis] # redis==5.0.0 hiredis==2.2.3
-requests
-rfc3986
-# six
-sniffio
-SQLAlchemy==1.4.52 # working 1.4.52; (2.0.29) I am working with
-starlette # working ==0.26.1, 0.22.0; not working newest 0.37.2
-stripe
-typing_extensions
-ujson
-urllib3
-uvicorn # working ==0.20.0
-uvloop
-Wand
-watchfiles
-# watchgod
-websockets
-wrapt
-xlrd
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index c384088..8578b57 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -104,8 +104,8 @@ services:
     ae_api:
         restart: always
         build:
-            context: ./
-            dockerfile: aether_fastapi_gunicorn.Dockerfile
+            context: ${AE_API_SRC}
+            dockerfile: Dockerfile
         scale: ${AE_API_REPLICAS}
         env_file:
             - ./.env