storm/bragi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the web interface & update the Dockerfile (#378)

Browse Source 
* fix: update paths

* fix: change path

* fix: build the full image in one step

---------

Co-authored-by: knoflook <knoflook@disroot.org>
This commit is contained in:
p00rt 2023-10-24 17:07:58 +02:00 committed by GitHub
parent cc8fd9c30f
commit 2d145a0585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.drone.yml
View File

@ -21,7 +21,7 @@ steps:
image: python:3 image: python:3
commands: commands:
- pip3 install jinja2 - pip3 install jinja2
- ./scripts/translate_templates.py --lang-dir lang/ --template-dir templates/ - ./scripts/translate_templates.py --lang-dir lang/ --template-dir web/templates/
when: when:
event: event:
- push - push
@ -101,7 +101,7 @@ steps:
image: python:3 image: python:3
commands: commands:
- pip3 install jinja2 - pip3 install jinja2
- ./scripts/translate_templates.py --lang-dir lang/ --template-dir templates/ - ./scripts/translate_templates.py --lang-dir lang/ --template-dir web/templates/
when: when:
event: event:
- push - push

17
Dockerfile
View File

@ -1,3 +1,4 @@
ARG ARCH=
FROM python:3-slim-bullseye AS python-builder FROM python:3-slim-bullseye AS python-builder
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
WORKDIR /botamusique WORKDIR /botamusique
@ -6,11 +7,23 @@ RUN apt-get update \
&& apt-get install --no-install-recommends -y gcc g++ ffmpeg libjpeg-dev libmagic-dev opus-tools zlib1g-dev \ && apt-get install --no-install-recommends -y gcc g++ ffmpeg libjpeg-dev libmagic-dev opus-tools zlib1g-dev \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY . /botamusique COPY . /botamusique
RUN python3 -m venv venv \ RUN python3 -m venv venv \
&& venv/bin/pip install wheel \ && venv/bin/pip install wheel \
&& venv/bin/pip install -r requirements.txt && venv/bin/pip install -r requirements.txt
FROM ${ARCH}node:14-bullseye-slim AS node-builder
ENV DEBIAN_FRONTEND=noninteractive
WORKDIR /botamusique/web
COPY --from=python-builder /botamusique /botamusique
RUN npm install
RUN npm run build
FROM ${ARCH}python:3-slim-bullseye AS template-builder
ENV DEBIAN_FRONTEND=noninteractive
WORKDIR /botamusique
COPY --from=node-builder /botamusique /botamusique
RUN venv/bin/python scripts/translate_templates.py --lang-dir /botamusique/lang --template-dir /botamusique/web/templates
FROM python:3.11-slim-bullseye FROM python:3.11-slim-bullseye
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
@ -18,7 +31,7 @@ EXPOSE 8181
RUN apt update && \ RUN apt update && \
apt install --no-install-recommends -y opus-tools ffmpeg libmagic-dev curl tar && \ apt install --no-install-recommends -y opus-tools ffmpeg libmagic-dev curl tar && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
COPY --from=python-builder /botamusique /botamusique COPY --from=template-builder /botamusique /botamusique
WORKDIR /botamusique WORKDIR /botamusique
RUN chmod +x entrypoint.sh RUN chmod +x entrypoint.sh

2
Dockerfile.local
View File

@ -33,7 +33,7 @@ ENV DEBIAN_FRONTEND=noninteractive
WORKDIR /botamusique WORKDIR /botamusique
COPY --from=python-builder /botamusique . COPY --from=python-builder /botamusique .
COPY --from=node-builder /botamusique/templates templates COPY --from=node-builder /botamusique/templates templates
RUN venv/bin/python scripts/translate_templates.py --lang-dir /botamusique/lang --template-dir /botamusique/templates RUN venv/bin/python scripts/translate_templates.py --lang-dir /botamusique/lang --template-dir /botamusique/web/templates
FROM ${ARCH}python:3-slim-bullseye FROM ${ARCH}python:3-slim-bullseye

2
README.md
View File

@ -96,7 +96,7 @@ python3 -m venv venv
venv/bin/pip install wheel venv/bin/pip install wheel
venv/bin/pip install -r requirements.txt venv/bin/pip install -r requirements.txt
(cd web && npm install && npm run build) (cd web && npm install && npm run build)
venv/bin/python3 ./scripts/translate_templates.py --lang-dir lang/ --template-dir templates/ venv/bin/python3 ./scripts/translate_templates.py --lang-dir lang/ --template-dir web/templates/
``` ```
</details> </details>

4
interface.py
View File

@ -64,7 +64,7 @@ class ReverseProxied(object):
root_dir = os.path.dirname(__file__) root_dir = os.path.dirname(__file__)
web = Flask(__name__, template_folder=os.path.join(root_dir, "templates")) web = Flask(__name__, template_folder=os.path.join(root_dir, "web/templates"))
#web.config['TEMPLATES_AUTO_RELOAD'] = True #web.config['TEMPLATES_AUTO_RELOAD'] = True
log = logging.getLogger("bot") log = logging.getLogger("bot")
user = 'Remote Control' user = 'Remote Control'
@ -227,7 +227,7 @@ def get_all_dirs():
@web.route("/", methods=['GET']) @web.route("/", methods=['GET'])
@requires_auth @requires_auth
def index(): def index():
return open(os.path.join(root_dir, f"templates/index.{var.language}.html"), "r").read() return open(os.path.join(root_dir, f"web/templates/index.{var.language}.html"), "r").read()
@web.route("/playlist", methods=['GET']) @web.route("/playlist", methods=['GET'])