Merge pull request 'added vault builder from public tag documents' (#1) from master into main

Reviewed-on: #1

app/Dockerfile

@@ -1,15 +1,21 @@
-FROM python:3.14-slim
+FROM python:3.10-slim AS builder
 
 ARG DEBUG_MODE=0
 ENV FLASK_DEBUG=$DEBUG_MODE
-ENV FLASK_APP=app
 
-RUN mkdir /app
+ENV FLASK_APP=app.py
-COPY app/requirements.txt /app
-RUN pip3 install -r /app/requirements.txt
-COPY app /app
 
+WORKDIR /app
+
+COPY requirements.txt .
+
+RUN pip3 install -r requirements.txt
+
+COPY . .
+
+EXPOSE 443
 ENTRYPOINT ["flask"]
-CMD ["--app", "app", "run", "--host=0.0.0.0", "--port=80"]
+CMD ["run", "--host=0.0.0.0", "--port=80"]
+# CMD ["--app", ".", "run", "--host=0.0.0.0", "--port=443"]
 
 

app/build.py

@@ -1,26 +0,0 @@
-from obsidian_parser import Vault
-import shutil
-from git import Repo
-
-
-
-def clone_secure_repo(url: str, token: str = "", dest: str): # clone a gittea repo using optional security token into dest dirand return a path to the directory
-    return dest
-
-def public_notes(src: str): # return a list of notes tagged with public from an obsidian directory
-    # build vault from source
-    vault = Vault(src)
-    if vault:
-        print ("found vault")
-    else:
-        print("could not find vault")
-        return []
-
-    # return a list ofnotes
-    return vault.get_notes_with_tag("public")
-
-
-def buld_public_vault(src: str, dest: str): # build the public vault in dest from an obsidian repo in src
-    for note in public_notes(src):
-        print(note.title)
-        shutil.copy2(f"{note.path}", dest)

build.sh

@@ -6,12 +6,10 @@ if [ -z "$1" ]; then
 elif [ "$1" = "-b" ]; then
 	build="--build"
 	echo building
-elif [ "$1" = "-i" ]; then
+elif [ "$1" = "-d" ]; then
-	vaultPath="/home/venus/Documents/Personal-Wiki"
+	up="-d"
-	echo building
+	echo daemon
 fi
 
-#update the .env
+docker compose down
-
+docker compose up $up $build
-#build public vault
-docker compose up -d public_vault_builder

compose.yml

@@ -8,8 +8,9 @@ services:
       - '80:80'
     volumes:
       - ./content:/content
-  # public_vault_builder:
+  public_vault_builder:
-  #   build:
+    build:
-  #     context: public_vault_builder
+      context: public_vault_builder
-  #   volumes: 
+    volumes: 
-  #     - ./public_vault:/content
+      - ${obsidian_vault}:/vault
+      - ./public_vault:/content

public_vault_builder/Dockerfile

@@ -1,8 +1,5 @@
 FROM python:3.12-slim
 
-
-run mkdir /public-vault
-
 WORKDIR /build
 
 COPY requirements.txt .

public_vault_builder/build.py

@@ -1,11 +1,8 @@
 from obsidian_parser import Vault
 import shutil
-from git import Repo
 
-
-# repo_url = "https://gitlab.com/username/my-vault.git"
 dest = "/content"
-src = "Personal-Wiki"
+src = "/vault"
 # Load a vault
 vault = Vault(src)
 

public_vault_builder/requirements.txt

@@ -1,2 +1 @@
 obsidianmd-parser
-GitPython