ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hs-test: use equal ubuntu versions in test images

Browse Source 
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
This commit is contained in:
Maros Ondrejicka
2023-01-13 10:09:14 +01:00
committed by Florin Coras
parent 609d8e9186
commit 8851ccfe4a
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extras/hs-test/Dockerfile.nginx
View File

@ -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"]

4
extras/hs-test/Dockerfile.vpp
View File

@ -1,4 +1,6 @@
FROM ubuntu:22.04
ARG UBUNTU_VERSION
FROM ubuntu:${UBUNTU_VERSION}
RUN apt-get update \
&& apt-get install -y openssl libapr1 libnuma1 libsubunit0 \

6
extras/hs-test/resources/nginx/start.sh
View File

@ -1,6 +0,0 @@
#!/bin/bash
LDP_PATH=/usr/lib/libvcl_ldpreload.so
VCL_CFG=/vcl.conf
LD_PRELOAD=$LDP_PATH VCL_CONFIG=$VCL_CFG nginx -c /nginx.conf
tail -f /dev/null

4
extras/hs-test/script/build.sh
View File

@ -10,5 +10,5 @@ mkdir -p ${bin} ${lib} || true
cp ${VPP_WS}/build-root/build-vpp_debug-native/vpp/bin/* ${bin}
cp -r ${VPP_WS}/build-root/build-vpp_debug-native/vpp/lib/x86_64-linux-gnu/* ${lib}
docker build -t hs-test/vpp -f Dockerfile.vpp .
docker build -t hs-test/nginx-ldp -f Dockerfile.nginx .
docker build --build-arg UBUNTU_VERSION -t hs-test/vpp -f Dockerfile.vpp .
docker build --build-arg UBUNTU_VERSION -t hs-test/nginx-ldp -f Dockerfile.nginx .

2
extras/hs-test/vars
View File

@ -2,3 +2,5 @@ export VPP_WS=../../
export HST_LDPRELOAD=${VPP_WS}/build-root/build-vpp_debug-native/vpp/lib/x86_64-linux-gnu/libvcl_ldpreload.so
export PATH=${VPP_WS}/build-root/build-vpp_debug-native/vpp/bin:$PATH
export UBUNTU_VERSION=22.04