Skip to content

Commit 6c4a5c9

Browse files
authored
Merge pull request #11 from chainstack/feature/update-nginx-v1.11.2
update latest nginx with test and e2e
2 parents f7ec840 + 5c75511 commit 6c4a5c9

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.PHONY: test test_e2e
22

33
test:
4-
docker-compose build test && docker-compose run --rm test
5-
docker-compose down -t 0
4+
docker compose build test && docker compose run --rm test
5+
docker compose down -t 0
66

77
test_e2e:
8-
docker-compose build test_e2e && docker-compose run --rm test_e2e
9-
docker-compose down -t 0
8+
docker compose build test_e2e && docker compose run --rm test_e2e
9+
docker compose down -t 0

docker-compose.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "3.6"
1+
version: "3.8"
22
services:
33
nginx:
44
command: nginx -g "daemon off;"
@@ -9,7 +9,7 @@ services:
99
- ./docker/nginx.conf:/etc/nginx/nginx.conf
1010
- logs:/var/log/nginx
1111
echo:
12-
image: jmalloc/echo-server:0.3.3
12+
image: jmalloc/echo-server:v0.3.7
1313
test_e2e:
1414
build:
1515
context: .

docker/Dockerfile.e2e

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:1.63.0-alpine3.16
1+
FROM rust:1.79.0-alpine3.20
22

33
USER root
44

docker/Dockerfile.nginx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM k8s.gcr.io/ingress-nginx/controller:v1.8.1 as builder
1+
FROM registry.k8s.io/ingress-nginx/controller:v1.11.2 as builder
22

33
USER root
44

@@ -14,5 +14,5 @@ RUN cd ./chainstack && \
1414
--add-dynamic-module=../ngx_http_websocket_stat_module && \
1515
make modules
1616

17-
FROM k8s.gcr.io/ingress-nginx/controller:v1.8.1
17+
FROM registry.k8s.io/ingress-nginx/controller:v1.11.2
1818
COPY --from=builder /tmp/chainstack/objs/ngx_http_websocket_stat_module.so /etc/nginx/modules/

0 commit comments

Comments
 (0)