diff --git a/DOSPORTAL/settings.py b/DOSPORTAL/settings.py index 4eee07f..2fab706 100644 --- a/DOSPORTAL/settings.py +++ b/DOSPORTAL/settings.py @@ -21,7 +21,7 @@ # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'django-insecure-)&9q7=6szljptu&2a11rq1k-ofhz1s$nxk&t+f=3xk74(vq4jq' +SECRET_KEY = os.getenv('SECRET_KEY', 'django-insecure-)&9q7=6szljptu&2a11rq1k-ofhz1s$nxk&t+f=3xk74(vq4jq') # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True @@ -115,11 +115,11 @@ "default": { #"ENGINE": "django.db.backends.postgresql", "ENGINE": "django.contrib.gis.db.backends.postgis", - "NAME": "dosportal", - "USER": "dosportal_user", - "PASSWORD": "dosportal_password", - "HOST": "10.5.0.5", - "PORT": "5432", + "NAME": os.getenv("POSTGRES_DB", "dosportal"), + "USER": os.getenv("POSTGRES_USER", "dosportal_user"), + "PASSWORD": os.getenv("POSTGRES_PASSWORD", "dosportal_password"), + "HOST": os.getenv("POSTGRES_HOST", "10.5.0.5"), + "PORT": os.getenv("POSTGRES_PORT", "5432"), } } diff --git a/Dockerfile b/Dockerfile index 852fc81..3b325d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,24 @@ -FROM debian:latest +FROM python:3.13-alpine ENV PYTHONDONTWRITEBYTECODE=1 ENV PYTHONUNBUFFERED=1 -RUN apt-get update -RUN apt-get install -y python3 python3-pip python3-setuptools libpq-dev binutils libproj-dev gdal-bin -#RUN apt-get install -y net-tools +RUN apk update +RUN apk add --no-cache \ + postgresql-dev \ + gcc \ + g++ \ + musl-dev \ + linux-headers \ + binutils \ + proj-dev \ + gdal-dev \ + gdal WORKDIR /DOSPORTAL COPY requirements.txt /DOSPORTAL/ -RUN pip3 install -r requirements.txt --break-system-packages +RUN pip install --no-cache-dir -r requirements.txt #COPY . /DOSPORTAL/ #COPY cari7a /usr/local/bin/cari7a -ENTRYPOINT python3 manage.py runserver 0.0.0.0:8000 +ENTRYPOINT ["python", "manage.py", "runserver", "0.0.0.0:8000"] diff --git a/requirements.txt b/requirements.txt index 33373ba..8784661 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ -django -django-bootstrap-v5 +django>=6.0 psycopg2 matplotlib #basemap @@ -34,7 +33,6 @@ django-guardian django-gravatar2 django-prettyjson -tables django-markdownx markdown