memory-leak: upgrade to debian 12

Author: wpjunior

.memory_leak/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:12.9 as libjwt-builder
+FROM debian:12.9
 
 WORKDIR /home/app
 RUN apt update
@@ -13,17 +13,48 @@ RUN git clone --depth 1 --branch v3.2.0 https://github.com/benmcollins/libjwt.gi
     mkdir libjwt/build && \
     cd libjwt/build && cmake .. && make && make install
 
-FROM openresty/openresty:1.25.3.2-3-bullseye-valgrind
 
-RUN apt update
-RUN apt install -y cpanminus valgrind libjansson-dev
+## install openresty-valgrind
+
+RUN DEBIAN_FRONTEND=noninteractive apt update \
+    && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+        ca-certificates \
+        gettext-base \
+        gnupg2 \
+        lsb-base \
+        lsb-release \
+        software-properties-common \
+        wget gnupg ca-certificates
+RUN wget -qO - "https://openresty.org/package/pubkey.gpg" | gpg --dearmor > /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+&& chown root:root /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+&& chmod ugo+r /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+&& chmod go-w /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+&& echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/openresty-keyring.gpg] https://openresty.org/package/debian $(grep -Po 'VERSION="[0-9]+ \(\K[^)]+' /etc/os-release) openresty" | tee /etc/apt/sources.list.d/openresty.list
+
+ENV PATH="$PATH:/usr/local/openresty-valgrind/luajit/bin:/usr/local/openresty-valgrind/nginx/sbin:/usr/local/openresty-valgrind/bin"
+
+
+# Use SIGQUIT instead of default SIGTERM to cleanly drain requests
+# See https://github.com/openresty/docker-openresty/blob/master/README.md#tips--pitfalls
+STOPSIGNAL SIGQUIT
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get update \
+     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+         openresty-valgrind valgrind
+
+RUN mkdir -p /var/run/openresty \
+     && ln -sf /dev/stdout /usr/local/openresty-valgrind/nginx/logs/access.log \
+     && ln -sf /dev/stderr /usr/local/openresty-valgrind/nginx/logs/error.log
+
+RUN DEBIAN_FRONTEND=noninteractive apt update \
+    && DEBIAN_FRONTEND=noninteractive  apt install -y cpanminus valgrind libjansson-dev
+
 RUN cpanm -v --notest Test::Nginx
 
 COPY ./lib/resty/libjwt /usr/local/openresty/lualib/resty/libjwt
 COPY ./lib/resty/libjwt /usr/local/openresty-valgrind/lualib/resty/libjwt
-COPY --from=libjwt-builder /usr/local/lib/libjwt.so /usr/local/lib/libjwt.so
-RUN ldconfig
 
+WORKDIR /
 COPY ./.memory_leak/test /t
 COPY ./.memory_leak/valgrind.suppress /valgrind.suppress
 COPY ./.memory_leak/valgrind.awk /valgrind.awk

.memory_leak/valgrind.suppress

@@ -1,14 +1,3 @@
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   epoll_ctl(event)
-   fun:epoll_ctl
-   obj:/usr/local/openresty-valgrind/nginx/sbin/nginx
-   obj:/usr/local/openresty-valgrind/nginx/sbin/nginx
-   obj:/usr/local/openresty-valgrind/nginx/sbin/nginx
-   fun:ngx_single_process_cycle
-   fun:main
-}
 {
    <insert_a_suppression_name_here>
    Memcheck:Leak
@@ -19,39 +8,3 @@
    fun:ngx_single_process_cycle
    fun:main
 }
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   epoll_ctl(event)
-   fun:epoll_ctl
-   obj:/usr/local/openresty-valgrind/nginx/sbin/nginx
-   fun:ngx_handle_read_event
-   fun:ngx_http_init_connection
-   fun:ngx_event_accept
-   obj:/usr/local/openresty-valgrind/nginx/sbin/nginx
-   fun:ngx_process_events_and_timers
-   fun:ngx_single_process_cycle
-   fun:main
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   epoll_ctl(event)
-   fun:epoll_ctl
-   obj:/usr/local/openresty-valgrind/nginx/sbin/nginx
-   fun:ngx_handle_read_event
-   fun:ngx_http_lua_pipe_add_signal_handler
-   fun:ngx_http_lua_init_worker
-   fun:ngx_single_process_cycle
-   fun:main
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Param
-   epoll_ctl(event)
-   fun:epoll_ctl
-   obj:/usr/local/openresty-valgrind/nginx/sbin/nginx
-   obj:/usr/local/openresty-valgrind/nginx/sbin/nginx
-   fun:ngx_single_process_cycle
-   fun:main
-}

Makefile

@@ -21,7 +21,7 @@ test.e2e:
 	@go test -v ./...
 
 test.memory_leak:
-	@docker compose --profile memory_leak up --build --abort-on-container-exit
+	DOCKER_DEFAULT_PLATFORM=linux/amd64 docker compose --profile memory_leak up --build --abort-on-container-exit --no-log-prefix
 
 lint:
 	luacheck --std ngx_lua ./lib/