From d9d072510719b635d33121657a03f1be64a64139 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Tue, 15 Jul 2025 13:02:37 +0200 Subject: [PATCH 1/2] Update test packages to use docker images based on bullseye --- .../nginx_missing_deployer/_dev/build/docs/README.md | 2 +- .../nginx_missing_deployer/_dev/deploy/docker/Dockerfile | 3 +-- .../false_positives/nginx_missing_deployer/docs/README.md | 2 +- test/packages/parallel/apache/_dev/build/docs/README.md | 2 +- test/packages/parallel/apache/_dev/deploy/docker/Dockerfile | 5 ++--- test/packages/parallel/apache/_dev/deploy/variants.yml | 2 +- test/packages/parallel/apache/docs/README.md | 2 +- .../parallel/apache_basic_license/_dev/build/docs/README.md | 2 +- .../apache_basic_license/_dev/deploy/docker/Dockerfile | 5 ++--- .../parallel/apache_basic_license/_dev/deploy/variants.yml | 2 +- test/packages/parallel/apache_basic_license/docs/README.md | 2 +- test/packages/parallel/nginx/_dev/build/docs/README.md | 4 ++-- test/packages/parallel/nginx/_dev/deploy/docker/Dockerfile | 3 +-- test/packages/parallel/nginx/_dev/deploy/variants.yml | 2 +- test/packages/parallel/nginx/docs/README.md | 4 ++-- .../nginx_multiple_services/_dev/build/docs/README.md | 2 +- .../nginx_multiple_services/_dev/deploy/docker/Dockerfile | 3 +-- .../access_docker_tf/_dev/deploy/docker/Dockerfile | 3 +-- .../packages/parallel/nginx_multiple_services/docs/README.md | 2 +- 19 files changed, 23 insertions(+), 29 deletions(-) diff --git a/test/packages/false_positives/nginx_missing_deployer/_dev/build/docs/README.md b/test/packages/false_positives/nginx_missing_deployer/_dev/build/docs/README.md index 30cef05de4..c17d4f192a 100644 --- a/test/packages/false_positives/nginx_missing_deployer/_dev/build/docs/README.md +++ b/test/packages/false_positives/nginx_missing_deployer/_dev/build/docs/README.md @@ -5,7 +5,7 @@ logs created by the HTTP server. ## Compatibility -The logs were tested with version 1.19.5. +The logs were tested with version 1.22.1. On Windows, the module was tested with Nginx installed from the Chocolatey repository. ## Logs 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..f4b146c1dd 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,5 @@ -ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5} +ARG SERVICE_VERSION=${SERVICE_VERSION:-1.22.1} FROM nginx:${SERVICE_VERSION} -RUN sed -i "/jessie-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/docs/README.md b/test/packages/false_positives/nginx_missing_deployer/docs/README.md index 0223f41a5d..39b0d18928 100644 --- a/test/packages/false_positives/nginx_missing_deployer/docs/README.md +++ b/test/packages/false_positives/nginx_missing_deployer/docs/README.md @@ -5,7 +5,7 @@ logs created by the HTTP server. ## Compatibility -The logs were tested with version 1.19.5. +The logs were tested with version 1.22.1. On Windows, the module was tested with Nginx installed from the Chocolatey repository. ## Logs diff --git a/test/packages/parallel/apache/_dev/build/docs/README.md b/test/packages/parallel/apache/_dev/build/docs/README.md index f57e928c13..8c17919a62 100644 --- a/test/packages/parallel/apache/_dev/build/docs/README.md +++ b/test/packages/parallel/apache/_dev/build/docs/README.md @@ -5,7 +5,7 @@ logs created by the Apache server. ## Compatibility -The Apache datasets were tested with Apache 2.4.12 and 2.4.46 and are expected to work with +The Apache datasets were tested with Apache 2.4.51 and are expected to work with all versions >= 2.2.31 and >= 2.4.16 (independent from operating system). ## Logs diff --git a/test/packages/parallel/apache/_dev/deploy/docker/Dockerfile b/test/packages/parallel/apache/_dev/deploy/docker/Dockerfile index d6a2916a3c..d502c22917 100644 --- a/test/packages/parallel/apache/_dev/deploy/docker/Dockerfile +++ b/test/packages/parallel/apache/_dev/deploy/docker/Dockerfile @@ -1,6 +1,5 @@ -ARG SERVICE_VERSION=${SERVICE_VERSION:-2.4.46} +ARG SERVICE_VERSION=${SERVICE_VERSION:-2.4.51} FROM httpd:$SERVICE_VERSION -RUN sed -i "/jessie-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 +COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf diff --git a/test/packages/parallel/apache/_dev/deploy/variants.yml b/test/packages/parallel/apache/_dev/deploy/variants.yml index a4f638620c..3b46579e26 100644 --- a/test/packages/parallel/apache/_dev/deploy/variants.yml +++ b/test/packages/parallel/apache/_dev/deploy/variants.yml @@ -1,4 +1,4 @@ variants: v2: - SERVICE_VERSION: 2.4.46 + SERVICE_VERSION: 2.4.51 default: v2 diff --git a/test/packages/parallel/apache/docs/README.md b/test/packages/parallel/apache/docs/README.md index 411b02c509..62e25e5d75 100644 --- a/test/packages/parallel/apache/docs/README.md +++ b/test/packages/parallel/apache/docs/README.md @@ -5,7 +5,7 @@ logs created by the Apache server. ## Compatibility -The Apache datasets were tested with Apache 2.4.12 and 2.4.46 and are expected to work with +The Apache datasets were tested with Apache 2.4.51 and are expected to work with all versions >= 2.2.31 and >= 2.4.16 (independent from operating system). ## Logs diff --git a/test/packages/parallel/apache_basic_license/_dev/build/docs/README.md b/test/packages/parallel/apache_basic_license/_dev/build/docs/README.md index f57e928c13..8c17919a62 100644 --- a/test/packages/parallel/apache_basic_license/_dev/build/docs/README.md +++ b/test/packages/parallel/apache_basic_license/_dev/build/docs/README.md @@ -5,7 +5,7 @@ logs created by the Apache server. ## Compatibility -The Apache datasets were tested with Apache 2.4.12 and 2.4.46 and are expected to work with +The Apache datasets were tested with Apache 2.4.51 and are expected to work with all versions >= 2.2.31 and >= 2.4.16 (independent from operating system). ## Logs 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..d502c22917 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,5 @@ -ARG SERVICE_VERSION=${SERVICE_VERSION:-2.4.46} +ARG SERVICE_VERSION=${SERVICE_VERSION:-2.4.51} FROM httpd:$SERVICE_VERSION -RUN sed -i "/jessie-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 +COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf diff --git a/test/packages/parallel/apache_basic_license/_dev/deploy/variants.yml b/test/packages/parallel/apache_basic_license/_dev/deploy/variants.yml index a4f638620c..3b46579e26 100644 --- a/test/packages/parallel/apache_basic_license/_dev/deploy/variants.yml +++ b/test/packages/parallel/apache_basic_license/_dev/deploy/variants.yml @@ -1,4 +1,4 @@ variants: v2: - SERVICE_VERSION: 2.4.46 + SERVICE_VERSION: 2.4.51 default: v2 diff --git a/test/packages/parallel/apache_basic_license/docs/README.md b/test/packages/parallel/apache_basic_license/docs/README.md index 411b02c509..62e25e5d75 100644 --- a/test/packages/parallel/apache_basic_license/docs/README.md +++ b/test/packages/parallel/apache_basic_license/docs/README.md @@ -5,7 +5,7 @@ logs created by the Apache server. ## Compatibility -The Apache datasets were tested with Apache 2.4.12 and 2.4.46 and are expected to work with +The Apache datasets were tested with Apache 2.4.51 and are expected to work with all versions >= 2.2.31 and >= 2.4.16 (independent from operating system). ## Logs diff --git a/test/packages/parallel/nginx/_dev/build/docs/README.md b/test/packages/parallel/nginx/_dev/build/docs/README.md index 31cb9d66f6..7214d1fd2b 100644 --- a/test/packages/parallel/nginx/_dev/build/docs/README.md +++ b/test/packages/parallel/nginx/_dev/build/docs/README.md @@ -5,8 +5,8 @@ logs created by the HTTP server. ## Compatibility -The Nginx `stubstatus` metrics was tested with Nginx 1.19.5 and are expected to work with all version >= 1.9. -The logs were tested with version 1.19.5. +The Nginx `stubstatus` metrics was tested with Nginx 1.22.1 and are expected to work with all version >= 1.9. +The logs were tested with version 1.22.1. On Windows, the module was tested with Nginx installed from the Chocolatey repository. ## Logs diff --git a/test/packages/parallel/nginx/_dev/deploy/docker/Dockerfile b/test/packages/parallel/nginx/_dev/deploy/docker/Dockerfile index 9ab90099e0..f4b146c1dd 100755 --- a/test/packages/parallel/nginx/_dev/deploy/docker/Dockerfile +++ b/test/packages/parallel/nginx/_dev/deploy/docker/Dockerfile @@ -1,6 +1,5 @@ -ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5} +ARG SERVICE_VERSION=${SERVICE_VERSION:-1.22.1} FROM nginx:${SERVICE_VERSION} -RUN sed -i "/jessie-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/_dev/deploy/variants.yml b/test/packages/parallel/nginx/_dev/deploy/variants.yml index a5d765e577..3979ef3009 100644 --- a/test/packages/parallel/nginx/_dev/deploy/variants.yml +++ b/test/packages/parallel/nginx/_dev/deploy/variants.yml @@ -1,4 +1,4 @@ variants: v1: - SERVICE_VERSION: 1.19.5 + SERVICE_VERSION: 1.22.1 default: v1 diff --git a/test/packages/parallel/nginx/docs/README.md b/test/packages/parallel/nginx/docs/README.md index 8d7edbc10e..4ee217cace 100644 --- a/test/packages/parallel/nginx/docs/README.md +++ b/test/packages/parallel/nginx/docs/README.md @@ -5,8 +5,8 @@ logs created by the HTTP server. ## Compatibility -The Nginx `stubstatus` metrics was tested with Nginx 1.19.5 and are expected to work with all version >= 1.9. -The logs were tested with version 1.19.5. +The Nginx `stubstatus` metrics was tested with Nginx 1.22.1 and are expected to work with all version >= 1.9. +The logs were tested with version 1.22.1. On Windows, the module was tested with Nginx installed from the Chocolatey repository. ## Logs diff --git a/test/packages/parallel/nginx_multiple_services/_dev/build/docs/README.md b/test/packages/parallel/nginx_multiple_services/_dev/build/docs/README.md index c2c47318e9..27c2a48a23 100644 --- a/test/packages/parallel/nginx_multiple_services/_dev/build/docs/README.md +++ b/test/packages/parallel/nginx_multiple_services/_dev/build/docs/README.md @@ -5,7 +5,7 @@ logs created by the HTTP server. ## Compatibility -The logs were tested with version 1.19.5. +The logs were tested with version 1.22.1. On Windows, the module was tested with Nginx installed from the Chocolatey repository. ## Logs 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..f4b146c1dd 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,5 @@ -ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5} +ARG SERVICE_VERSION=${SERVICE_VERSION:-1.22.1} FROM nginx:${SERVICE_VERSION} -RUN sed -i "/jessie-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..f4b146c1dd 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,5 @@ -ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5} +ARG SERVICE_VERSION=${SERVICE_VERSION:-1.22.1} FROM nginx:${SERVICE_VERSION} -RUN sed -i "/jessie-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/docs/README.md b/test/packages/parallel/nginx_multiple_services/docs/README.md index 19d4d2232a..7de99df039 100644 --- a/test/packages/parallel/nginx_multiple_services/docs/README.md +++ b/test/packages/parallel/nginx_multiple_services/docs/README.md @@ -5,7 +5,7 @@ logs created by the HTTP server. ## Compatibility -The logs were tested with version 1.19.5. +The logs were tested with version 1.22.1. On Windows, the module was tested with Nginx installed from the Chocolatey repository. ## Logs From 80266ac3b5079782876b8506cfab0a23d9975fca Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Tue, 15 Jul 2025 13:27:41 +0200 Subject: [PATCH 2/2] Update nginx_multiple_services --- .../data_stream/access/_dev/deploy/docker/Dockerfile | 3 +-- .../data_stream/access/_dev/deploy/docker/Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) 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..f4b146c1dd 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,5 @@ -ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5} +ARG SERVICE_VERSION=${SERVICE_VERSION:-1.22.1} FROM nginx:${SERVICE_VERSION} -RUN sed -i "/jessie-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..f4b146c1dd 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,5 @@ -ARG SERVICE_VERSION=${SERVICE_VERSION:-1.19.5} +ARG SERVICE_VERSION=${SERVICE_VERSION:-1.22.1} FROM nginx:${SERVICE_VERSION} -RUN sed -i "/jessie-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/