ingest from main selkies init re-org

Author: thelamer

Dockerfile

@@ -16,7 +16,7 @@ RUN \
     https://github.com/selkies-project/selkies.git \
     /src && \
   cd /src && \
-  git checkout -f f56d4a951acbcaf659867561f3f659555dfc0cd7
+  git checkout -f 3a0ed53e79eec52d76292d4c8934eadaa53fa8ce
 
 RUN \
   echo "**** build frontend ****" && \
@@ -176,7 +176,7 @@ RUN \
     | awk '/tag_name/{print $4;exit}' FS='[""]') && \
   curl -o \
     /tmp/selkies.tar.gz -L \
-    "https://github.com/selkies-project/selkies/archive/f56d4a951acbcaf659867561f3f659555dfc0cd7.tar.gz" && \
+    "https://github.com/selkies-project/selkies/archive/3a0ed53e79eec52d76292d4c8934eadaa53fa8ce.tar.gz" && \
   cd /tmp && \
   tar xf selkies.tar.gz && \
   cd selkies-* && \

Dockerfile.aarch64

@@ -16,7 +16,7 @@ RUN \
     https://github.com/selkies-project/selkies.git \
     /src && \
   cd /src && \
-  git checkout -f f56d4a951acbcaf659867561f3f659555dfc0cd7
+  git checkout -f 3a0ed53e79eec52d76292d4c8934eadaa53fa8ce
 
 RUN \
   echo "**** build frontend ****" && \
@@ -174,7 +174,7 @@ RUN \
     | awk '/tag_name/{print $4;exit}' FS='[""]') && \
   curl -o \
     /tmp/selkies.tar.gz -L \
-    "https://github.com/selkies-project/selkies/archive/f56d4a951acbcaf659867561f3f659555dfc0cd7.tar.gz" && \
+    "https://github.com/selkies-project/selkies/archive/3a0ed53e79eec52d76292d4c8934eadaa53fa8ce.tar.gz" && \
   cd /tmp && \
   tar xf selkies.tar.gz && \
   cd selkies-* && \

root/etc/s6-overlay/s6-rc.d/svc-selkies/run

@@ -1,8 +1,5 @@
 #!/usr/bin/with-contenv bash
 
-# Clear the cache registry
-rm -rf "${HOME}/.cache/gstreamer-1.0"
-
 # Default sink setup
 if [ ! -f '/dev/shm/audio.lock' ]; then
   until [ -f /defaults/pid ]; do
@@ -51,16 +48,11 @@ if [ ! -z ${DEV_MODE+x} ]; then
     s6-setuidgid abc npm run serve &
   fi
   # Run backend
-  cd $HOME/src/src/selkies_gstreamer
   s6-setuidgid abc \
-    nodemon --exec \
-      "python3" __main__.py \
-      --addr="localhost" \
-      --port="8081" \
-      --enable_basic_auth="false" \
-      --enable_metrics_http="true" \
-      --metrics_http_port="9081" \
-      --mode="websockets"
+    nodemon \
+      --watch selkies \
+      --ext "py" \
+      --exec "python3 -m selkies --port=8081 --enable_basic_auth=false --mode=websockets"
 fi
 
 
@@ -70,6 +62,4 @@ exec s6-setuidgid abc \
     --addr="localhost" \
     --port="8081" \
     --enable_basic_auth="false" \
-    --enable_metrics_http="true" \
-    --metrics_http_port="9081" \
     --mode="websockets"