From d5caace90517497b9666053b0882c7c80fedce05 Mon Sep 17 00:00:00 2001 From: Mike Lang Date: Fri, 18 Oct 2024 09:59:25 +1100 Subject: [PATCH] Move buscribe/buscribe to buscribe/ and everything else to buscribe-remainder/ And make buscribe buildable using ./build --- build | 1 + {buscribe => buscribe-remainder}/.dockerignore | 0 {buscribe => buscribe-remainder}/.gitignore | 0 {buscribe => buscribe-remainder}/LICENSE | 0 {buscribe => buscribe-remainder}/README.md | 0 {buscribe => buscribe-remainder}/build.sh | 0 {buscribe => buscribe-remainder}/buscribe_data.sql | 0 {buscribe => buscribe-remainder}/docker-compose.yml | 0 {buscribe => buscribe-remainder}/fetch_models.sh | 0 {buscribe => buscribe-remainder}/nginx/Dockerfile | 0 {buscribe => buscribe-remainder}/nginx/nginx.conf | 0 {buscribe => buscribe-remainder}/test_buscribe_container.sh | 0 buscribe/{buscribe => }/Dockerfile | 2 +- buscribe/buscribe/Dockerfile.dockerignore | 1 - buscribe/buscribe/{buscribe => }/__init__.py | 0 buscribe/buscribe/{buscribe => }/__main__.py | 0 buscribe/buscribe/{buscribe => }/buscribe.py | 0 buscribe/buscribe/{buscribe => }/main.py | 0 buscribe/buscribe/{buscribe => }/recognizer.py | 0 buscribe/{buscribe => }/setup.py | 0 20 files changed, 2 insertions(+), 2 deletions(-) rename {buscribe => buscribe-remainder}/.dockerignore (100%) rename {buscribe => buscribe-remainder}/.gitignore (100%) rename {buscribe => buscribe-remainder}/LICENSE (100%) rename {buscribe => buscribe-remainder}/README.md (100%) rename {buscribe => buscribe-remainder}/build.sh (100%) rename {buscribe => buscribe-remainder}/buscribe_data.sql (100%) rename {buscribe => buscribe-remainder}/docker-compose.yml (100%) rename {buscribe => buscribe-remainder}/fetch_models.sh (100%) rename {buscribe => buscribe-remainder}/nginx/Dockerfile (100%) rename {buscribe => buscribe-remainder}/nginx/nginx.conf (100%) rename {buscribe => buscribe-remainder}/test_buscribe_container.sh (100%) rename buscribe/{buscribe => }/Dockerfile (95%) delete mode 100644 buscribe/buscribe/Dockerfile.dockerignore rename buscribe/buscribe/{buscribe => }/__init__.py (100%) rename buscribe/buscribe/{buscribe => }/__main__.py (100%) rename buscribe/buscribe/{buscribe => }/buscribe.py (100%) rename buscribe/buscribe/{buscribe => }/main.py (100%) rename buscribe/buscribe/{buscribe => }/recognizer.py (100%) rename buscribe/{buscribe => }/setup.py (100%) diff --git a/build b/build index 03eacff..edc975e 100755 --- a/build +++ b/build @@ -13,6 +13,7 @@ cd "$(dirname "$(realpath "$0")")" # The different images we can build COMPONENTS=( backfiller + buscribe buscribe-api chat_archiver cutter diff --git a/buscribe/.dockerignore b/buscribe-remainder/.dockerignore similarity index 100% rename from buscribe/.dockerignore rename to buscribe-remainder/.dockerignore diff --git a/buscribe/.gitignore b/buscribe-remainder/.gitignore similarity index 100% rename from buscribe/.gitignore rename to buscribe-remainder/.gitignore diff --git a/buscribe/LICENSE b/buscribe-remainder/LICENSE similarity index 100% rename from buscribe/LICENSE rename to buscribe-remainder/LICENSE diff --git a/buscribe/README.md b/buscribe-remainder/README.md similarity index 100% rename from buscribe/README.md rename to buscribe-remainder/README.md diff --git a/buscribe/build.sh b/buscribe-remainder/build.sh similarity index 100% rename from buscribe/build.sh rename to buscribe-remainder/build.sh diff --git a/buscribe/buscribe_data.sql b/buscribe-remainder/buscribe_data.sql similarity index 100% rename from buscribe/buscribe_data.sql rename to buscribe-remainder/buscribe_data.sql diff --git a/buscribe/docker-compose.yml b/buscribe-remainder/docker-compose.yml similarity index 100% rename from buscribe/docker-compose.yml rename to buscribe-remainder/docker-compose.yml diff --git a/buscribe/fetch_models.sh b/buscribe-remainder/fetch_models.sh similarity index 100% rename from buscribe/fetch_models.sh rename to buscribe-remainder/fetch_models.sh diff --git a/buscribe/nginx/Dockerfile b/buscribe-remainder/nginx/Dockerfile similarity index 100% rename from buscribe/nginx/Dockerfile rename to buscribe-remainder/nginx/Dockerfile diff --git a/buscribe/nginx/nginx.conf b/buscribe-remainder/nginx/nginx.conf similarity index 100% rename from buscribe/nginx/nginx.conf rename to buscribe-remainder/nginx/nginx.conf diff --git a/buscribe/test_buscribe_container.sh b/buscribe-remainder/test_buscribe_container.sh similarity index 100% rename from buscribe/test_buscribe_container.sh rename to buscribe-remainder/test_buscribe_container.sh diff --git a/buscribe/buscribe/Dockerfile b/buscribe/Dockerfile similarity index 95% rename from buscribe/buscribe/Dockerfile rename to buscribe/Dockerfile index 4e45e24..24e8eba 100644 --- a/buscribe/buscribe/Dockerfile +++ b/buscribe/Dockerfile @@ -17,7 +17,7 @@ RUN cd /tmp \ COPY common /tmp/common RUN pip install /tmp/common && rm -r /tmp/common -COPY buscribe/buscribe /tmp/buscribe +COPY buscribe /tmp/buscribe RUN pip install /tmp/buscribe && rm -r /tmp/buscribe ENTRYPOINT ["python3", "-m", "buscribe", "--base-dir", "/mnt"] diff --git a/buscribe/buscribe/Dockerfile.dockerignore b/buscribe/buscribe/Dockerfile.dockerignore deleted file mode 100644 index 8cef4e6..0000000 --- a/buscribe/buscribe/Dockerfile.dockerignore +++ /dev/null @@ -1 +0,0 @@ -!models/ diff --git a/buscribe/buscribe/buscribe/__init__.py b/buscribe/buscribe/__init__.py similarity index 100% rename from buscribe/buscribe/buscribe/__init__.py rename to buscribe/buscribe/__init__.py diff --git a/buscribe/buscribe/buscribe/__main__.py b/buscribe/buscribe/__main__.py similarity index 100% rename from buscribe/buscribe/buscribe/__main__.py rename to buscribe/buscribe/__main__.py diff --git a/buscribe/buscribe/buscribe/buscribe.py b/buscribe/buscribe/buscribe.py similarity index 100% rename from buscribe/buscribe/buscribe/buscribe.py rename to buscribe/buscribe/buscribe.py diff --git a/buscribe/buscribe/buscribe/main.py b/buscribe/buscribe/main.py similarity index 100% rename from buscribe/buscribe/buscribe/main.py rename to buscribe/buscribe/main.py diff --git a/buscribe/buscribe/buscribe/recognizer.py b/buscribe/buscribe/recognizer.py similarity index 100% rename from buscribe/buscribe/buscribe/recognizer.py rename to buscribe/buscribe/recognizer.py diff --git a/buscribe/buscribe/setup.py b/buscribe/setup.py similarity index 100% rename from buscribe/buscribe/setup.py rename to buscribe/setup.py