bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.fet.at/bofh/fet2020

Browse Source
This commit is contained in:
Andreas Stephanides
2022-12-19 09:30:56 +01:00
parent 191ffc682f a3f9965d87
commit 2a01717033
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
docker-compose.test.yml
View File

@@ -3,6 +3,8 @@ services:
mysql: mysql:
image: mariadb image: mariadb
container_name: test_mysql container_name: test_mysql
ports:
- "3306:3306"
environment: environment:
MYSQL_DATABASE: fet2020db MYSQL_DATABASE: fet2020db
MYSQL_USER: user MYSQL_USER: user
@@ -11,8 +13,8 @@ services:
MYSQL_CHARSET: utf8 MYSQL_CHARSET: utf8
MYSQL_ALLOW_EMPTY_PASSWORD: "yes" MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
volumes: volumes:
- mysql-volume:/var/lib/mysql #- mysql-volume:/var/lib/mysql
- /srv/initdb/mysql:/docker-entrypoint-initdb.d/ - /srv/initdb/mysql:/docker-entrypoint-initdb.d/
healthcheck: healthcheck:
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
timeout: 20s timeout: 20s
@@ -28,8 +30,8 @@ services:
MYSQL_CHARSET: utf8 MYSQL_CHARSET: utf8
MYSQL_ALLOW_EMPTY_PASSWORD: "yes" MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
volumes: volumes:
- ep-mysql-volume:/var/lib/mysql #- ep-mysql-volume:/var/lib/mysql
- /srv/initdb/etherpad:/docker-entrypoint-initdb.d/ - /srv/initdb/etherpad:/docker-entrypoint-initdb.d/
etherpad: etherpad:
image: etherpad/etherpad image: etherpad/etherpad
container_name: test_etherpad container_name: test_etherpad
@@ -57,12 +59,12 @@ services:
image: docker.fet.at/fet2020django image: docker.fet.at/fet2020django
container_name: test_fet2020 container_name: test_fet2020
environment: environment:
HOST_NAME: "test.fet.at" HOST_NAME: "test.fet.at"
DEBUG: "False" DEBUG: "False"
SECRET_KEY: "sadfreigjopi4qgjpjrp" SECRET_KEY: "sadfreigjopi4qgjpjrp"
MYSQL_USER: "user" MYSQL_USER: "user"
MYSQL_PASSWORD: "hgu" MYSQL_PASSWORD: "hgu"
ETHERPAD_GROUP: "g.snlbqn7S6ksRbom3" ETHERPAD_GROUP: "g.snlbqn7S6ksRbom3"
depends_on: depends_on:
mysql: mysql:
condition: service_healthy condition: service_healthy

12
fet2020/tasks/migrations/0002_alter_task_options_task_slug_task_slug_id_and_more.py
View File

@@ -1,11 +1,16 @@
# Generated by Django 4.0.6 on 2022-07-30 10:47 # Generated by Django 4.0.6 on 2022-07-30 10:47
import datetime import datetime
import logging
import fet2020.utils
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
import django.db.models.expressions import django.db.models.expressions
from django.utils.text import slugify from django.utils.text import slugify
import fet2020.utils
logger = logging.getLogger(__name__)
def forwards_func(apps, schema_editor): def forwards_func(apps, schema_editor):
@@ -13,6 +18,11 @@ def forwards_func(apps, schema_editor):
for elem in Tasks.objects.all(): for elem in Tasks.objects.all():
elem.slug_id = fet2020.utils.create_random_id() elem.slug_id = fet2020.utils.create_random_id()
elem.slug = elem.slug_id + "-" + slugify(elem.title) elem.slug = elem.slug_id + "-" + slugify(elem.title)
logger.info(f"Task: {elem}")
logger.info(f"Slug ID: {elem.slug_id}")
logger.info(f"Slug: {elem.slug}")
elem.save() elem.save()
TaskLists = apps.get_model("tasks", "TaskList") TaskLists = apps.get_model("tasks", "TaskList")