diff options
| author |   Adrian Villin <avillin@cisco.com> | 2025-01-08 16:33:45 +0100 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2025-01-09 11:00:54 +0000 |
| commit | cb5e72c61f8d176438f7ca694f59603e9484d075 (patch) | |
| tree | d24057136f1787ec6d518992c340e5270b76a5c5 | |
| parent | c19cca931af3baf847d66bce9e5dd660861fc92e (diff) | |
hs-test: copy vpp-data to docker images last
Type: test
Change-Id: I773321d21c75e081fa54fae1d9862b4bc75e3794
Signed-off-by: Adrian Villin <avillin@cisco.com>
| -rw-r--r-- | extras/hs-test/docker/Dockerfile.nginx | 4 | ||||
| -rw-r--r-- | extras/hs-test/docker/Dockerfile.nginx-http3 | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/extras/hs-test/docker/Dockerfile.nginx b/extras/hs-test/docker/Dockerfile.nginx index c2a3e98df28..fc85f00aaae 100644 --- a/extras/hs-test/docker/Dockerfile.nginx +++ b/extras/hs-test/docker/Dockerfile.nginx @@ -6,7 +6,6 @@ RUN apt-get update \ && apt-get install -y nginx gdb less libunwind-dev \ && rm -rf /var/lib/apt/lists/* -COPY vpp-data/lib/* /usr/lib/ COPY resources/nginx/nginx.conf /nginx.conf COPY script/nginx_ldp.sh /usr/bin/nginx_ldp.sh @@ -16,4 +15,7 @@ ENV LDP_DEBUG=0 ENV VCL_DEBUG=0 ENV LDP_SID_BIT=8 +# copy vpp-data last to take advantage of caching (do not change) +COPY vpp-data/lib/* /usr/lib/ + ENTRYPOINT ["nginx_ldp.sh", "nginx", "-c", "/nginx.conf"] diff --git a/extras/hs-test/docker/Dockerfile.nginx-http3 b/extras/hs-test/docker/Dockerfile.nginx-http3 index 1070be9446a..bde73e32da1 100644 --- a/extras/hs-test/docker/Dockerfile.nginx-http3 +++ b/extras/hs-test/docker/Dockerfile.nginx-http3 @@ -14,11 +14,9 @@ RUN bash -c 'echo -e "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nP RUN apt update && apt install -y nginx=1.26.2* -COPY vpp-data/lib/* /usr/lib/ COPY resources/nginx/vcl.conf /vcl.conf COPY resources/nginx/nginx_http3.conf /nginx.conf COPY script/nginx_ldp.sh /usr/bin/nginx_ldp.sh - COPY resources/nginx/html/index.html /usr/share/nginx/index.html ENV VCL_CONFIG=/vcl.conf @@ -27,4 +25,7 @@ ENV LDP_DEBUG=0 ENV VCL_DEBUG=0 ENV LDP_SID_BIT=8 +# copy vpp-data last to take advantage of caching (do not change) +COPY vpp-data/lib/* /usr/lib/ + ENTRYPOINT ["nginx_ldp.sh", "nginx", "-c", "/nginx.conf"] |