Update docker build

.dockerignore

@@ -0,0 +1,6 @@
+.venv
+.git
+.github
+.direnv
+__pycache__
+test

.github/workflows/build.yaml

@@ -56,7 +56,8 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           push: true
-          context: docker/
+          context: .
+          file: docker/Dockerfile
           cache-from: type=gha
           cache-to: type=gha,mode=max
           tags: ${{ steps.meta.outputs.tags }}

docker/Dockerfile

@@ -13,16 +13,16 @@ LABEL org.opencontainers.image.source="https://github.com/ramblurr/ovos-roon-ski
 LABEL org.opencontainers.image.vendor="Ramblurr"
 
 USER root
-RUN apk add --no-cache supervisor
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+RUN apk add --no-cache supervisor vim
+COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 USER ovos
 
 
 RUN set -ex; \
     pip3 install git+https://github.com/ramblurr/ovos-skill-roon.git@${VERSION}; \
     rm -rf ${HOME}/.cache
 
-COPY entrypoint.sh /entrypoint.sh
+COPY docker/entrypoint.sh /entrypoint.sh
 
 ENV ROON_PROXY_SOCK ipc://tmp/roon_proxy.sock
 ENV ROON_PUBSUB_SOCK ipc://tmp/roon_pubsub.sock

docker/entrypoint.sh

@@ -6,7 +6,7 @@ COMMAND=${1:-"both"}
 if [ "$COMMAND" = "server" ]; then
     /home/ovos/.venv/bin/roon-proxy-server
 elif [ "$COMMAND" = "skill" ]; then
-    /home/ovos/.venv/bin/ovos-skill-launcher skill-roon.ramblurr
+    /home/ovos/.venv/bin/ovos-skill-launcher roon-skill
 else
     /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
 fi

pyproject.toml

@@ -46,10 +46,11 @@ line-length = 88
 profile = "black"
 
 [tool.poetry.plugins."ovos.plugin.skill"]
-"skill-roon.ramblurr" = "skill_roon:RoonSkill"
+"skill-roon.ramblurr" = "roon_skill:RoonSkill"
 
 [tool.poetry.scripts]
-"roon-skill" = "skill_roon:RoonSkill"
+"roon-skill" = "roon_skill.launcher:main"
+#"roon-skill" = "skill_roon:RoonSkill"
 "roon-proxy-server" = "roon_proxy.roon_proxy_server:main"
 
 

roon_skill/launcher.py

@@ -0,0 +1,6 @@
+#!/usr/bin/env python3
+import sys
+from ovos_workshop.skill_launcher import SkillContainer
+
+c = SkillContainer("skill-roon.ramblurr")
+sys.exit(c.run())

skill.json

@@ -1,6 +1,6 @@
 {
   "name": "Roon Skill",
-  "skillname": "skill-roon.ramblurr",
+  "skillname": "skill_roon",
   "authorname": "Casey Link",
   "foldername": "",
   "url": "https://github.com/ramblurr/ovos-skill-roon",