Skip to content

Commit 9b2d5c7

Browse files
committed
bump selkies, enable debug in dev mode, enable vaapi if detected
1 parent 424f6c2 commit 9b2d5c7

4 files changed

Lines changed: 11 additions & 5 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN \
1616
https://github.com/selkies-project/selkies.git \
1717
/src && \
1818
cd /src && \
19-
git checkout -f 29466e687d2dbed57f657e47b69fab217a81ef1f
19+
git checkout -f fe93efd4c59aed20ede8562b3b9d9e815443f097
2020

2121
RUN \
2222
echo "**** build shared core library ****" && \
@@ -190,7 +190,7 @@ RUN \
190190
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
191191
curl -o \
192192
/tmp/selkies.tar.gz -L \
193-
"https://github.com/selkies-project/selkies/archive/29466e687d2dbed57f657e47b69fab217a81ef1f.tar.gz" && \
193+
"https://github.com/selkies-project/selkies/archive/fe93efd4c59aed20ede8562b3b9d9e815443f097.tar.gz" && \
194194
cd /tmp && \
195195
tar xf selkies.tar.gz && \
196196
cd selkies-* && \

Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN \
1616
https://github.com/selkies-project/selkies.git \
1717
/src && \
1818
cd /src && \
19-
git checkout -f 29466e687d2dbed57f657e47b69fab217a81ef1f
19+
git checkout -f fe93efd4c59aed20ede8562b3b9d9e815443f097
2020

2121
RUN \
2222
echo "**** build shared core library ****" && \
@@ -188,7 +188,7 @@ RUN \
188188
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
189189
curl -o \
190190
/tmp/selkies.tar.gz -L \
191-
"https://github.com/selkies-project/selkies/archive/29466e687d2dbed57f657e47b69fab217a81ef1f.tar.gz" && \
191+
"https://github.com/selkies-project/selkies/archive/fe93efd4c59aed20ede8562b3b9d9e815443f097.tar.gz" && \
192192
cd /tmp && \
193193
tar xf selkies.tar.gz && \
194194
cd selkies-* && \

root/etc/s6-overlay/s6-rc.d/init-selkies-config/run

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,11 @@ if [ "$proot_updated" = true ]; then
197197
[ -f "$HOME/.bashrc" ] && chown abc:abc "$HOME/.bashrc"
198198
fi
199199

200+
# Enable vaapi if device detected
201+
if ! which nvidia-smi && [ -e "/dev/dri/renderD128" ] && [ ! -e "/dev/dri/renderD129" ] && [ -z ${DRI_NODE+x} ]; then
202+
printf "/dev/dri/renderD128" > /run/s6/container_environment/DRI_NODE
203+
fi
204+
200205
# js setup
201206
mkdir -pm1777 /dev/input
202207
touch /tmp/selkies_js.log

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ if [ ! -z ${DEV_MODE+x} ]; then
5353
nodemon -V --ext py --exec \
5454
"python3" -m selkies \
5555
--addr="localhost" \
56-
--mode="websockets"
56+
--mode="websockets" \
57+
--debug="true"
5758
fi
5859

5960
# Start Selkies

0 commit comments

Comments
 (0)