1
0
mirror of https://github.com/azlux/botamusique synced 2024-11-23 13:56:17 +00:00

Compare commits

...

2 Commits

Author SHA1 Message Date
9b9b4e40ce upgrade debian base 2021-10-27 02:29:59 +02:00
81ff7c3039 temporary change to yt-dlp
#296 and #297
2021-10-27 02:13:00 +02:00
6 changed files with 13 additions and 9 deletions

View File

@ -1,6 +1,6 @@
ARG ARCH= ARG ARCH=
FROM ${ARCH}python:3-slim-buster AS source FROM ${ARCH}python:3-slim-bullseye AS source
ARG VERSION=master ARG VERSION=master
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
WORKDIR /botamusique WORKDIR /botamusique
@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y git
RUN git clone --recurse-submodules https://github.com/azlux/botamusique.git . && git checkout $VERSION RUN git clone --recurse-submodules https://github.com/azlux/botamusique.git . && git checkout $VERSION
FROM ${ARCH}python:3-slim-buster AS python-builder FROM ${ARCH}python:3-slim-bullseye AS python-builder
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
WORKDIR /botamusique WORKDIR /botamusique
RUN apt-get update \ RUN apt-get update \
@ -20,7 +20,7 @@ RUN python3 -m venv venv \
&& venv/bin/pip install -r requirements.txt && venv/bin/pip install -r requirements.txt
FROM ${ARCH}node:14-buster-slim AS node-builder FROM ${ARCH}node:14-bullseye-slim AS node-builder
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
WORKDIR /botamusique/web WORKDIR /botamusique/web
COPY --from=source /botamusique/web . COPY --from=source /botamusique/web .
@ -28,7 +28,7 @@ RUN npm install
RUN npm run build RUN npm run build
FROM ${ARCH}python:3-slim-buster AS template-builder FROM ${ARCH}python:3-slim-bullseye AS template-builder
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
WORKDIR /botamusique WORKDIR /botamusique
COPY --from=python-builder /botamusique . COPY --from=python-builder /botamusique .
@ -36,7 +36,7 @@ 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/templates
FROM ${ARCH}python:3-slim-buster FROM ${ARCH}python:3-slim-bullseye
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
EXPOSE 8181 EXPOSE 8181
WORKDIR /botamusique WORKDIR /botamusique

View File

@ -1,6 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
command=( "${@}" ) command=( "${@}" )
if [ "$1" == "bash" ] || [ "$1" == "sh" ]; then
exec "${@}"
fi
if [ -n "$BAM_DB" ]; then if [ -n "$BAM_DB" ]; then
command+=( "--db" "$BAM_DB" ) command+=( "--db" "$BAM_DB" )
fi fi

View File

@ -4,7 +4,7 @@ import os
import hashlib import hashlib
import traceback import traceback
from PIL import Image from PIL import Image
import youtube_dl import yt_dlp as youtube_dl
import glob import glob
from io import BytesIO from io import BytesIO
import base64 import base64

View File

@ -1,5 +1,5 @@
import logging import logging
import youtube_dl import yt_dlp as youtube_dl
from constants import tr_cli as tr from constants import tr_cli as tr
import variables as var import variables as var
from media.item import item_builders, item_loaders, item_id_generators from media.item import item_builders, item_loaders, item_id_generators

View File

@ -1,5 +1,5 @@
flask flask
youtube-dl yt-dlp
python-magic python-magic
Pillow Pillow
mutagen mutagen

View File

@ -12,7 +12,7 @@ import zipfile
import re import re
import subprocess as sp import subprocess as sp
import logging import logging
import youtube_dl import yt_dlp as youtube_dl
from importlib import reload from importlib import reload
from sys import platform from sys import platform
import traceback import traceback