Skip to content

Commit 4b69e67

Browse files
committed
improve dev mode to watch for all changes, bump selkies, change default video mode
1 parent 02ddaa9 commit 4b69e67

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN \
1515
https://github.com/selkies-project/selkies.git \
1616
/src && \
1717
cd /src && \
18-
git checkout -f 9a96b7cd1cf3f8750461b01d5e3602ba5e7043c5
18+
git checkout -f a575c2dd446de0bcec490034b68677d3ede34673
1919

2020
RUN \
2121
echo "**** build frontend ****" && \
@@ -185,7 +185,7 @@ RUN \
185185
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
186186
curl -o \
187187
/tmp/selkies.tar.gz -L \
188-
"https://github.com/selkies-project/selkies/archive/9a96b7cd1cf3f8750461b01d5e3602ba5e7043c5.tar.gz" && \
188+
"https://github.com/selkies-project/selkies/archive/a575c2dd446de0bcec490034b68677d3ede34673.tar.gz" && \
189189
cd /tmp && \
190190
tar xf selkies.tar.gz && \
191191
cd selkies-* && \

Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN \
1515
https://github.com/selkies-project/selkies.git \
1616
/src && \
1717
cd /src && \
18-
git checkout -f 9a96b7cd1cf3f8750461b01d5e3602ba5e7043c5
18+
git checkout -f a575c2dd446de0bcec490034b68677d3ede34673
1919

2020
RUN \
2121
echo "**** build frontend ****" && \
@@ -183,7 +183,7 @@ RUN \
183183
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
184184
curl -o \
185185
/tmp/selkies.tar.gz -L \
186-
"https://github.com/selkies-project/selkies/archive/9a96b7cd1cf3f8750461b01d5e3602ba5e7043c5.tar.gz" && \
186+
"https://github.com/selkies-project/selkies/archive/a575c2dd446de0bcec490034b68677d3ede34673.tar.gz" && \
187187
cd /tmp && \
188188
tar xf selkies.tar.gz && \
189189
cd selkies-* && \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fi
6161
# set env based on vars
6262
#printf "${SELKIES_INTERPOSER}${LD_PRELOAD:+:${LD_PRELOAD}}" > /run/s6/container_environment/LD_PRELOAD
6363
printf "${GST_DEBUG:-*:1}" > /run/s6/container_environment/GST_DEBUG
64-
printf "${SELKIES_ENCODER:-x264enc-striped}" > /run/s6/container_environment/SELKIES_ENCODER
64+
printf "${SELKIES_ENCODER:-x264enc}" > /run/s6/container_environment/SELKIES_ENCODER
6565
printf "${SELKIES_FRAMERATE:-60}" > /run/s6/container_environment/SELKIES_FRAMERATE
6666
printf "${SELKIES_ENABLE_RESIZE:-true}" > /run/s6/container_environment/SELKIES_ENABLE_RESIZE
6767
printf "${DISPLAY_SIZEW:-1024}" > /run/s6/container_environment/DISPLAY_SIZEW

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ if [ ! -z ${DEV_MODE+x} ]; then
3939
s6-setuidgid abc npm install
4040
s6-setuidgid abc npm run build
4141
s6-setuidgid abc cp dist/selkies-core.js ../${DEV_MODE}/src/
42+
s6-setuidgid abc nodemon --watch selkies-core.js --exec "npm run build && cp dist/selkies-core.js ../${DEV_MODE}/src/" &
4243
# Copy touch gamepad
4344
s6-setuidgid abc cp ../universal-touch-gamepad/universalTouchGamepad.js ../${DEV_MODE}/src/
45+
s6-setuidgid abc nodemon --watch ../universal-touch-gamepad/universalTouchGamepad.js --exec "cp ../universal-touch-gamepad/universalTouchGamepad.js ../${DEV_MODE}/src/" &
4446
# Copy themes
4547
s6-setuidgid abc cp -a nginx ../${DEV_MODE}/
4648
# Run passed frontend

0 commit comments

Comments
 (0)