try to fix ganymede build

.gitea/workflows/build-jupyter-ganymede.yaml

@@ -9,16 +9,6 @@ jobs:
   "Build Jupyter Ganymede docker images":
     runs-on: woryzen
     steps:
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          name: multiplatform-builder
-          driver: docker-container
-          cleanup: false
-          platforms: |
-            linux/amd64
-            linux/arm64
       -
         name: Login to Gitea container registry
         uses: docker/login-action@v3

jupyter-ganymede/Dockerfile

@@ -4,13 +4,7 @@ RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \
     apk add python3 python3-dev pipx gcc g++ musl-dev linux-headers which curl libffi-dev git
 RUN adduser jovyan -u 1000 --system -s /bin/sh -h /home/jovyan
 
-FROM --platform=$BUILDPLATFORM alpine:3.23 AS build-base-native
-RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \
-    apk update &&\
-    apk add python3 python3-dev pipx gcc g++ musl-dev linux-headers which curl libffi-dev git
-RUN adduser jovyan -u 1000 --system -s /bin/sh -h /home/jovyan
-
-FROM build-base-native AS java-build
+FROM --platform=$BUILDPLATFORM build-base-native AS java-build
 RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \
     apk add openjdk11-jdk maven
 USER jovyan
@@ -19,7 +13,7 @@ WORKDIR /home/jovyan
 ADD --chown=jovyan:jovyan git@github.com:allen-ball/ganymede.git#trunk ganymede
 #RUN git clone https://github.com/allen-ball/ganymede.git ganymede
 WORKDIR /home/jovyan/ganymede
-RUN --mount=type=cache,target=/home/jovyan/.m2/,uid=1000,gid=1000,sharing=locked mvn -T 16 -Dmaven.test.skip=true -q package
+RUN --mount=type=cache,target=/home/jovyan/.m2/,uid=1000,gid=1000,sharing=locked mvn -Dmaven.test.skip=true -q package
     
 FROM build-base AS python-build
 RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \

nginx/Dockerfile

@@ -65,6 +65,7 @@ ADD --chown=luser:luser git@github.com:woggioni/nginx.git#release-${NGINX_VERSIO
 FROM build_stage_2_${NGINX_BRANCH} AS build
 ADD --chown=luser:luser https://github.com/openresty/headers-more-nginx-module.git /ngx_headers_more
 ADD --chown=luser:luser https://github.com/google/ngx_brotli.git /ngx_brotli
+
 USER root
 WORKDIR /
 RUN hg clone http://hg.nginx.org/njs /njs
@@ -74,6 +75,12 @@ WORKDIR /home/luser
 ADD --chown=luser:luser --chmod=755 ./build.sh ./build.sh
 RUN ./build.sh
 
+FROM build_stage_2_${NGINX_BRANCH} AS build-rtmp
+ADD --chown=luser:luser https://github.com/arut/nginx-rtmp-module.git /ngx-rtmp-module
+USER luser
+WORKDIR /home/luser
+ADD --chown=luser:luser --chmod=755 ./build-rtmp.sh ./build-rtmp.sh
+RUN ./build-rtmp.sh
 
 FROM base AS release
 ARG VERSION
@@ -91,7 +98,7 @@ RUN --mount=type=cache,target=/var/cache/apk \
     --mount=type=bind,source=install.sh,target=/install.sh \
 	 (cd nginx && sh /install.sh)
 RUN --mount=type=cache,target=/var/cache/apk apk del .install_deps
-
+COPY --from=build-rtmp --chown=root:root /nginx/objs/ngx_rtmp_module.so /usr/lib/nginx/modules/
 COPY --from=build /home/luser/libressl/openssl.cnf /etc/ssl/openssl.cnf
 COPY conf/nginx.conf /etc/nginx/nginx.conf
 COPY conf/dhparam /etc/nginx/dhparam

nginx/build.sh

@@ -25,6 +25,8 @@ CONFIG='
 		--with-http_dav_module
 		--with-http_flv_module
 		--with-http_mp4_module
+		--with-http_degradation_module
+		--with-http_slice_module
 		--with-http_gunzip_module
 		--with-http_gzip_static_module
 		--with-http_random_index_module
@@ -40,14 +42,14 @@ CONFIG='
 		--with-stream_realip_module
 		--with-stream_geoip_module=dynamic
 		--with-http_slice_module
-		--with-mail
+		--with-mail=dynamic
 		--with-mail_ssl_module
 		--with-compat
 		--with-file-aio
 		--with-http_v2_module
 		--with-http_v3_module
 		--add-dynamic-module=/ngx_headers_more
-		--add-dynamic-module=/ngx_brotli
+		--add-module=/ngx_brotli
 		--add-dynamic-module=/njs/nginx
 '
 

nginx/conf/nginx.conf

@@ -1,13 +1,4 @@
-
-load_module modules/ngx_http_xslt_filter_module.so;
-#load_module modules/ngx_http_image_filter_module.so;
-load_module modules/ngx_http_geoip_module.so;
-#load_module modules/ngx_http_perl_module.so;
-load_module modules/ngx_stream_geoip_module.so;
-load_module modules/ngx_http_headers_more_filter_module.so;
-load_module modules/ngx_http_brotli_static_module.so;
-load_module modules/ngx_http_brotli_filter_module.so;
-#load_module modules/ngx_http_js_module.so;
+include /etc/nginx/conf.d/modules/*.conf;
 
 user  nginx;
 worker_processes  1;