Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating Database Release #708

Merged
merged 2 commits into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/group/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ class MembershipAdmin(admin.ModelAdmin):
"user",
)

search_fields = [
"user__first_name",
"user__last_name"
]


@admin.register(models.MembershipHistory)
class MembershipHistoryAdmin(admin.ModelAdmin):
Expand Down
2 changes: 1 addition & 1 deletion compose/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# The `dev`-stage installs dependencies copies the required files, waits for the database connection
# and runs the server in "development-mode".
# Use --target=dev to only use this stage.
FROM python:3.9-slim-buster as dev
FROM python:3.11-slim-bullseye as dev
ENV PYTHONUNBUFFERED 1

WORKDIR /usr/src
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: '3.8'
version: "3.8"

services:
db:
image: mysql:5.7
image: mysql:8.0
container_name: db
platform: linux/amd64
restart: always
Expand All @@ -21,7 +21,7 @@ services:
image: phpmyadmin/phpmyadmin
restart: always
ports:
- '8080:80'
- "8080:80"
environment:
PMA_HOST: db
MYSQL_ROOT_PASSWORD: password
Expand Down Expand Up @@ -56,4 +56,4 @@ services:
image: rabbitmq:3.9.13
container_name: rabbitmq
ports:
- 5672:5672
- 5672:5672
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ slack-sdk == 3.19.3

# Django
# ------------------------------------------------------------------------------
Django==4.0.8
Django==4.2.5
django-enumchoicefield == 3.0.0
django-filter == 22.1
django-ordered-model~=3.6

# Django REST Framework
djangorestframework==3.13.1
djangorestframework==3.14.0
django-cors-headers
dj-rest-auth == 2.2.3

Expand Down
Loading