diff options
| author |   Adrian Villin <avillin@cisco.com> | 2024-10-02 15:07:40 +0200 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2024-10-03 04:56:10 +0000 |
| commit | 7bae9b0e824d17de3769b2de299ad2d2c88e2620 (patch) | |
| tree | 2ae63e0cefa4458ce293a0fd3d2d99542bb8a5af /extras/hs-test/docker/Dockerfile.nginx-http3 | |
| parent | 2c52f5e8886fe2d7fa2aeb1fa15a8c9491b0128e (diff) | |
hs-test: use nginx 1.26.2 for NginxHttp3Test
- test is no longer marked as extended
- no building required -> removed nginx build scripts
Type: test
Change-Id: I1814b1e4b7e514f81797efa3b5c1e818d2fe4cda
Signed-off-by: Adrian Villin <avillin@cisco.com>
Diffstat (limited to 'extras/hs-test/docker/Dockerfile.nginx-http3')
| -rw-r--r-- | extras/hs-test/docker/Dockerfile.nginx-http3 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/extras/hs-test/docker/Dockerfile.nginx-http3 b/extras/hs-test/docker/Dockerfile.nginx-http3 index 8b2f8406d38..fc905376986 100644 --- a/extras/hs-test/docker/Dockerfile.nginx-http3 +++ b/extras/hs-test/docker/Dockerfile.nginx-http3 @@ -3,16 +3,16 @@ ARG UBUNTU_VERSION FROM ubuntu:${UBUNTU_VERSION} RUN apt-get update \ - && apt-get install -y gcc git make autoconf libtool pkg-config cmake ninja-build golang \ - && rm -rf /var/lib/apt/lists/* + && apt-get install -y curl gnupg2 ca-certificates lsb-release ubuntu-keyring libunwind-dev +RUN curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \ +| tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null +RUN echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \ + http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" \ + | tee /etc/apt/sources.list.d/nginx.list +RUN bash -c 'echo -e "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" \ +| tee /etc/apt/preferences.d/99nginx' -COPY script/build_boringssl.sh /build_boringssl.sh -RUN git clone https://boringssl.googlesource.com/boringssl -RUN ./build_boringssl.sh - -COPY script/build_nginx.sh /build_nginx.sh -RUN git clone https://github.com/nginx/nginx -RUN ./build_nginx.sh +RUN apt update && apt install -y nginx=1.26.2-1~jammy COPY vpp-data/lib/* /usr/lib/ COPY resources/nginx/vcl.conf /vcl.conf @@ -27,4 +27,4 @@ ENV LDP_DEBUG=0 ENV VCL_DEBUG=0 ENV LDP_SID_BIT=8 -ENTRYPOINT ["nginx_ldp.sh", "/usr/local/nginx/sbin/nginx", "-c", "/nginx.conf"] +ENTRYPOINT ["nginx_ldp.sh", "nginx", "-c", "/nginx.conf"] |