From 7cbe41f4f74e7b101dafe789c849c5d9f1688648 Mon Sep 17 00:00:00 2001 From: Harry Dam Date: Wed, 28 Aug 2024 16:41:47 -0600 Subject: [PATCH 1/2] update latest nginx with test and e2e --- docker-compose.yaml | 4 ++-- docker/Dockerfile.e2e | 2 +- docker/Dockerfile.nginx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index c6bdb1d..ea2b443 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,4 @@ -version: "3.6" +version: "3.8" services: nginx: command: nginx -g "daemon off;" @@ -9,7 +9,7 @@ services: - ./docker/nginx.conf:/etc/nginx/nginx.conf - logs:/var/log/nginx echo: - image: jmalloc/echo-server:0.3.3 + image: jmalloc/echo-server:v0.3.7 test_e2e: build: context: . diff --git a/docker/Dockerfile.e2e b/docker/Dockerfile.e2e index 637ce02..d99e945 100644 --- a/docker/Dockerfile.e2e +++ b/docker/Dockerfile.e2e @@ -1,4 +1,4 @@ -FROM rust:1.63.0-alpine3.16 +FROM rust:1.79.0-alpine3.20 USER root diff --git a/docker/Dockerfile.nginx b/docker/Dockerfile.nginx index c662a0e..2dada19 100644 --- a/docker/Dockerfile.nginx +++ b/docker/Dockerfile.nginx @@ -1,4 +1,4 @@ -FROM k8s.gcr.io/ingress-nginx/controller:v1.8.1 as builder +FROM registry.k8s.io/ingress-nginx/controller:v1.11.2 as builder USER root @@ -14,5 +14,5 @@ RUN cd ./chainstack && \ --add-dynamic-module=../ngx_http_websocket_stat_module && \ make modules -FROM k8s.gcr.io/ingress-nginx/controller:v1.8.1 +FROM registry.k8s.io/ingress-nginx/controller:v1.11.2 COPY --from=builder /tmp/chainstack/objs/ngx_http_websocket_stat_module.so /etc/nginx/modules/ From 5c7551192d0efd2442e39cd72f451f255cb9052d Mon Sep 17 00:00:00 2001 From: Harry Dam Date: Wed, 28 Aug 2024 18:57:47 -0600 Subject: [PATCH 2/2] update test script to use docker compose v2 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 37817c2..50b95b1 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ .PHONY: test test_e2e test: - docker-compose build test && docker-compose run --rm test - docker-compose down -t 0 + docker compose build test && docker compose run --rm test + docker compose down -t 0 test_e2e: - docker-compose build test_e2e && docker-compose run --rm test_e2e - docker-compose down -t 0 + docker compose build test_e2e && docker compose run --rm test_e2e + docker compose down -t 0