Release version 4.2.1

Author: regunakyle

Dockerfile

@@ -12,25 +12,24 @@ WORKDIR /app
 
 COPY . .
 
-RUN chmod u+x ./init.sh && \ 
-    ./init.sh
+RUN ./init.sh
 
 FROM python:3.11-slim AS build-image
 
 ARG APP_VERSION
 
+RUN groupadd -g 10001 nonroot && \
+    useradd nonroot -u 10001 -g 10001
+
 COPY --from=compile-image /bin/ffmpeg /bin/ffmpeg
-COPY --from=compile-image /app /app
+COPY --chown=nonroot:nonroot --from=compile-image /app /app
 
 WORKDIR /app
 
 # Set XDG_CACHE_HOME for gallery-dl usage
 ENV XDG_CACHE_HOME=/app/volume
 ENV APP_VERSION=$APP_VERSION
 
-RUN useradd nonroot && \
-    mkdir -m 777 gallery-dl
-
 USER nonroot
 
-CMD ["/app/.venv/bin/my-discord-bot"]
+ENTRYPOINT ["/app/.venv/bin/my-discord-bot"]

README.md

@@ -101,14 +101,14 @@ The list below only shows a subset of commands which I think need further explan
 
 #### **Important**: You must have `ffmepg` installed and setup an OAuth token to use this command
 
-  To set the OAuth token, run `gallery-dl oauth:pixiv`, then follow the instructions given.
+  To set the OAuth token, run `gallery-dl oauth:pixiv` (activate venv first), then follow the instructions given.
 
 - **If you are using Docker**, `ffmpeg` has already been installed for you.
 
     Start the discord bot container, then run in console:
 
     1. `docker exec -it <container-name-or-id> /bin/bash`
-    2. `gallery-dl oauth:pixiv`
+    2. `./.venv/bin/gallery-dl oauth:pixiv`
     3. Follow the instructions given
 
 ### `/connect_music`

init.sh

@@ -1,36 +1,37 @@
 #!/bin/bash
 set -eu -o pipefail
 
-# Get essential tools from apt repo
-apt -y update
-apt install -y --no-install-recommends curl xz-utils
+apt-get -y update
+apt-get install -y --no-install-recommends curl xz-utils
+
+# https://serverfault.com/a/984599
+# Allow users to run the container with arbitary user ID
+mkdir -m 777 gallery-dl
+mkdir -m 777 volume
 
 dir_name=ffmpeg
 mkdir ../$dir_name
+
 pushd ../$dir_name
 
-# Download compiled FFMPEG binary and perform filehash checking
 # TODO: Build a static FFMPEG instead of downloading
 xz_name=$(
-    curl -JOL https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-amd64-static.tar.xz \
+    curl -JOL https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl.tar.xz \
         -w "%{filename_effective}" --retry 3 --retry-all-errors
 )
-md5_name=$(
-    curl -JOL https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-amd64-static.tar.xz.md5 \
+sha256_name=$(
+    curl -JOL https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/checksums.sha256 \
         -w "%{filename_effective}" --retry 3 --retry-all-errors
 )
-md5sum -c "$md5_name"
+sha256sum -c "$sha256_name" --ignore-missing
 
-# Extract the archive and move FFMPEG to PATH
+# Extract the archive and move FFMPEG to a fixed path
 tar xvf "$xz_name" --strip-components 1
-mv ffmpeg /bin/ffmpeg
+mv ./bin/ffmpeg /bin/ffmpeg
 
 popd
 
 # Install Python dependencies
 uv sync
 
-# Use `chmod 777` here instead of `chown nonroot` in case user wants to use their own docker user
-chmod -R 777 ./
-
 exit 0

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "my-discord-bot"
-version = "4.2.0"
+version = "4.2.1"
 description = "Discord Bot by Reguna"
 readme = "README.md"
 requires-python = ">=3.11"