From 1269b36ad29cfc7ba0250f0a1bb5de922679d70d Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 16 Jul 2025 10:12:23 +0200 Subject: [PATCH] Use debian archive for containers based Debian buster --- .../nginx_missing_deployer/_dev/deploy/docker/Dockerfile | 5 ++++- .../data_stream/access/_dev/deploy/docker/Dockerfile | 5 ++++- test/packages/parallel/apache/_dev/deploy/docker/Dockerfile | 5 ++++- .../apache_basic_license/_dev/deploy/docker/Dockerfile | 5 ++++- test/packages/parallel/nginx/_dev/deploy/docker/Dockerfile | 5 ++++- .../nginx_multiple_services/_dev/deploy/docker/Dockerfile | 5 ++++- .../data_stream/access/_dev/deploy/docker/Dockerfile | 5 ++++- .../access_docker_tf/_dev/deploy/docker/Dockerfile | 5 ++++- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/test/packages/false_positives/nginx_missing_deployer/_dev/deploy/docker/Dockerfile b/test/packages/false_positives/nginx_missing_deployer/_dev/deploy/docker/Dockerfile index 9ab90099e0..9ffcc9f5a8 100755 --- a/test/packages/false_positives/nginx_missing_deployer/_dev/deploy/docker/Dockerfile +++ b/test/packages/false_positives/nginx_missing_deployer/_dev/deploy/docker/Dockerfile @@ -1,6 +1,9 @@ ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5} FROM nginx:${SERVICE_VERSION} -RUN sed -i "/jessie-updates/d" /etc/apt/sources.list +# move to archive +RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i "/buster-updates/d" /etc/apt/sources.list RUN apt-get update && apt-get install -y curl HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status COPY ./nginx.conf /etc/nginx/ diff --git a/test/packages/false_positives/nginx_missing_deployer/data_stream/access/_dev/deploy/docker/Dockerfile b/test/packages/false_positives/nginx_missing_deployer/data_stream/access/_dev/deploy/docker/Dockerfile index 9ab90099e0..9ffcc9f5a8 100755 --- a/test/packages/false_positives/nginx_missing_deployer/data_stream/access/_dev/deploy/docker/Dockerfile +++ b/test/packages/false_positives/nginx_missing_deployer/data_stream/access/_dev/deploy/docker/Dockerfile @@ -1,6 +1,9 @@ ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5} FROM nginx:${SERVICE_VERSION} -RUN sed -i "/jessie-updates/d" /etc/apt/sources.list +# move to archive +RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i "/buster-updates/d" /etc/apt/sources.list RUN apt-get update && apt-get install -y curl HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status COPY ./nginx.conf /etc/nginx/ diff --git a/test/packages/parallel/apache/_dev/deploy/docker/Dockerfile b/test/packages/parallel/apache/_dev/deploy/docker/Dockerfile index d6a2916a3c..ec5b66bacf 100644 --- a/test/packages/parallel/apache/_dev/deploy/docker/Dockerfile +++ b/test/packages/parallel/apache/_dev/deploy/docker/Dockerfile @@ -1,6 +1,9 @@ ARG SERVICE_VERSION=${SERVICE_VERSION:-2.4.46} FROM httpd:$SERVICE_VERSION -RUN sed -i "/jessie-updates/d" /etc/apt/sources.list +# move to archive +RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i "/buster-updates/d" /etc/apt/sources.list RUN apt-get update && apt-get install -y curl HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf \ No newline at end of file diff --git a/test/packages/parallel/apache_basic_license/_dev/deploy/docker/Dockerfile b/test/packages/parallel/apache_basic_license/_dev/deploy/docker/Dockerfile index d6a2916a3c..ec5b66bacf 100644 --- a/test/packages/parallel/apache_basic_license/_dev/deploy/docker/Dockerfile +++ b/test/packages/parallel/apache_basic_license/_dev/deploy/docker/Dockerfile @@ -1,6 +1,9 @@ ARG SERVICE_VERSION=${SERVICE_VERSION:-2.4.46} FROM httpd:$SERVICE_VERSION -RUN sed -i "/jessie-updates/d" /etc/apt/sources.list +# move to archive +RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i "/buster-updates/d" /etc/apt/sources.list RUN apt-get update && apt-get install -y curl HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf \ No newline at end of file diff --git a/test/packages/parallel/nginx/_dev/deploy/docker/Dockerfile b/test/packages/parallel/nginx/_dev/deploy/docker/Dockerfile index 9ab90099e0..9ffcc9f5a8 100755 --- a/test/packages/parallel/nginx/_dev/deploy/docker/Dockerfile +++ b/test/packages/parallel/nginx/_dev/deploy/docker/Dockerfile @@ -1,6 +1,9 @@ ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5} FROM nginx:${SERVICE_VERSION} -RUN sed -i "/jessie-updates/d" /etc/apt/sources.list +# move to archive +RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i "/buster-updates/d" /etc/apt/sources.list RUN apt-get update && apt-get install -y curl HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status COPY ./nginx.conf /etc/nginx/ diff --git a/test/packages/parallel/nginx_multiple_services/_dev/deploy/docker/Dockerfile b/test/packages/parallel/nginx_multiple_services/_dev/deploy/docker/Dockerfile index 9ab90099e0..9ffcc9f5a8 100755 --- a/test/packages/parallel/nginx_multiple_services/_dev/deploy/docker/Dockerfile +++ b/test/packages/parallel/nginx_multiple_services/_dev/deploy/docker/Dockerfile @@ -1,6 +1,9 @@ ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5} FROM nginx:${SERVICE_VERSION} -RUN sed -i "/jessie-updates/d" /etc/apt/sources.list +# move to archive +RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i "/buster-updates/d" /etc/apt/sources.list RUN apt-get update && apt-get install -y curl HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status COPY ./nginx.conf /etc/nginx/ diff --git a/test/packages/parallel/nginx_multiple_services/data_stream/access/_dev/deploy/docker/Dockerfile b/test/packages/parallel/nginx_multiple_services/data_stream/access/_dev/deploy/docker/Dockerfile index 9ab90099e0..9ffcc9f5a8 100755 --- a/test/packages/parallel/nginx_multiple_services/data_stream/access/_dev/deploy/docker/Dockerfile +++ b/test/packages/parallel/nginx_multiple_services/data_stream/access/_dev/deploy/docker/Dockerfile @@ -1,6 +1,9 @@ ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5} FROM nginx:${SERVICE_VERSION} -RUN sed -i "/jessie-updates/d" /etc/apt/sources.list +# move to archive +RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i "/buster-updates/d" /etc/apt/sources.list RUN apt-get update && apt-get install -y curl HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status COPY ./nginx.conf /etc/nginx/ diff --git a/test/packages/parallel/nginx_multiple_services/data_stream/access_docker_tf/_dev/deploy/docker/Dockerfile b/test/packages/parallel/nginx_multiple_services/data_stream/access_docker_tf/_dev/deploy/docker/Dockerfile index 9ab90099e0..9ffcc9f5a8 100755 --- a/test/packages/parallel/nginx_multiple_services/data_stream/access_docker_tf/_dev/deploy/docker/Dockerfile +++ b/test/packages/parallel/nginx_multiple_services/data_stream/access_docker_tf/_dev/deploy/docker/Dockerfile @@ -1,6 +1,9 @@ ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5} FROM nginx:${SERVICE_VERSION} -RUN sed -i "/jessie-updates/d" /etc/apt/sources.list +# move to archive +RUN sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list && \ + sed -i "/buster-updates/d" /etc/apt/sources.list RUN apt-get update && apt-get install -y curl HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status COPY ./nginx.conf /etc/nginx/