Skip to content

Commit

Permalink
Upgrade python version in example environment and resolve build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
marteinn committed Dec 30, 2023
1 parent 88021f3 commit 0b0a8ca
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
### Added
### Changed
### Fixed
- Upgrade python version in example environment and resolve build issues

### Removed
- Drop EOL Python 3.7 support (@marteinn)

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8-slim
FROM python:3.12-slim

WORKDIR /srv

Expand All @@ -14,12 +14,12 @@ ENV PYTHONUNBUFFERED=1 \
COPY . /srv/

RUN apt-get update \
&& apt-get install -y netcat \
&& apt-get install -y netcat-traditional \
binutils libproj-dev \
gettext libpq-dev build-essential \
--no-install-recommends && rm -rf /var/lib/apt/lists/*

RUN pip install psycopg2-binary~=2.8.0 -e .
RUN pip install psycopg2-binary -e .

ENTRYPOINT ["./docker-entrypoint.sh"]
CMD ["runserver"]
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
services:
version: "3"
services:
web:
build: "./"
depends_on:
depends_on:
- db
ports:
- "8080:8080"
Expand All @@ -23,4 +24,3 @@ services:
- POSTGRES_PASSWORD=postgres
- POSTGRES_DB=postgres
- POSTGRES_HOST_AUTH_METHOD=trust
version: "3"
2 changes: 1 addition & 1 deletion settings_dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

DATABASES = {
"default": {
"ENGINE": "django.db.backends.postgresql_psycopg2",
"ENGINE": "django.db.backends.postgresql",
"HOST": "db",
"NAME": "postgres",
"USER": "postgres",
Expand Down

0 comments on commit 0b0a8ca

Please sign in to comment.