Merge pull request #25 from troykelly/24-wrong-user-ffmpeg-rather-tha…

…n-xteve Correcting user
troykelly · Jan 24, 2023 · 62325ea · 62325ea
2 parents d77cc4c + 011df04
commit 62325ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -115,6 +115,8 @@ jobs:
         uses: docker/setup-buildx-action@v2
         with:
           install: true
+          driver-opts: |
+            image=moby/buildkit:v0.10.6
 
       - name: 🏗  Login to Docker Container Registry
         uses: docker/login-action@v2

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -122,6 +122,8 @@ jobs:
         uses: docker/setup-buildx-action@v2
         with:
           install: true
+          driver-opts: |
+            image=moby/buildkit:v0.10.6
 
       - name: 🏗  Login to Docker Container Registry
         uses: docker/login-action@v2

diff --git a/xteve/rootfs/usr/local/bin/docker-xteve-entrypoint b/xteve/rootfs/usr/local/bin/docker-xteve-entrypoint
@@ -25,7 +25,7 @@ if [[ -x "/usr/bin/xteve" ]]; then
     pid=$!
   else
     echo >&2 "📺 Executing \"$@\""
-    sudo --preserve-env -H -u ffmpeg -- bash -c 'exec "$@"' bash-run "$@" &
+    sudo --preserve-env -H -u xteve -- bash -c 'exec "$@"' bash-run "$@" &
     pid=$!
   fi
   echo >&2 "🕴️ Waiting for process ${pid} to finish"