From 62a8921e10851fc0a9a8bebd9a201b5d1e596940 Mon Sep 17 00:00:00 2001 From: bacon Date: Thu, 21 Mar 2024 21:04:00 +0300 Subject: [PATCH] docker bush ended --- Dockerfile | 22 ++++++++++++---------- src/integral_lib/Player.py | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 94f1a79..1afcba9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,24 @@ -FROM python:3.12.2-slim-bookworm as builder +FROM intel/intel-optimized-ffmpeg:avx2 as builder LABEL authors="bacon" WORKDIR /app COPY requirements.txt /app -RUN apt-get update -qq \ - && apt-get -qq --no-install-recommends install ffmpeg -y \ - && apt-get clean autoclean -qq \ - &&pip wheel install \ +RUN apt-get update -qq && \ + apt-get install -qq --no-install-recommends python3-pip -y && \ + apt-get clean -qq autoclean && \ + pip wheel install \ --no-cache-dir -q \ --no-deps --wheel-dir /app/wheels \ -r requirements.txt -FROM python:3.12.2-slim-bookworm as runner +FROM intel/intel-optimized-ffmpeg:avx2 as runner WORKDIR /app COPY --from=builder /app/wheels /wheels -COPY --from=builder /usr/bin/ffmpeg /usr/bin/ffmpeg -RUN pip install --no-cache -q /wheels/* - +RUN apt-get update -qq && \ + apt-get install -qq --no-install-recommends libopus-dev python3-pip -y && \ + apt-get clean -qq autoclean && \ + pip install --no-cache -q /wheels/* COPY src/ /app -ENTRYPOINT ["python", "bot.py"] + +ENTRYPOINT ["python3", "bot.py"] diff --git a/src/integral_lib/Player.py b/src/integral_lib/Player.py index 78e62ab..14cf79e 100644 --- a/src/integral_lib/Player.py +++ b/src/integral_lib/Player.py @@ -1,6 +1,6 @@ from asyncio import sleep -from disnake import FFmpegOpusAudio +from disnake import FFmpegPCMAudio from .Logger import logger @@ -10,7 +10,7 @@ async def play_audio(audio, bot, vc): logger.error(f'Playing: {audio}') vp = await vc.connect() if not vp.is_playing(): - vp.play(FFmpegOpusAudio(f'{audio}', )) + vp.play(FFmpegPCMAudio(f'{audio}', )) while vp.is_playing(): await sleep(0.5) await sleep(1)