From 0776cea7bcfacaa859b89af173f13bba84415ac7 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 7 Oct 2023 09:05:17 +0700 Subject: [PATCH 1/4] fix backup for empty index --- tubearchivist/home/src/es/index_setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tubearchivist/home/src/es/index_setup.py b/tubearchivist/home/src/es/index_setup.py index 0f84de7..c913da7 100644 --- a/tubearchivist/home/src/es/index_setup.py +++ b/tubearchivist/home/src/es/index_setup.py @@ -152,7 +152,6 @@ class ElasitIndexWrap: index_name, expected_map, expected_set = self._config_split(index) handler = ElasticIndex(index_name, expected_map, expected_set) if not handler.exists: - self._check_backup() handler.create_blank() continue From 4a4a2742591da37a040b1e71055b00dd98c5a223 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 7 Oct 2023 09:05:34 +0700 Subject: [PATCH 2/4] bump requirements --- tubearchivist/requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tubearchivist/requirements.txt b/tubearchivist/requirements.txt index b513611..11ab42d 100644 --- a/tubearchivist/requirements.txt +++ b/tubearchivist/requirements.txt @@ -1,13 +1,13 @@ apprise==1.5.0 celery==5.3.4 -Django==4.2.5 -django-auth-ldap==4.5.0 +Django==4.2.6 +django-auth-ldap==4.6.0 django-cors-headers==4.2.0 djangorestframework==3.14.0 Pillow==10.0.1 -redis==5.0.0 +redis==5.0.1 requests==2.31.0 ryd-client==0.0.6 uWSGI==2.0.22 whitenoise==6.5.0 -yt-dlp @ git+https://github.com/yt-dlp/yt-dlp@cc8d8441524ec3442d7c0d3f8f33f15b66aa06f3 \ No newline at end of file +yt-dlp==2023.10.7 From 81a5f1560084c5df3c84c1a0f9ada2e7abae1362 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 7 Oct 2023 09:49:51 +0700 Subject: [PATCH 3/4] add health check example --- docker-compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index e309f36..c939085 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,12 @@ services: - TA_PASSWORD=verysecret # your initial TA credentials - ELASTIC_PASSWORD=verysecret # set password for Elasticsearch - TZ=America/New_York # set your time zone + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8000/health"] + interval: 2m + timeout: 10s + retries: 3 + start_period: 30s depends_on: - archivist-es - archivist-redis From 4184736beebdf52be92f2c6c406b9899d7e3a5fa Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 7 Oct 2023 09:53:32 +0700 Subject: [PATCH 4/4] update version --- tubearchivist/config/management/commands/ta_startup.py | 2 +- tubearchivist/config/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tubearchivist/config/management/commands/ta_startup.py b/tubearchivist/config/management/commands/ta_startup.py index 8ff5f37..602731f 100644 --- a/tubearchivist/config/management/commands/ta_startup.py +++ b/tubearchivist/config/management/commands/ta_startup.py @@ -223,7 +223,7 @@ class Command(BaseCommand): raise CommandError(message) def _mig_move_users_to_es(self): # noqa: C901 - """migration: update from 0.4.1 to 0.5.0 move user config to ES""" + """migration: update from 0.4.1 to 0.4.2 move user config to ES""" self.stdout.write("[MIGRATION] move user configuration to ES") redis = RedisArchivist() diff --git a/tubearchivist/config/settings.py b/tubearchivist/config/settings.py index 0afef8c..0175985 100644 --- a/tubearchivist/config/settings.py +++ b/tubearchivist/config/settings.py @@ -269,4 +269,4 @@ CORS_ALLOW_HEADERS = list(default_headers) + [ # TA application settings TA_UPSTREAM = "https://github.com/tubearchivist/tubearchivist" -TA_VERSION = "v0.4.2-unstable" +TA_VERSION = "v0.4.2"