[refactor] remove unused Dockerfile, try installing sphinx with requirements.txt in cloudflare pages ci

.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Black">
+    <option name="sdkName" value="Python 3.11 (samgis)" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Pipenv (samgis)" project-jdk-type="Python SDK" />
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

Dockerfile

@@ -1,46 +0,0 @@
-# inspired by https://dev.to/gaborschulz/running-python-311-on-aws-lambda-1i7p
-FROM ghcr.io/osgeo/gdal:ubuntu-small-3.7.2 as build-image
-
-LABEL maintainer="alessandro trinca <[email protected]>"
-
-# Include global arg in this stage of the build
-ARG LAMBDA_TASK_ROOT="/var/task"
-ARG PYTHONPATH="${LAMBDA_TASK_ROOT}:${PYTHONPATH}:/usr/local/lib/python3/dist-packages"
-
-RUN mkdir -p ${LAMBDA_TASK_ROOT}
-
-# Install aws-lambda-cpp build dependencies
-RUN apt update && \
-  apt install -y g++ make cmake unzip libcurl4-openssl-dev python3-pip
-
-# install required packages
-COPY requirements_pip.txt ${LAMBDA_TASK_ROOT}/
-RUN python -m pip install --target ${LAMBDA_TASK_ROOT} --upgrade -r ${LAMBDA_TASK_ROOT}/requirements_pip.txt
-RUN python -m pip install torch torchvision --target ${LAMBDA_TASK_ROOT} --index-url https://download.pytorch.org/whl/cpu
-COPY requirements.txt ${LAMBDA_TASK_ROOT}/
-RUN python -m pip install --target ${LAMBDA_TASK_ROOT} -r ${LAMBDA_TASK_ROOT}/requirements.txt
-
-FROM osgeo/gdal:ubuntu-small-3.7.2
-
-# Include global arg in this stage of the build
-ARG LAMBDA_TASK_ROOT="/var/task"
-ARG PYTHONPATH="${LAMBDA_TASK_ROOT}:${PYTHONPATH}:/usr/local/lib/python3/dist-packages"
-ARG RIE="https://github.com/aws/aws-lambda-runtime-interface-emulator/releases/latest/download/aws-lambda-rie"
-
-# Set working directory to function root directory
-WORKDIR ${LAMBDA_TASK_ROOT}
-
-RUN apt update && apt install -y libgl1 curl
-RUN ls -ld /usr/lib/x86_64-linux-gnu/libGL.so* || echo "libGL.so* not found..."
-
-# Copy in the built dependencies
-COPY --from=build-image ${LAMBDA_TASK_ROOT} ${LAMBDA_TASK_ROOT}
-
-RUN curl -Lo /usr/local/bin/aws-lambda-rie ${RIE}
-RUN chmod +x /usr/local/bin/aws-lambda-rie
-
-COPY ./scripts/lambda-entrypoint.sh /lambda-entrypoint.sh
-RUN chmod +x /lambda-entrypoint.sh
-RUN ls -l /lambda-entrypoint.sh
-
-ENTRYPOINT  ["/lambda-entrypoint.sh"]

README.md

@@ -57,7 +57,7 @@ curl -X 'POST' \
 
 
 ## Dependencies installation and local tests
-The docker build process needs only the classic requirements.txt, instead for local development and sphinx-docs build 
+The docker build process needs only the classic requirements.txt (here renamed to `requirements_dockerfile.txt`), instead for local development and sphinx-docs build 
 there is `Pipfile` (sphinx docs is hosted on Cloudflare Pages).
 
 

dockerfiles/dockerfile-fastapi-samgeo

@@ -1,7 +1,7 @@
 FROM ghcr.io/osgeo/gdal:ubuntu-small-3.7.2
 
 WORKDIR /code
-COPY ./requirements.txt /code/requirements.txt
+COPY ./requirements_dockerfile.txt /code/requirements_dockerfile.txt
 COPY ./requirements_pip.txt /code/requirements_pip.txt
 
 RUN apt update && apt install -y g++ make cmake unzip libcurl4-openssl-dev python3-pip
@@ -14,7 +14,7 @@ RUN which python
 RUN python --version
 RUN python -m pip install --no-cache-dir --upgrade -r /code/requirements_pip.txt
 RUN python -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu
-RUN python -m pip install --no-cache-dir -r /code/requirements.txt
+RUN python -m pip install --no-cache-dir -r /code/requirements_dockerfile.txt
 
 RUN useradd -m -u 1000 user
 
@@ -35,4 +35,4 @@ RUN echo $HOME/
 RUN ls -l $HOME/app
 RUN ls -l $HOME/
 
-CMD ["uvicorn", "src.main:app", "--host", "0.0.0.0", "--port", "7860"]
+CMD ["uvicorn", "src.main:app", "--host", "0.0.0.0", "--port", "7860"]

dockerfiles/dockerfile-lambda-gdal-runner

@@ -10,15 +10,15 @@ RUN echo "ENV RIE: $RIE ..."
 # Set working directory to function root directory
 WORKDIR ${LAMBDA_TASK_ROOT}
 COPY requirements_pip.txt ${LAMBDA_TASK_ROOT}/requirements_pip.txt
-COPY requirements.txt ${LAMBDA_TASK_ROOT}/requirements.txt
+COPY requirements_dockerfile.txt ${LAMBDA_TASK_ROOT}/requirements_dockerfile.txt
 
 # avoid segment-geospatial exception caused by missing libGL.so.1 library
-RUN apt update && apt install -y libgl1 curl python3-pip
+RUN apt update && apt install -y libgl1 curl python3-pip && apt clean
 RUN ls -ld /usr/lib/*linux-gnu/libGL.so* || echo "libGL.so* not found..."
 RUN which python
 RUN python --version
 RUN python -m pip install -r ${LAMBDA_TASK_ROOT}/requirements_pip.txt --upgrade --target ${LAMBDA_TASK_ROOT}
-RUN python -m pip install -r ${LAMBDA_TASK_ROOT}/requirements.txt --target ${LAMBDA_TASK_ROOT}
+RUN python -m pip install -r ${LAMBDA_TASK_ROOT}/requirements_dockerfile.txt --target ${LAMBDA_TASK_ROOT}
 RUN python -c "import sys;print(sys.path)"
 # RUN python -m pip install pillow awslambdaric aws-lambda-powertools httpx jmespath --target ${LAMBDA_TASK_ROOT}
 

requirements.txt

@@ -1,13 +1,2 @@
-aws-lambda-powertools
-awslambdaric
-bson
-geopandas
-jmespath
-numpy
-onnxruntime
-opencv-python-headless
-pillow
-pydantic>=2.0.3
-python-dotenv
-rasterio
-requests
+sphinx
+sphinx-autodoc-typehints

requirements_dockerfile.txt

@@ -0,0 +1,13 @@
+aws-lambda-powertools
+awslambdaric
+bson
+geopandas
+jmespath
+numpy
+onnxruntime
+opencv-python-headless
+pillow
+pydantic>=2.0.3
+python-dotenv
+rasterio
+requests

requirements_docs.txt

@@ -1,2 +0,0 @@
-sphinx
-sphinx-autodoc-typehints