diff --git a/.gitea/workflows/docker-publish.yaml b/.gitea/workflows/docker-publish.yaml index 586f634..a6328d6 100644 --- a/.gitea/workflows/docker-publish.yaml +++ b/.gitea/workflows/docker-publish.yaml @@ -16,7 +16,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: git.i-am.nexus/nex/college-bot-v2 + images: git.i-am.nexus/nex/college-bot - name: Log into forgejo CR if: ${{ github.event_name != 'pull_request' }} diff --git a/Dockerfile b/Dockerfile index 3a11744..e92c821 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-bookworm +FROM python:3.11-slim LABEL org.opencontainers.image.source https://git.i-am.nexus/nex/college-bot-v2 LABEL org.opencontainers.image.url https://git.i-am.nexus/nex/college-bot-v2 @@ -56,24 +56,24 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get upgrade -y # chromium-shell \ # webext-ublock-origin-chromium +# Install general utilities RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ traceroute \ iputils-ping \ dnsutils \ net-tools \ git \ - ffmpeg \ - imagemagick \ whois \ - wget \ curl \ - htop \ - python3 \ python3-pip \ - python3-dev \ python3-virtualenv \ libmagic-dev +# Install image dependencies +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ffmpeg \ + imagemagick + RUN virtualenv /app/venv RUN /app/venv/bin/pip install --upgrade --no-input pip wheel setuptools diff --git a/src/cogs/ffmeta.py b/src/cogs/ffmeta.py index 17a36c3..4dcf2cd 100644 --- a/src/cogs/ffmeta.py +++ b/src/cogs/ffmeta.py @@ -261,8 +261,6 @@ class FFMeta(commands.Cog): str(rbh), "-c:v", "h264", - "-crf", - "10", "-c:a", "libopus", "-pix_fmt",