Merge pull request #385 from shibaken/main

shibaken/main to dbca-wa/main

Dockerfile

@@ -73,7 +73,9 @@ COPY --chown=oim:oim requirements.txt ./
 
 RUN pip install -r requirements.txt \
   && rm -rf /var/lib/{apt,dpkg,cache,log}/ /tmp/* /var/tmp/*
-
+RUN pip install --upgrade pip
+RUN wget -O /tmp/GDAL-3.8.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl https://github.com/girder/large_image_wheels/raw/wheelhouse/GDAL-3.8.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=e2fe6cfbab02d535bc52c77cdbe1e860304347f16d30a4708dc342a231412c57
+RUN pip install /tmp/GDAL-3.8.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 # Install the project (ensure that frontend projects have been built prior to this step).
 FROM python_libs_ml
 COPY  --chown=oim:oim gunicorn.ini manage_ml.py ./

requirements.txt

@@ -31,7 +31,7 @@ django-cron==0.5.0
 django-dynamic-fixture==1.9.1
 openpyxl==3.0.7
 datapackage==0.8.1
-jsontableschema==0.10.1
+# jsontableschema==0.10.1
 python-dateutil==2.8.1
 py4j==0.10.2.1
 # djangorestframework==3.5.0
@@ -55,7 +55,7 @@ djangorestframework-datatables==0.7.0
 django-confy==1.0.4
 xlwt==1.3.0
 xlsxwriter==1.2.2
-gunicorn==19.9.0
+gunicorn==21.2.0
 #dj-static==0.0.6
 whitenoise==5.3.0
 mixer==6.1.3
@@ -76,4 +76,8 @@ babel==2.10.1
 git+https://github.com/dbca-wa/webtemplate2.git#egg=webtemplate_dbca
 tqdm==4.64.1
 python-decouple==3.8
-git+https://github.com/dbca-wa/appmonitor_client.git#egg=appmonitor_client
+git+https://github.com/dbca-wa/appmonitor_client.git#egg=appmonitor_client
+click==8.1.7
+numpy==1.26.3
+setuptools==69.0.3
+wheel==0.42.0