Improve docker image.

.github/workflows/docker-release.yml

@@ -33,8 +33,9 @@ jobs:
         env:
           REGISTRY: ghcr.io
           IMAGE_NAME: ${{ github.repository }}
+          REFERENCE: ${{ github.ref == 'refs/heads/main' && 'latest' || 'github.ref_name' }}
         with:
           context: .
           file: ./Dockerfile
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:develop
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.REFERENCE }}

Dockerfile

@@ -1,19 +1,16 @@
 FROM docker.io/bitnami/minideb:latest
 LABEL org.opencontainers.image.source="https://github.com/tschaefer/beets-store"
 
-RUN install_packages nginx pipx redis-server curl
+RUN install_packages pipx curl
 COPY rootfs /
 
 RUN bash -c ' \
     PIPX_HOME=/opt/beets/.local/pipx \
     PIPX_BIN_DIR=$PIPX_HOME/bin \
     pipx install --include-deps https://github.com/tschaefer/beets-store/archive/refs/heads/develop.zip \
     '
-RUN ln -s /etc/nginx/sites-available/beets-store /etc/nginx/sites-enabled/beets-store
-RUN rm /etc/nginx/sites-enabled/default
-
-VOLUME ["/opt/beets/media/music", "/opt/beets/config"]
-EXPOSE 80
+VOLUME ["/opt/beets/media/music"]
+EXPOSE 3000
 
 USER root
 WORKDIR /opt/beets

docker-compose.env

@@ -0,0 +1,5 @@
+# shellcheck disable=SC2034
+BEETS_BIND_IP=0.0.0.0
+BEETS_BIND_PORT=3000
+BEETS_REDIS_URL=redis://beets_redis:6378
+BEETS_MUSIC_VOLUME=/music

docker-compose.yml

@@ -0,0 +1,23 @@
+version: "3.8"
+
+services:
+  beets_redis:
+    container_name: beets_redis
+    image: docker.io/library/redis:7
+    restart: unless-stopped
+
+  beets_store:
+    container_name: beets_store
+    image: ghcr.io/tschaefer/beets-store:develop
+    depends_on:
+      - beets_redis
+    ports:
+      - 3000:3000
+    healthcheck:
+      test: ["CMD", "curl", "-fs", "-S", "--max-time", "2", "http://${BEETS_BIND_IP}:${BEETS_BIND_PORT}"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - ${BEETS_MUSIC_VOLUME}:/opt/beets/media/music
+    restart: unless-stopped

rootfs/opt/beets/config/beets.yml

@@ -0,0 +1,13 @@
+directory: /opt/beets/media
+library: /opt/beets/db/beets.db
+import:
+    write: no
+    copy: no
+    move: no
+    resume: no
+    autotag: no
+plugins: store fetchart
+fetchart:
+    auto: no
+store:
+    zipdir: /opt/beets/media/store

rootfs/opt/beets/entrypoint

@@ -8,14 +8,14 @@ if [[ ! -f $BEETS_CONFIG ]]; then
     exit 1
 fi
 
-redis-server --daemonize yes
-nginx
+BEETS_REDIS_URL=${BEETS_REDIS_URL:=redis://beets_redis:6379}
+export BEETS_REDIS_URL
 
-rq worker &
+rq worker --url $BEETS_REDIS_URL &
 if [[ -f /opt/beets/beets.db ]]; then
     beet --config $BEETS_CONFIG update
 else
     beet --config $BEETS_CONFIG import /opt/beets/media/music
 fi
 beet --config $BEETS_CONFIG fetchart
-beet --config $BEETS_CONFIG store --wsgi
+beet --config $BEETS_CONFIG store --wsgi ${BEETS_BIND_IP:=0.0.0.0} ${BEETS_BIND_PORT:=3000}