From e758418f76e3041de59363495b3c52558f980f73 Mon Sep 17 00:00:00 2001 From: Mike Lang Date: Mon, 30 Sep 2024 13:32:09 +1000 Subject: [PATCH] buscribe-api: Move from buscribe/ to top level and add to ./build --- build | 1 + {buscribe/buscribe-api => buscribe-api}/Dockerfile | 2 +- {buscribe/buscribe-api => buscribe-api}/buscribeapi/__init__.py | 0 {buscribe/buscribe-api => buscribe-api}/buscribeapi/__main__.py | 0 .../buscribe-api => buscribe-api}/buscribeapi/buscribeapi.py | 0 {buscribe/buscribe-api => buscribe-api}/buscribeapi/main.py | 0 {buscribe/buscribe-api => buscribe-api}/setup.py | 0 {buscribe/buscribe-api => buscribe-api}/templates/busub.jinja | 0 {buscribe/buscribe-api => buscribe-api}/templates/busubs.jinja | 0 9 files changed, 2 insertions(+), 1 deletion(-) rename {buscribe/buscribe-api => buscribe-api}/Dockerfile (94%) rename {buscribe/buscribe-api => buscribe-api}/buscribeapi/__init__.py (100%) rename {buscribe/buscribe-api => buscribe-api}/buscribeapi/__main__.py (100%) rename {buscribe/buscribe-api => buscribe-api}/buscribeapi/buscribeapi.py (100%) rename {buscribe/buscribe-api => buscribe-api}/buscribeapi/main.py (100%) rename {buscribe/buscribe-api => buscribe-api}/setup.py (100%) rename {buscribe/buscribe-api => buscribe-api}/templates/busub.jinja (100%) rename {buscribe/buscribe-api => buscribe-api}/templates/busubs.jinja (100%) diff --git a/build b/build index 2bade0c..03eacff 100755 --- a/build +++ b/build @@ -13,6 +13,7 @@ cd "$(dirname "$(realpath "$0")")" # The different images we can build COMPONENTS=( backfiller + buscribe-api chat_archiver cutter downloader diff --git a/buscribe/buscribe-api/Dockerfile b/buscribe-api/Dockerfile similarity index 94% rename from buscribe/buscribe-api/Dockerfile rename to buscribe-api/Dockerfile index 24f4fd0..ecf629f 100644 --- a/buscribe/buscribe-api/Dockerfile +++ b/buscribe-api/Dockerfile @@ -12,7 +12,7 @@ RUN pip install /tmp/common && rm -r /tmp/common # Install actual application RUN apk add postgresql-dev postgresql-libs -COPY buscribe/buscribe-api /tmp/buscribe-api +COPY buscribe-api /tmp/buscribe-api RUN pip install /tmp/buscribe-api && cp -r /tmp/buscribe-api/templates /templates \ && rm -r /tmp/buscribe-api diff --git a/buscribe/buscribe-api/buscribeapi/__init__.py b/buscribe-api/buscribeapi/__init__.py similarity index 100% rename from buscribe/buscribe-api/buscribeapi/__init__.py rename to buscribe-api/buscribeapi/__init__.py diff --git a/buscribe/buscribe-api/buscribeapi/__main__.py b/buscribe-api/buscribeapi/__main__.py similarity index 100% rename from buscribe/buscribe-api/buscribeapi/__main__.py rename to buscribe-api/buscribeapi/__main__.py diff --git a/buscribe/buscribe-api/buscribeapi/buscribeapi.py b/buscribe-api/buscribeapi/buscribeapi.py similarity index 100% rename from buscribe/buscribe-api/buscribeapi/buscribeapi.py rename to buscribe-api/buscribeapi/buscribeapi.py diff --git a/buscribe/buscribe-api/buscribeapi/main.py b/buscribe-api/buscribeapi/main.py similarity index 100% rename from buscribe/buscribe-api/buscribeapi/main.py rename to buscribe-api/buscribeapi/main.py diff --git a/buscribe/buscribe-api/setup.py b/buscribe-api/setup.py similarity index 100% rename from buscribe/buscribe-api/setup.py rename to buscribe-api/setup.py diff --git a/buscribe/buscribe-api/templates/busub.jinja b/buscribe-api/templates/busub.jinja similarity index 100% rename from buscribe/buscribe-api/templates/busub.jinja rename to buscribe-api/templates/busub.jinja diff --git a/buscribe/buscribe-api/templates/busubs.jinja b/buscribe-api/templates/busubs.jinja similarity index 100% rename from buscribe/buscribe-api/templates/busubs.jinja rename to buscribe-api/templates/busubs.jinja