diff --git a/.DS_Store b/.DS_Store index 41a446d..fe9da2d 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Dockerfile.gdal b/Dockerfile.gdal index 77fb835..07bd864 100644 --- a/Dockerfile.gdal +++ b/Dockerfile.gdal @@ -1,5 +1,8 @@ # FROM python:3.9.9-slim-buster FROM osgeo/gdal:ubuntu-small-3.4.0 +# Akira +FROM python:3.10 +FROM ubuntu:latest WORKDIR /app @@ -14,6 +17,13 @@ ARG TZ Asia/Tokyo \ RUN apt-get update -y +# 必要なライブラリのインストール by akira +RUN apt-get update && \ + apt-get install -y software-properties-common && \ + add-apt-repository ppa:ubuntugis/ppa && \ + apt-get update && \ + apt-get install -y gdal-bin libgdal-dev python3-gdal + # Install GDAL dependencies RUN apt-get install -y libgdal-dev g++ --no-install-recommends && \ apt-get clean -y @@ -23,7 +33,7 @@ ENV CPLUS_INCLUDE_PATH=/usr/include/gdal ENV C_INCLUDE_PATH=/usr/include/gdal RUN apt-get update \ - && apt-get -y install netcat gcc postgresql \ + && apt-get -y install netcat-openbsd gcc postgresql \ && apt-get clean RUN apt-get update \ @@ -56,7 +66,9 @@ RUN pip install -r requirements.txt COPY . /app # Collect static files -RUN python manage.py collectstatic --noinput +RUN python3 manage.py collectstatic --noinput # Use Gunicorn as the entrypoint CMD ["gunicorn", "config.wsgi:application", "--bind", "0.0.0.0:8000"] + + diff --git a/README.jpn b/README.jpn new file mode 100644 index 0000000..5173942 --- /dev/null +++ b/README.jpn @@ -0,0 +1,6 @@ +デプロイ: +you can just run +docker-compose up -d +will deploy it + + diff --git a/requirements.txt b/requirements.txt index ea2b7f3..4baba81 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,7 +31,7 @@ matplotlib==3.5.0 mccabe==0.6.1 munch==2.5.0 mypy-extensions==0.4.3 -numpy==1.21.4 +numpy==1.26.2 packaging==21.3 pandas==1.3.4 pathspec==0.9.0 @@ -46,11 +46,13 @@ pyparsing==3.0.6 pyproj==3.3.0 python-dateutil==2.8.2 pytz==2021.3 -rasterio==1.2.10 +#rasterio==1.2.10 Akira +rasterio==1.3.10 regex==2021.11.10 requests==2.26.0 Rtree==0.9.7 -scipy==1.7.3 +#scipy==1.7.3 +scipy==1.10.1 seaborn==0.11.2 setuptools-scm==6.3.2 Shapely==1.8.0 diff --git a/rog/.DS_Store b/rog/.DS_Store index faa089c..7085293 100644 Binary files a/rog/.DS_Store and b/rog/.DS_Store differ