diff options
| author |   Maros Ondrejicka <maros.ondrejicka@pantheon.tech> | 2023-01-13 10:09:14 +0100 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2023-01-13 19:54:01 +0000 |
| commit | 8851ccfe4aac8d021e2a813a8a25c13b3ae61853 (patch) | |
| tree | c2f21bdd8d649d7220097149034a143b00ad70e7 /extras/hs-test/Dockerfile.nginx | |
| parent | 609d8e9186a854891e202b32106aab9d530778d0 (diff) | |
hs-test: use equal ubuntu versions in test images
Official nginx image is based on Debian with older libc version,
that causes a runtime fail when VPP libraries are compiled in Ubuntu
which has newer libc.
Using equal version of Ubuntu in VPP image and in nginx image
ensures that running nginx won't fail due to different libc versions.
Type: test
Signed-off-by: Maros Ondrejicka <maros.ondrejicka@pantheon.tech>
Change-Id: I48f3b23be30a9d9d9144351437ce163d64a4bb6b
Diffstat (limited to 'extras/hs-test/Dockerfile.nginx')
| -rw-r--r-- | extras/hs-test/Dockerfile.nginx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/extras/hs-test/Dockerfile.nginx b/extras/hs-test/Dockerfile.nginx index ece73766f18..930151fefef 100644 --- a/extras/hs-test/Dockerfile.nginx +++ b/extras/hs-test/Dockerfile.nginx @@ -1,8 +1,16 @@ -FROM nginx:1.22.1 +ARG UBUNTU_VERSION + +FROM ubuntu:${UBUNTU_VERSION} + +RUN apt-get update +RUN apt-get install -y nginx +RUN rm -rf /var/lib/apt/lists/* COPY vpp-data/lib/* /usr/lib/ COPY resources/nginx/vcl.conf /vcl.conf COPY resources/nginx/nginx.conf /nginx.conf -COPY resources/nginx/start.sh /start.sh -ENTRYPOINT ["/start.sh"] +ENV VCL_CONFIG=/vcl.conf +ENV LD_PRELOAD=/usr/lib/libvcl_ldpreload.so + +ENTRYPOINT ["nginx", "-c", "/nginx.conf"] |