Skip to content

Commit 1893865

Browse files
committed
bump selkies, multiple input fixes for wayland, ingest latest pixelflux, set default ws port if unset
1 parent d43a4b5 commit 1893865

4 files changed

Lines changed: 11 additions & 4 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 159656dfb3f045bf6e041042140bafaf1bbd9c61
19+
git checkout -f 884036d1f7a4747c625ba8a4ce9eefc9c0a667e8
2020

2121
RUN \
2222
echo "**** build shared core library ****" && \
@@ -183,7 +183,7 @@ RUN \
183183
echo "**** install selkies ****" && \
184184
curl -o \
185185
/tmp/selkies.tar.gz -L \
186-
"https://github.com/selkies-project/selkies/archive/159656dfb3f045bf6e041042140bafaf1bbd9c61.tar.gz" && \
186+
"https://github.com/selkies-project/selkies/archive/884036d1f7a4747c625ba8a4ce9eefc9c0a667e8.tar.gz" && \
187187
cd /tmp && \
188188
tar xf selkies.tar.gz && \
189189
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 159656dfb3f045bf6e041042140bafaf1bbd9c61
19+
git checkout -f 884036d1f7a4747c625ba8a4ce9eefc9c0a667e8
2020

2121
RUN \
2222
echo "**** build shared core library ****" && \
@@ -180,7 +180,7 @@ RUN \
180180
echo "**** install selkies ****" && \
181181
curl -o \
182182
/tmp/selkies.tar.gz -L \
183-
"https://github.com/selkies-project/selkies/archive/159656dfb3f045bf6e041042140bafaf1bbd9c61.tar.gz" && \
183+
"https://github.com/selkies-project/selkies/archive/884036d1f7a4747c625ba8a4ce9eefc9c0a667e8.tar.gz" && \
184184
cd /tmp && \
185185
tar xf selkies.tar.gz && \
186186
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
@@ -291,3 +291,8 @@ else
291291
printf "false" > /run/s6/container_environment/SELKIES_ENABLE_PLAYER3
292292
printf "false" > /run/s6/container_environment/SELKIES_ENABLE_PLAYER3
293293
fi
294+
295+
# set ws port if unset
296+
if [[ -z ${CUSTOM_WS_PORT+x} ]]; then
297+
printf "8082" > /run/s6/container_environment/CUSTOM_WS_PORT
298+
fi

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/with-contenv bash
22

3+
export XCURSOR_THEME=whiteglass
4+
35
# Default sink setup
46
if [ ! -f '/dev/shm/audio.lock' ]; then
57
until [ -f /defaults/pid ]; do

0 commit comments

Comments
 (0)