diff --git a/backend/alembic.dev-local.ini b/backend/alembic.dev-local.ini new file mode 100644 index 0000000000000000000000000000000000000000..f0d7f29fef49e9b17680ebf8d7b7bc192ad881c0 --- /dev/null +++ b/backend/alembic.dev-local.ini @@ -0,0 +1,49 @@ + +[alembic] +script_location = alembic + +prepend_sys_path = . + +version_path_separator = os + +sqlalchemy.url = sqlite:///languagelab.dev.sqlite + +[post_write_hooks] +hooks = black +black.type = console_scripts +black.entrypoint = black +black.options = -l 79 + +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARNING +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARNING +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/backend/languagelab.sqbpro b/backend/languagelab.sqbpro deleted file mode 100644 index 9fd6373fcb0241d3bf1fbd0be17e9bb7eaa61e16..0000000000000000000000000000000000000000 --- a/backend/languagelab.sqbpro +++ /dev/null @@ -1 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><sqlb_project><db path="languagelab.sqlite" readonly="0" foreign_keys="1" case_sensitive_like="0" temp_store="0" wal_autocheckpoint="1000" synchronous="2"/><attached/><window><main_tabs open="structure browser pragmas query" current="3"/></window><tab_structure><column_width id="0" width="300"/><column_width id="1" width="0"/><column_width id="2" width="100"/><column_width id="3" width="2614"/><column_width id="4" width="0"/><expanded_item id="0" parent="1"/><expanded_item id="1" parent="1"/><expanded_item id="2" parent="1"/><expanded_item id="3" parent="1"/></tab_structure><tab_browse><table title="contacts" custom_title="0" dock_id="2" table="4,8:maincontacts"/><dock_state state="000000ff00000000fd0000000100000002000005940000032bfc0100000002fb000000160064006f0063006b00420072006f00770073006500310100000000000005940000000000000000fb000000160064006f0063006b00420072006f00770073006500320100000000ffffffff0000010d00ffffff000002c80000000000000004000000040000000800000008fc00000000"/><default_encoding codec=""/><browse_table_settings/></tab_browse><tab_sql><sql name="SQL 1*">SELECT * FROM users;</sql><current_tab id="0"/></tab_sql></sqlb_project> diff --git a/docker-compose.yaml b/docker-compose.yaml index a0a94093c7066ea260b922a50ef0b3d8db0abea3..f32cda31f1eff0d3ba1cfa9710c7502da3a5fd03 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -27,8 +27,8 @@ services: - DATABASE_URL=sqlite:////data/db.sqlite3 - JWT_SECRET_KEY=${LANGUAGELAB_JWT_SECRET_KEY} - JWT_REFRESH_SECRET_KEY=${LANGUAGELAB_JWT_REFRESH_SECRET_KEY} - - ADMIN_EMAIL=${LANGUAGELAB_ADMIN_EMAIL} - - ADMIN_PASSWORD=${LANGUAGELAB_ADMIN_PASSWORD} + - ADMIN_EMAIL=${LANGUAGELAB_ADMIN_EMAIL_DEV} + - ADMIN_PASSWORD=${LANGUAGELAB_ADMIN_PASSWORD_DEV} - CALCOM_SECRET=${LANGUAGELAB_CALCOM_SECRET} - ALLOWED_ORIGINS=https://languagelab.be,https://api.languagelab.be volumes: diff --git a/scripts/update.dev.sh b/scripts/update.dev.sh index 30504586af30056529633553cd4a3b1a0a207c54..1bee0cbe8c61565820cceba761d1dc3f4d0397b1 100755 --- a/scripts/update.dev.sh +++ b/scripts/update.dev.sh @@ -1,20 +1,20 @@ -echo "STARTED DEV UPDATE AT $(date)" > /tmp/docker_update +echo "STARTED DEV UPDATE AT $(date)" > /tmp/docker_update_dev cd /mnt/data/languagelab/repo/ -git checkout dev -git pull +git checkout dev >> /tmp/docker_update_dev +git pull >> /tmp/docker_update_dev -cd /mnt/data/languagelab/repo/ -source app/.env/bin/activate -cd backend -alembic -c alembic.dev.ini upgrade head + +cd /mnt/data/languagelab/repo/backend +source app/.env/bin/activate >> /tmp/docker_update_dev +alembic -c alembic.dev.ini upgrade head >> /tmp/docker_update_dev cd /mnt/data/languagelab/repo/ -docker compose up -d +docker compose up -d >> /tmp/docker_update_dev cd /mnt/data/languagelab/repo/scripts/surveys -python3 survey_maker.py < .creds +python3 survey_maker.py < .creds >> /tmp/docker_update_dev -git checkout main +git checkout main >> /tmp/docker_update_dev -echo "END DEV UPDATE AT $(date)" >> /tmp/docker_update +echo "END DEV UPDATE AT $(date)" >> /tmp/docker_update_dev diff --git a/scripts/update.sh b/scripts/update.sh index 2532ce3e2231d9f881071a5044c0f2151ed7f297..3736faa244ba57b3c6510ce9e962899494d29dc1 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -1,18 +1,17 @@ echo "STARTED UPDATE AT $(date)" > /tmp/docker_update cd /mnt/data/languagelab/repo/ -git checkout main -git pull +git checkout main >> /tmp/docker_update +git pull >> /tmp/docker_update -cd /mnt/data/languagelab/repo/ -source app/.env/bin/activate -cd backend -alembic -c alembic.prod.ini upgrade head +cd /mnt/data/languagelab/repo/backend +source app/.env/bin/activate >> /tmp/docker_update +alembic -c alembic.prod.ini upgrade head >> /tmp/docker_update cd /mnt/data/languagelab/repo/ -docker compose up -d +docker compose up -d >> /tmp/docker_update cd /mnt/data/languagelab/repo/scripts/surveys -python3 survey_maker.py < .creds +python3 survey_maker.py < .creds >> /tmp/docker_update echo "END UPDATE AT $(date)" >> /tmp/docker_update