From e6f39e9ff794acfefbe02581c68f8639f2c8252e Mon Sep 17 00:00:00 2001
From: Pavlo Bashynskiy <pavlo.bashynskyi@blablacar.com>
Date: Thu, 28 Nov 2024 15:46:10 +0200
Subject: [PATCH 1/2] Bump version v1.23.4

---
 Dockerfile | 5 +++--
 README.md  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c1ef072..2dccefc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 FROM alpine:3.16 AS build
 
-ENV NGINX_VERSION 1.23.2
+ENV NGINX_VERSION 1.23.4
 # https://github.com/nginx/njs
-ENV NJS_MODULE_VERSION 0.7.8
+ENV NJS_MODULE_VERSION 0.7.12
 # https://github.com/google/ngx_brotli
 ENV BROTLI_MODULE_VERSION 6e975bcb015f62e1f303054897783355e2a877dc
 # https://github.com/openresty/echo-nginx-module
@@ -54,6 +54,7 @@ RUN set -eux \
         gpg \
         gpg-agent \
         libc-dev \
+        libxslt-dev \
         linux-headers \
         make \
         openssl-dev \
diff --git a/README.md b/README.md
index 42fd98e..c79f372 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # Supported tags and respective `Dockerfile` links
 
 - [`latest` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/master/Dockerfile)
-- [`1.23.2-alpine`, `1.23-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.23.2/Dockerfile) Mainline version
-- [`1.22.0-alpine`, `1.22-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.22.0/Dockerfile) Stable version
+- [`1.23.4-alpine`, `1.23-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.23.4/Dockerfile) Mainline version
+- [`1.24.0-alpine`, `1.24-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.24.0/Dockerfile) Stable version
 - <details><summary>Older versions</summary>
 
   - [`1.21.6-alpine`, `1.21-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.21.6/Dockerfile)

From 49858242340faffc241a721b3f7644e59c973d51 Mon Sep 17 00:00:00 2001
From: Pavlo Bashynskiy <pavlo.bashynskyi@blablacar.com>
Date: Thu, 28 Nov 2024 16:15:25 +0200
Subject: [PATCH 2/2] Use docker compose V2

---
 README.md                              | 2 +-
 test/Makefile                          | 2 +-
 test/check/docker-compose.yaml         | 3 +--
 test/jaeger/docker-compose.yaml        | 3 +--
 test/njs/docker-compose.yaml           | 3 +--
 test/proxy_connect/docker-compose.yaml | 3 +--
 test/redis/docker-compose.yaml         | 3 +--
 test/sticky/docker-compose.yaml        | 3 +--
 8 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index c79f372..f747e01 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,7 @@ Sample configurations and module tests are located in a folder named `test`.
 
 To run tests, go to the folder `test` and run command `make`.
 
-To start a specific example, go to an example folder and run `docker-compose up`.
+To start a specific example, go to an example folder and run `docker compose up`.
 
 ## Image Variants
 
diff --git a/test/Makefile b/test/Makefile
index 60fa10d..20abf80 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,7 +2,7 @@ DOCKER_TAG ?= latest
 DOCKER_IMAGE ?= levonet/nginx:$(DOCKER_TAG)
 TESTS = check jaeger njs proxy_connect redis sticky
 DOCKER ?= docker
-DOCKER_COMPOSE ?= docker-compose
+DOCKER_COMPOSE ?= docker compose
 
 .PHONY: all build test clean $(TESTS)
 all: build test
diff --git a/test/check/docker-compose.yaml b/test/check/docker-compose.yaml
index e531438..e27a5b8 100644
--- a/test/check/docker-compose.yaml
+++ b/test/check/docker-compose.yaml
@@ -1,5 +1,4 @@
-version: "3"
-
+---
 services:
   nginx:
     image: ${DOCKER_IMAGE:-levonet/nginx:latest}
diff --git a/test/jaeger/docker-compose.yaml b/test/jaeger/docker-compose.yaml
index d66f29d..d968f4f 100644
--- a/test/jaeger/docker-compose.yaml
+++ b/test/jaeger/docker-compose.yaml
@@ -1,5 +1,4 @@
-version: "3"
-
+---
 services:
   nginx:
     image: ${DOCKER_IMAGE:-levonet/nginx:latest}
diff --git a/test/njs/docker-compose.yaml b/test/njs/docker-compose.yaml
index 82ef4f4..26029e3 100644
--- a/test/njs/docker-compose.yaml
+++ b/test/njs/docker-compose.yaml
@@ -1,5 +1,4 @@
-version: "3"
-
+---
 services:
   nginx:
     image: ${DOCKER_IMAGE:-levonet/nginx:latest}
diff --git a/test/proxy_connect/docker-compose.yaml b/test/proxy_connect/docker-compose.yaml
index 30fd7cc..a375b96 100644
--- a/test/proxy_connect/docker-compose.yaml
+++ b/test/proxy_connect/docker-compose.yaml
@@ -1,5 +1,4 @@
-version: "3"
-
+---
 services:
   nginx:
     image: ${DOCKER_IMAGE:-levonet/nginx:latest}
diff --git a/test/redis/docker-compose.yaml b/test/redis/docker-compose.yaml
index 33e5f45..6d0a5fd 100644
--- a/test/redis/docker-compose.yaml
+++ b/test/redis/docker-compose.yaml
@@ -1,5 +1,4 @@
-version: "3"
-
+---
 services:
   nginx:
     image: ${DOCKER_IMAGE:-levonet/nginx:latest}
diff --git a/test/sticky/docker-compose.yaml b/test/sticky/docker-compose.yaml
index 59687c6..63bcbc5 100644
--- a/test/sticky/docker-compose.yaml
+++ b/test/sticky/docker-compose.yaml
@@ -1,5 +1,4 @@
-version: "3"
-
+---
 services:
   nginx:
     image: ${DOCKER_IMAGE:-levonet/nginx:latest}