Skip to content

Commit d3add4c

Browse files
committed
bump selkies pin pixelflux, add note on wayland mode
1 parent d26823b commit d3add4c

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

Dockerfile

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

2121
RUN \
2222
echo "**** build shared core library ****" && \
@@ -133,6 +133,7 @@ RUN \
133133
libxfixes3 \
134134
libxfont2 \
135135
libxinerama1 \
136+
libxkbcommon-dev \
136137
libxkbcommon-x11-0 \
137138
libxshmfence1 \
138139
libxtst6 \
@@ -190,7 +191,7 @@ RUN \
190191
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
191192
curl -o \
192193
/tmp/selkies.tar.gz -L \
193-
"https://github.com/selkies-project/selkies/archive/c3cf4cc2a3b6984104e494572b232730883c9aa6.tar.gz" && \
194+
"https://github.com/selkies-project/selkies/archive/159656dfb3f045bf6e041042140bafaf1bbd9c61.tar.gz" && \
194195
cd /tmp && \
195196
tar xf selkies.tar.gz && \
196197
cd selkies-* && \
@@ -199,7 +200,7 @@ RUN \
199200
--system-site-packages \
200201
/lsiopy && \
201202
pip install . && \
202-
pip install setuptools && \
203+
pip install setuptools pixelflux==1.4.7 && \
203204
echo "**** install selkies interposer ****" && \
204205
cd addons/js-interposer && \
205206
gcc -shared -fPIC -ldl \

Dockerfile.aarch64

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

2121
RUN \
2222
echo "**** build shared core library ****" && \
@@ -132,6 +132,7 @@ RUN \
132132
libxfixes3 \
133133
libxfont2 \
134134
libxinerama1 \
135+
libxkbcommon-de \
135136
libxkbcommon-x11-0 \
136137
libxshmfence1 \
137138
libxtst6 \
@@ -188,7 +189,7 @@ RUN \
188189
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
189190
curl -o \
190191
/tmp/selkies.tar.gz -L \
191-
"https://github.com/selkies-project/selkies/archive/c3cf4cc2a3b6984104e494572b232730883c9aa6.tar.gz" && \
192+
"https://github.com/selkies-project/selkies/archive/159656dfb3f045bf6e041042140bafaf1bbd9c61.tar.gz" && \
192193
cd /tmp && \
193194
tar xf selkies.tar.gz && \
194195
cd selkies-* && \
@@ -197,7 +198,7 @@ RUN \
197198
--system-site-packages \
198199
/lsiopy && \
199200
pip install . && \
200-
pip install setuptools && \
201+
pip install setuptools pixelflux==1.4.7 && \
201202
echo "**** install selkies interposer ****" && \
202203
cd addons/js-interposer && \
203204
gcc -shared -fPIC -ldl \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ All application settings are passed via environment variables:
2828

2929
| Variable | Description |
3030
| :----: | --- |
31+
| PIXELFLUX_WAYLAND | **Experimental** If set to true the container will initialize in Wayland mode running [Smithay](https://github.com/Smithay/smithay) and Labwc while enabling zero copy encoding with a GPU |
3132
| CUSTOM_PORT | Internal port the container listens on for http if it needs to be swapped from the default 3000 |
3233
| CUSTOM_HTTPS_PORT | Internal port the container listens on for https if it needs to be swapped from the default 3001 |
3334
| CUSTOM_WS_PORT | Internal port the container listens on for websockets if it needs to be swapped from the default 8082 |

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ full_custom_readme: |
3232
3333
| Variable | Description |
3434
| :----: | --- |
35+
| PIXELFLUX_WAYLAND | **Experimental** If set to true the container will initialize in Wayland mode running [Smithay](https://github.com/Smithay/smithay) and Labwc while enabling zero copy encoding with a GPU |
3536
| CUSTOM_PORT | Internal port the container listens on for http if it needs to be swapped from the default 3000 |
3637
| CUSTOM_HTTPS_PORT | Internal port the container listens on for https if it needs to be swapped from the default 3001 |
3738
| CUSTOM_WS_PORT | Internal port the container listens on for websockets if it needs to be swapped from the default 8082 |

0 commit comments

Comments
 (0)