From f0114ef33cbc1ce03657d5365beabca6c2f59020 Mon Sep 17 00:00:00 2001
From: Akira <akira.miyata@sumasen.net>
Date: Mon, 22 Apr 2024 00:08:34 +0900
Subject: [PATCH] setup for Akiras Laptop

---
 .DS_Store        | Bin 10244 -> 10244 bytes
 Dockerfile.gdal  |  16 ++++++++++++++--
 README.jpn       |   6 ++++++
 requirements.txt |   8 +++++---
 rog/.DS_Store    | Bin 8196 -> 8196 bytes
 5 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 README.jpn

diff --git a/.DS_Store b/.DS_Store
index 41a446de171a2122d581b5c9f8fe324c517ad373..fe9da2da1068b22d17d2fc15b1667067538b2769 100644
GIT binary patch
delta 639
zcmZn(XbG6$&#1LAU^hRb)?^+5$vCDf^B5QySQzve(it)tN^<jET#|C~lYn9z3?|;e
z_wOEcM3qm$D_@Xd7@VA+TL9DpG*w`7vw$sUN^x>dQht68<KztjHd@+JUNBSH7?K(C
z8S)s?fHtS+<|9mosM#zgSj(8h%#aFHQkIjBFqkp?UNz8os0^}`BU=7Oa6bk+87_-3
z7E>14xr|*0Cie@aZJsZj&!`M{GuWOYpfl5vUBJL}^5bMVQL(Th)`E#sA3-eyD?|1N
zrYy3B46F@6(}CUq>njT`%FD^mO9zTDPEHgT+w3ZC$H=i!2oeXA6D1^s5I#W&0~MZ@
buwma=u$gf)yTUIPexz_3Os<@KTH*}=c9F9!

delta 1069
zcmZn(XbG6$&uFkQU^hRb!DJo*$v9rWZww3!EDU-K=?s|+CAs-7E=f80NkB1<*GvAW
zJ?B5_h$^3gSH2*_FgQ6sw*aVzfx+~^<Yoce$u|Xb*p$EPReLf{<`$HLGB@iB)-q0(
z5l*USWyobnWk><qp6HpApA5BK0H}XG5YPJ$1|Z`YkW}WRBkW-<DC|I$MfSzS7V(MO
zIKjR^(x00T^M^VE2X-aMUSXY4u(?XOm{9=PUIwNEKPL-_im|^}JKXWA_Q+&iQE@oi
zTU0Uu916?~MGW~2>1Dx1c{%xc=|G1v0x=syF+&MMA`oXXB%^s77~qU`NZv+Kn^az0
z01cv@lP`!CYDiXB8<`pCC>WWW*6Ju!8yXsz=_r^QnAX;Ea)>JHTL;Bw=j7()cTdg`
zldtbVw;IJiKuL6Y<d9UX=1zJ9Ne?JaLWCs)2QD>`z?6a}3@jFHE)Y#%WH(Zo#3{M$
w$Ye%w@yYMRcwqd^jN-xUo7ok9vB)wobOUum0~N*fqp<-_OjL=D$pxYh0f#RY0{{R3

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 faa089c7d39e44268b3d457f00d9f4301a3aba17..708529371856dfb0ec232e66fc8be9f586e8816e 100644
GIT binary patch
delta 48
zcmZp1XmOa}&nUGqU^hRb)Mg%m8b;2P;^ds9{QMk-$%(=en>z&K*fz6Ed}G;sM}(aj
E0D3nMSO5S3

delta 40
wcmZp1XmOa}&nUSuU^hRb<Ypd$8ph2l1>@KzHYjdpm-xoASx)pN)5Hcj01+Myf&c&j