Merge pull request #19 from feederbox826/permission-woes

Fix chown and permission issues

.github/workflows/develop.yml

@@ -19,6 +19,7 @@ jobs:
     with:
       upstream: development
       tags: |-
+        develop
         alpine-develop
     secrets:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -5,32 +5,36 @@ for [stashapp/stash#4300](https://github.com/stashapp/stash/issues/4300)
   - PUID/ PGID switching support
 - TZ settings
 - CUDA/ QSV images
-  - NVENV encoding session patches
-- automatic dependency installs
+  - NVENC encoding session patches
+- automatic python dependency installs
 
-## latest/ alpine
-- built on alpine linux, no hardware acceleration support
+-----
+# Tags
+
+## `latest` / `alpine`
 ```
-docker pull ghcr.io/feederbox826/stash-s6:alpine
+ghcr.io/feederbox826/stash-s6:alpine
 ```
-
-## hwaccel
-- built on debian, hardware acceration support via jellyfin-ffmpeg
-- utilizes [jellyfin-ffmpeg](https://jellyfin.org/docs/general/administration/hardware-acceleration/)
+no hardware acceleration, built on alpine linux
+## `hwaccel`
 ```
-docker pull ghcr.io/feederbox826/stash-s6:hwaccel
+ghcr.io/feederbox826/stash-s6:hwaccel
 ```
+hardware acceleration from [jellyfin-ffmpeg](https://jellyfin.org/docs/general/administration/hardware-acceleration/), built on debian
 
-## Deprecation warning
-The following image aliases will be removed
-- hwaccel-jf
+## `-develop` variants
+Append `-develop` to the tag to run the development builds of stash
+- `develop` / `alpine-develop`
+- `hwaccel-develop`
 
-## Jellyfin-ffmpeg7 alpha
-- same as hwaccel, uses jellyfin-ffmpeg7
-- could possibly break and blow up, but just replace with `hwaccel-develop` to revert
-```
-docker pull ghcr.io/feederbox826/stash-s6:hwaccel-develop-jf7
-```
+## `hwaccel-develop-jf7` beta
+- uses jellyfin-ffmpeg7 (BETA), replace with `hwaccel-develop` to revert
+- please report any ffmpeg quirks and issues
+
+## deprecated tags
+- `hwaccel-jf` and `hwaccel-develop-jf`
+
+These tag will be removed with the release of v0.28, please switch to `hwaccel` and `hwaccel-develop` respectively
 
 ## environment variables
 `PUID` - Process User ID  
@@ -40,8 +44,7 @@ docker pull ghcr.io/feederbox826/stash-s6:hwaccel-develop-jf7
 `CUSTOM_CERT_PATH` - Path to custom root certificates to be added to stash (defaults to `/config/certs`)  
 
 ## migration-specific environment variables
-`MIGRATE` - automatic migration from `stashapp/stash` or `hotio/stash`  
-`SKIP_CHOWN` - skips chown operations for /config directory  
+`MIGRATE` - automatic migration from `stashapp/stash` or `hotio/stash`
 
 ## Run modes
 ### `stashapp/stash compatibility`

TODO.md

@@ -1,3 +1,2 @@
 - [ ] adapt matrix into builder
-- [ ] create job dependencies between croxx-platform build and matrix build
 - [ ] add makefile for matrix builder

dockerfile/alpine.Dockerfile

@@ -1,8 +1,7 @@
 # syntax=docker/dockerfile:1
 ARG \
   STASH_TAG="latest" \
-  UPSTREAM_STASH="stashapp/stash:${STASH_TAG}" \
-  UV_VERSION="0.4.6"
+  UPSTREAM_STASH="stashapp/stash:${STASH_TAG}"
 FROM $UPSTREAM_STASH AS stash
 
 FROM alpine:3.20 AS final
@@ -52,10 +51,7 @@ RUN \
     ca-certificates \
     curl \
     ffmpeg \
-    gcc \
     python3 \
-    python3-dev \
-    musl-dev \
     nano \
     ncdu \
     ruby \
@@ -71,7 +67,7 @@ RUN \
     faraday
 RUN \
   echo "**** create stash user and make our folders ****" && \
-  useradd -u 1000 -U -d /config -s /bin/false stash && \
+  useradd -u 911 -U -d /config -s /bin/false stash && \
   usermod -G users stash && \
   mkdir -p \
     /config \

dockerfile/hwaccel.Dockerfile

@@ -1,8 +1,7 @@
 # syntax=docker/dockerfile:1
 ARG \
   STASH_TAG="latest" \
-  UPSTREAM_STASH="stashapp/stash:${STASH_TAG}" \
-  UV_VERSION="0.4.6"
+  UPSTREAM_STASH="stashapp/stash:${STASH_TAG}"
 FROM $UPSTREAM_STASH AS stash
 
 FROM python:3.12-slim-bookworm AS final
@@ -81,10 +80,8 @@ RUN \
     apt-get install -y \
       --no-install-recommends \
       --no-install-suggests \
-      gcc \
       gosu \
       jellyfin-ffmpeg${FFMPEG_VERSION} \
-      libc-dev \
       libvips-tools \
       locales \
       nano \
@@ -123,7 +120,7 @@ RUN \
       faraday
 RUN \
   echo "**** create stash user and make our folders ****" && \
-  useradd -u 1000 -U -d /config -s /bin/bash stash && \
+  useradd -u 911 -U -d /config -s /bin/bash stash && \
   usermod -G users stash && \
   usermod -G video stash && \
   mkdir -p \

docs/switch-to-hwaccel.md

@@ -8,6 +8,7 @@ services:
 -   image: stashapp/stash
 +   image: nerethos/stash-jellyfin-ffmpeg
 
+-   image: stashapp/stash
 +   image: ghcr.io/feederbox826/stash-s6:hwaccel
 ...
 ```

stash/root/defaults/intel-drivers.sh

@@ -6,7 +6,7 @@
 # Description: Install Intel compute-runtime and non-free drivers
 
 install_nonfree_drivers() {
-  if [ ! "$(TARGETPLATFORM)" == 'linux/amd64' ]; then
+  if [ "$(uname -m)" != "x86_64" ]; then
     return 0
   fi
   apt install -y \

stash/root/defaults/requirements.txt

@@ -1,6 +1,6 @@
-bencoder.pyx
 bs4
 cloudscraper
+fastbencode
 lxml
 mechanicalsoup
 pystashlib

stash/root/opt/branding

@@ -14,4 +14,4 @@
          XXXXXXXXX   XXXXXXXXX         
             XXXXXX   XXXXXX            
 
-             stashapp/stash            
+    feederbox826/stash-s6  ⚡+🐍+🎭