#69 add CUSTOM_WS_PORT bookworm

Author: thelamer

Dockerfile

@@ -16,7 +16,7 @@ RUN \
     https://github.com/selkies-project/selkies.git \
     /src && \
   cd /src && \
-  git checkout -f 58206d48e0e85d2e993ef5486d65455602d908ea
+  git checkout -f a9272cf2328178d7054b8ddffeff169b71575be3
 
 RUN \
   echo "**** build frontend ****" && \
@@ -183,7 +183,7 @@ RUN \
     | awk '/tag_name/{print $4;exit}' FS='[""]') && \
   curl -o \
     /tmp/selkies.tar.gz -L \
-    "https://github.com/selkies-project/selkies/archive/58206d48e0e85d2e993ef5486d65455602d908ea.tar.gz" && \
+    "https://github.com/selkies-project/selkies/archive/a9272cf2328178d7054b8ddffeff169b71575be3.tar.gz" && \
   cd /tmp && \
   tar xf selkies.tar.gz && \
   cd selkies-* && \

Dockerfile.aarch64

@@ -16,7 +16,7 @@ RUN \
     https://github.com/selkies-project/selkies.git \
     /src && \
   cd /src && \
-  git checkout -f 58206d48e0e85d2e993ef5486d65455602d908ea
+  git checkout -f a9272cf2328178d7054b8ddffeff169b71575be3
 
 RUN \
   echo "**** build frontend ****" && \
@@ -181,7 +181,7 @@ RUN \
     | awk '/tag_name/{print $4;exit}' FS='[""]') && \
   curl -o \
     /tmp/selkies.tar.gz -L \
-    "https://github.com/selkies-project/selkies/archive/58206d48e0e85d2e993ef5486d65455602d908ea.tar.gz" && \
+    "https://github.com/selkies-project/selkies/archive/a9272cf2328178d7054b8ddffeff169b71575be3.tar.gz" && \
   cd /tmp && \
   tar xf selkies.tar.gz && \
   cd selkies-* && \

README.md

@@ -30,6 +30,7 @@ All application settings are passed via environment variables:
 | :----: | --- |
 | CUSTOM_PORT | Internal port the container listens on for http if it needs to be swapped from the default 3000. |
 | CUSTOM_HTTPS_PORT | Internal port the container listens on for https if it needs to be swapped from the default 3001. |
+| CUSTOM_WS_PORT | Internal port the container listens on for websockets if it needs to be swapped from the default 8082. |
 | CUSTOM_USER | HTTP Basic auth username, abc is default. |
 | PASSWORD | HTTP Basic auth password, abc is default. If unset there will be no auth |
 | SUBFOLDER | Subfolder for the application if running a subfolder reverse proxy, need both slashes IE `/subfolder/` |

readme-vars.yml

@@ -34,6 +34,7 @@ full_custom_readme: |
   | :----: | --- |
   | CUSTOM_PORT | Internal port the container listens on for http if it needs to be swapped from the default 3000. |
   | CUSTOM_HTTPS_PORT | Internal port the container listens on for https if it needs to be swapped from the default 3001. |
+  | CUSTOM_WS_PORT | Internal port the container listens on for websockets if it needs to be swapped from the default 8082. |
   | CUSTOM_USER | HTTP Basic auth username, abc is default. |
   | PASSWORD | HTTP Basic auth password, abc is default. If unset there will be no auth |
   | SUBFOLDER | Subfolder for the application if running a subfolder reverse proxy, need both slashes IE `/subfolder/` |

root/defaults/default.conf

@@ -36,7 +36,7 @@ server {
     proxy_connect_timeout   3600s;
     proxy_buffering         off;
     client_max_body_size    10M;
-    proxy_pass              http://127.0.0.1:8082;
+    proxy_pass              http://127.0.0.1:CWS;
   }
   location SUBFOLDERfiles {
     fancyindex on;
@@ -90,7 +90,7 @@ server {
     proxy_connect_timeout   3600s;
     proxy_buffering         off;
     client_max_body_size    10M;
-    proxy_pass              http://127.0.0.1:8082;
+    proxy_pass              http://127.0.0.1:CWS;
   }
   location SUBFOLDERfiles {
     fancyindex on;

root/etc/s6-overlay/s6-rc.d/init-nginx/run

@@ -6,6 +6,7 @@ NGINX_CONFIG=/etc/nginx/sites-available/default
 # user passed env vars
 CPORT="${CUSTOM_PORT:-3000}"
 CHPORT="${CUSTOM_HTTPS_PORT:-3001}"
+CWS="${CUSTOM_WS_PORT:-8082}"
 CUSER="${CUSTOM_USER:-abc}"
 SFOLDER="${SUBFOLDER:-/}"
 
@@ -25,6 +26,7 @@ fi
 cp /defaults/default.conf ${NGINX_CONFIG}
 sed -i "s/3000/$CPORT/g" ${NGINX_CONFIG}
 sed -i "s/3001/$CHPORT/g" ${NGINX_CONFIG}
+sed -i "s/CWS/$CWS/g" ${NGINX_CONFIG}
 sed -i "s|SUBFOLDER|$SFOLDER|g" ${NGINX_CONFIG}
 sed -i "s|REPLACE_HOME|$HOME|g" ${NGINX_CONFIG}
 s6-setuidgid abc mkdir -p $HOME/Desktop

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

@@ -53,8 +53,6 @@ if [ ! -z ${DEV_MODE+x} ]; then
     nodemon -V --ext py --exec \
       "python3" -m selkies \
       --addr="localhost" \
-      --port="8081" \
-      --enable_basic_auth="false" \
       --mode="websockets"
 fi
 
@@ -63,6 +61,4 @@ fi
 exec s6-setuidgid abc \
   selkies \
     --addr="localhost" \
-    --port="8081" \
-    --enable_basic_auth="false" \
     --mode="websockets"