From 367b3fddc48b25b18633c6bebc9b09d0e5fb2761 Mon Sep 17 00:00:00 2001 From: Reto Bollinger Date: Sat, 16 Nov 2024 09:20:49 +0100 Subject: [PATCH] Restructured lektor project for simpler builds --- .gitignore | 1 + lektor/docker/Dockerfile | 6 ++++-- lektor/lektordata/{ => project}/PCS.lektorproject | 0 lektor/lektordata/{ => project}/assets/static/style.css | 0 lektor/lektordata/{ => project}/content/about/contents.lr | 0 lektor/lektordata/{ => project}/content/contents.lr | 0 lektor/lektordata/{ => project}/content/kontakt/contents.lr | 0 .../{ => project}/content/pc-stammertal-logo-minimal.svg | 0 .../{ => project}/content/pc-stammertal-logo-minimal.svg.lr | 0 lektor/lektordata/{ => project}/content/termine/contents.lr | 0 .../lektordata/{ => project}/content/vorstand/contents.lr | 0 lektor/lektordata/{ => project}/index.html | 0 lektor/lektordata/{ => project}/models/page.ini | 0 lektor/lektordata/{ => project}/templates/layout.html | 0 .../{ => project}/templates/macros/pagination.html | 0 lektor/lektordata/{ => project}/templates/page.html | 0 16 files changed, 5 insertions(+), 2 deletions(-) rename lektor/lektordata/{ => project}/PCS.lektorproject (100%) rename lektor/lektordata/{ => project}/assets/static/style.css (100%) rename lektor/lektordata/{ => project}/content/about/contents.lr (100%) rename lektor/lektordata/{ => project}/content/contents.lr (100%) rename lektor/lektordata/{ => project}/content/kontakt/contents.lr (100%) rename lektor/lektordata/{ => project}/content/pc-stammertal-logo-minimal.svg (100%) rename lektor/lektordata/{ => project}/content/pc-stammertal-logo-minimal.svg.lr (100%) rename lektor/lektordata/{ => project}/content/termine/contents.lr (100%) rename lektor/lektordata/{ => project}/content/vorstand/contents.lr (100%) rename lektor/lektordata/{ => project}/index.html (100%) rename lektor/lektordata/{ => project}/models/page.ini (100%) rename lektor/lektordata/{ => project}/templates/layout.html (100%) rename lektor/lektordata/{ => project}/templates/macros/pagination.html (100%) rename lektor/lektordata/{ => project}/templates/page.html (100%) diff --git a/.gitignore b/.gitignore index 0c376ea..bfc1380 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ public/ +lektor/lektordata/output/ .DS_Store diff --git a/lektor/docker/Dockerfile b/lektor/docker/Dockerfile index 03d96c0..044f78f 100644 --- a/lektor/docker/Dockerfile +++ b/lektor/docker/Dockerfile @@ -3,6 +3,8 @@ FROM debian:latest RUN apt update RUN apt install -y python3-pip python3-venv pipx RUN pipx install lektor -RUN mkdir /opt/lektor -WORKDIR /opt/lektor +RUN mkdir -p /opt/lektor/project && mkdir -p /opt/lektor/output + +WORKDIR /opt/lektor/project + ENV PATH="$PATH:/root/.local/bin" diff --git a/lektor/lektordata/PCS.lektorproject b/lektor/lektordata/project/PCS.lektorproject similarity index 100% rename from lektor/lektordata/PCS.lektorproject rename to lektor/lektordata/project/PCS.lektorproject diff --git a/lektor/lektordata/assets/static/style.css b/lektor/lektordata/project/assets/static/style.css similarity index 100% rename from lektor/lektordata/assets/static/style.css rename to lektor/lektordata/project/assets/static/style.css diff --git a/lektor/lektordata/content/about/contents.lr b/lektor/lektordata/project/content/about/contents.lr similarity index 100% rename from lektor/lektordata/content/about/contents.lr rename to lektor/lektordata/project/content/about/contents.lr diff --git a/lektor/lektordata/content/contents.lr b/lektor/lektordata/project/content/contents.lr similarity index 100% rename from lektor/lektordata/content/contents.lr rename to lektor/lektordata/project/content/contents.lr diff --git a/lektor/lektordata/content/kontakt/contents.lr b/lektor/lektordata/project/content/kontakt/contents.lr similarity index 100% rename from lektor/lektordata/content/kontakt/contents.lr rename to lektor/lektordata/project/content/kontakt/contents.lr diff --git a/lektor/lektordata/content/pc-stammertal-logo-minimal.svg b/lektor/lektordata/project/content/pc-stammertal-logo-minimal.svg similarity index 100% rename from lektor/lektordata/content/pc-stammertal-logo-minimal.svg rename to lektor/lektordata/project/content/pc-stammertal-logo-minimal.svg diff --git a/lektor/lektordata/content/pc-stammertal-logo-minimal.svg.lr b/lektor/lektordata/project/content/pc-stammertal-logo-minimal.svg.lr similarity index 100% rename from lektor/lektordata/content/pc-stammertal-logo-minimal.svg.lr rename to lektor/lektordata/project/content/pc-stammertal-logo-minimal.svg.lr diff --git a/lektor/lektordata/content/termine/contents.lr b/lektor/lektordata/project/content/termine/contents.lr similarity index 100% rename from lektor/lektordata/content/termine/contents.lr rename to lektor/lektordata/project/content/termine/contents.lr diff --git a/lektor/lektordata/content/vorstand/contents.lr b/lektor/lektordata/project/content/vorstand/contents.lr similarity index 100% rename from lektor/lektordata/content/vorstand/contents.lr rename to lektor/lektordata/project/content/vorstand/contents.lr diff --git a/lektor/lektordata/index.html b/lektor/lektordata/project/index.html similarity index 100% rename from lektor/lektordata/index.html rename to lektor/lektordata/project/index.html diff --git a/lektor/lektordata/models/page.ini b/lektor/lektordata/project/models/page.ini similarity index 100% rename from lektor/lektordata/models/page.ini rename to lektor/lektordata/project/models/page.ini diff --git a/lektor/lektordata/templates/layout.html b/lektor/lektordata/project/templates/layout.html similarity index 100% rename from lektor/lektordata/templates/layout.html rename to lektor/lektordata/project/templates/layout.html diff --git a/lektor/lektordata/templates/macros/pagination.html b/lektor/lektordata/project/templates/macros/pagination.html similarity index 100% rename from lektor/lektordata/templates/macros/pagination.html rename to lektor/lektordata/project/templates/macros/pagination.html diff --git a/lektor/lektordata/templates/page.html b/lektor/lektordata/project/templates/page.html similarity index 100% rename from lektor/lektordata/templates/page.html rename to lektor/lektordata/project/templates/page.html