hs-test: copy vpp-data to docker images last

Type: test

Change-Id: I773321d21c75e081fa54fae1d9862b4bc75e3794
Signed-off-by: Adrian Villin <[email protected]>

diff --git a/extras/hs-test/docker/Dockerfile.nginx b/extras/hs-test/docker/Dockerfile.nginx
index c2a3e98..fc85f00 100644 (file)
--- 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 1070be9..bde73e3 100644 (file)
--- 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"]