Compare commits
No commits in common. "11c04df0740baf8b6baeaf6ca65a701ff01918ba" and "5e527ef10d0230ab8c54df01755f31a5839b92d1" have entirely different histories.
11c04df074
...
5e527ef10d
6 changed files with 770 additions and 824 deletions
|
@ -1,8 +1,8 @@
|
||||||
ARG DEBIAN_RELEASE=bookworm
|
ARG DEBIAN_RELEASE=buster
|
||||||
FROM debian:$DEBIAN_RELEASE AS builder
|
FROM debian:$DEBIAN_RELEASE AS builder
|
||||||
|
|
||||||
ARG GVAAPP=gva
|
ARG GVAAPP=gva
|
||||||
ARG POETRY_VERSION=1.7.1
|
ARG POETRY_VERSION=1.3.1
|
||||||
|
|
||||||
ENV LC_ALL=C.UTF-8
|
ENV LC_ALL=C.UTF-8
|
||||||
ENV LANG=C.UTF-8
|
ENV LANG=C.UTF-8
|
||||||
|
@ -26,7 +26,7 @@ WORKDIR /srv/$GVAAPP
|
||||||
|
|
||||||
COPY poetry.lock pyproject.toml /srv/$GVAAPP/
|
COPY poetry.lock pyproject.toml /srv/$GVAAPP/
|
||||||
|
|
||||||
RUN /root/.local/bin/poetry install --only=main --no-root
|
RUN /root/.local/bin/poetry install --only=main
|
||||||
|
|
||||||
FROM debian:$DEBIAN_RELEASE
|
FROM debian:$DEBIAN_RELEASE
|
||||||
LABEL maintainer="Jan Dittberner <jan@dittberner.info>"
|
LABEL maintainer="Jan Dittberner <jan@dittberner.info>"
|
||||||
|
|
|
@ -19,7 +19,7 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "redis_data:/var/lib/redis"
|
- "redis_data:/var/lib/redis"
|
||||||
gva:
|
gva:
|
||||||
image: gnuviech/gva:bookworm
|
image: gnuviech/gva:buster
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
args:
|
args:
|
||||||
|
@ -67,7 +67,7 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- "../gvaldap/gvaldap:/srv/gvaldap/gvaldap"
|
- "../gvaldap/gvaldap:/srv/gvaldap/gvaldap"
|
||||||
file:
|
file:
|
||||||
image: gnuviech/gvafile:bookworm
|
image: gnuviech/gvafile:buster
|
||||||
build:
|
build:
|
||||||
context: ../gvafile
|
context: ../gvafile
|
||||||
args:
|
args:
|
||||||
|
|
|
@ -161,7 +161,6 @@ MIDDLEWARE = [
|
||||||
"django.contrib.sessions.middleware.SessionMiddleware",
|
"django.contrib.sessions.middleware.SessionMiddleware",
|
||||||
"django.middleware.csrf.CsrfViewMiddleware",
|
"django.middleware.csrf.CsrfViewMiddleware",
|
||||||
"django.contrib.auth.middleware.AuthenticationMiddleware",
|
"django.contrib.auth.middleware.AuthenticationMiddleware",
|
||||||
"allauth.account.middleware.AccountMiddleware",
|
|
||||||
"django.middleware.locale.LocaleMiddleware",
|
"django.middleware.locale.LocaleMiddleware",
|
||||||
"django.contrib.messages.middleware.MessageMiddleware",
|
"django.contrib.messages.middleware.MessageMiddleware",
|
||||||
# uncomment next line to enable translation to browser locale
|
# uncomment next line to enable translation to browser locale
|
||||||
|
|
|
@ -38,7 +38,6 @@ urlpatterns = [
|
||||||
path("contact/", include("contact_form.urls")),
|
path("contact/", include("contact_form.urls")),
|
||||||
path("impressum/", views.flatpage, {"url": "/impressum/"}, name="imprint"),
|
path("impressum/", views.flatpage, {"url": "/impressum/"}, name="imprint"),
|
||||||
path("datenschutz/", views.flatpage, {"url": "/datenschutz/"}, name="privacy"),
|
path("datenschutz/", views.flatpage, {"url": "/datenschutz/"}, name="privacy"),
|
||||||
path("issues/", views.flatpage, {"url": "/issues/"}, name="support"),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# Uncomment the next line to serve media files in dev.
|
# Uncomment the next line to serve media files in dev.
|
||||||
|
|
1572
poetry.lock
generated
1572
poetry.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -4,26 +4,26 @@ version = "0.15.1"
|
||||||
description = "gnuviechadmin web interface"
|
description = "gnuviechadmin web interface"
|
||||||
authors = ["Jan Dittberner <jan@dittberner.info>"]
|
authors = ["Jan Dittberner <jan@dittberner.info>"]
|
||||||
license = "AGPL-3+"
|
license = "AGPL-3+"
|
||||||
readme = "README.rst"
|
readme = "README.md"
|
||||||
|
|
||||||
[tool.poetry.dependencies]
|
[tool.poetry.dependencies]
|
||||||
python = "^3.8"
|
python = "^3.8"
|
||||||
django = "^4.2"
|
django = "^4.2"
|
||||||
psycopg2-binary = "^2.9"
|
psycopg2-binary = "^2.9"
|
||||||
celery = "^5.2.7"
|
celery = "^5.2.7"
|
||||||
django-allauth = "^0.60.0"
|
django-allauth = "^0.52.0"
|
||||||
django-crispy-forms = "^2.0"
|
django-crispy-forms = "^2.0"
|
||||||
django-debug-toolbar = "^4.2"
|
django-debug-toolbar = "^3.8"
|
||||||
django-model-utils = "^4.1"
|
django-model-utils = "^4.1"
|
||||||
gvacommon = {version = "^0.7.0", source = "gnuviech"}
|
gvacommon = {version = "^0.7.0", source = "gnuviech"}
|
||||||
passlib = "^1.7.4"
|
passlib = "^1.7.4"
|
||||||
redis = "^5.0.1"
|
redis = "^4.5.1"
|
||||||
requests-oauthlib = "^1.3.1"
|
requests-oauthlib = "^1.3.1"
|
||||||
django-impersonate = "^1.9.1"
|
django-impersonate = "^1.9.1"
|
||||||
djangorestframework = "^3.14.0"
|
djangorestframework = "^3.14.0"
|
||||||
markdown = "^3.4.3"
|
markdown = "^3.4.3"
|
||||||
django-filter = "^23.1"
|
django-filter = "^23.1"
|
||||||
crispy-bootstrap5 = "^2023.10"
|
crispy-bootstrap5 = "^0.7"
|
||||||
python-magic = "^0.4.27"
|
python-magic = "^0.4.27"
|
||||||
isort = "^5.12.0"
|
isort = "^5.12.0"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue