Commit a62e05c

@@ -12,6 +12,8 @@ on:
       - src/**
       - .github/workflows/docker.yml
       - docker/Dockerfile
+      - docker/cont-init.d/**
+      - docker/services/**
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

@@ -1,17 +1,4 @@
-#!/command/with-contenv bash
-
-PUID=${PUID:-1000}
-PGID=${PGID:-1000}
-
-groupmod -o -g "$PGID" abc
-usermod -o -u "$PUID" abc
-
-
-echo "
-User uid:    $(id -u abc)
-User gid:    $(id -g abc)
--------------------------------------
-"
+#!/bin/bash
 
 # skip messages from `cutword`. e.g. "Loading dictionary..."
 find "/venv/lib/python3.12/site-packages/cutword" -type f -name "*.py" -print0 | xargs -0 sed -i 's/print(/# print(/'
@@ -31,5 +18,3 @@ EOF
 
 # fix regex string
 sed -i 's/re_skip = re.compile("(/re_skip = re.compile(r"(/' /venv/lib/python3.12/site-packages/cutword/cutword.py
-
-chown abc:abc /app

@@ -0,0 +1,15 @@
+#!/command/with-contenv bash
+
+PUID=${PUID:-1000}
+PGID=${PGID:-1000}
+
+groupmod -o -g "$PGID" abc
+usermod -o -u "$PUID" abc
+chown abc:abc /app
+
+
+echo "
+User uid:    $(id -u abc)
+User gid:    $(id -g abc)
+-------------------------------------
+"

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "BennyBot exited with code $1"
\ No newline at end of file

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec with-contenv s6-setuidgid abc python /app/main.py

@@ -0,0 +1,1 @@
+longrun

@@ -14,8 +14,6 @@ COPY --from=ffmpeg /ffprobe /.venv/bin/ffprobe
 FROM python
 COPY --link --from=s6 / /
 
-## add PUID and PGID support
-COPY docker/fix-permission /etc/cont-init.d/10-adduser
 # copy venv
 COPY --from=venv /.venv /venv
 

@@ -1,5 +1,6 @@
 ARG IMAGE_NAME
 FROM $IMAGE_NAME:base-latest
+COPY docker/cont-init.d/ /etc/cont-init.d
+COPY docker/services/ /etc/s6-overlay/s6-rc.d
 COPY --chown=abc src /app
 WORKDIR /app
-CMD ["with-contenv", "s6-setuidgid", "abc", "python", "/app/main.py"]