Fix Docker startup handling for release images

Author: pho

.github/workflows/docker-publish.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - "v*"
+      - "[0-9]*.[0-9]*.[0-9]*"
   workflow_dispatch:
 
 env:

Dockerfile

@@ -32,9 +32,12 @@ COPY backend-bun/src /app/backend-bun/src
 COPY backend-bun/config /app/backend-bun/config
 RUN mkdir -p /app/backend-bun/logs /app/frontend-solid
 
+COPY docker-entrypoint.sh /usr/local/bin/mediaflick-entrypoint
+RUN chmod +x /usr/local/bin/mediaflick-entrypoint
+
 COPY frontend-solid/server.ts /app/frontend-solid/server.ts
 COPY --from=frontend-build /build/frontend-solid/dist /app/frontend-solid/dist
 
 EXPOSE 3867 5000
 
-CMD ["sh", "-c", "set -e; PORT=${BACKEND_PORT} bun /app/backend-bun/src/app/server.ts & backend_pid=$!; trap 'kill ${backend_pid} >/dev/null 2>&1 || true' INT TERM EXIT; PORT=${FRONTEND_PORT} BACKEND_HTTP_ORIGIN=http://127.0.0.1:${BACKEND_PORT} BACKEND_WS_ORIGIN=ws://127.0.0.1:${BACKEND_PORT} bun /app/frontend-solid/server.ts"]
+ENTRYPOINT ["/usr/local/bin/mediaflick-entrypoint"]

docker-entrypoint.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+set -e
+
+run_mediaflick() {
+  PORT="${BACKEND_PORT}" bun /app/backend-bun/src/app/server.ts &
+  backend_pid=$!
+  trap 'kill "${backend_pid}" >/dev/null 2>&1 || true' INT TERM EXIT
+
+  PORT="${FRONTEND_PORT}" \
+    BACKEND_HTTP_ORIGIN="http://127.0.0.1:${BACKEND_PORT}" \
+    BACKEND_WS_ORIGIN="ws://127.0.0.1:${BACKEND_PORT}" \
+    bun /app/frontend-solid/server.ts
+}
+
+if [ "$#" -eq 0 ]; then
+  run_mediaflick
+fi
+
+if [ "$#" -eq 1 ] && [ "$1" = "start" ]; then
+  run_mediaflick
+fi
+
+if [ "$#" -eq 2 ] && [ "$1" = "bun" ] && [ "$2" = "start" ]; then
+  run_mediaflick
+fi
+
+if [ "$#" -eq 3 ] && [ "$1" = "bun" ] && [ "$2" = "run" ] && [ "$3" = "start" ]; then
+  run_mediaflick
+fi
+
+exec "$@"