Skip to content

Update test packages to use docker images based on Debian bullseye #2732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/packages/parallel/apache/_dev/build/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions test/packages/parallel/apache/_dev/deploy/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf
2 changes: 1 addition & 1 deletion test/packages/parallel/apache/_dev/deploy/variants.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
variants:
v2:
SERVICE_VERSION: 2.4.46
SERVICE_VERSION: 2.4.51
default: v2
2 changes: 1 addition & 1 deletion test/packages/parallel/apache/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
variants:
v2:
SERVICE_VERSION: 2.4.46
SERVICE_VERSION: 2.4.51
default: v2
2 changes: 1 addition & 1 deletion test/packages/parallel/apache_basic_license/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/packages/parallel/nginx/_dev/build/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions test/packages/parallel/nginx/_dev/deploy/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/
2 changes: 1 addition & 1 deletion test/packages/parallel/nginx/_dev/deploy/variants.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
variants:
v1:
SERVICE_VERSION: 1.19.5
SERVICE_VERSION: 1.22.1
default: v1
4 changes: 2 additions & 2 deletions test/packages/parallel/nginx/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down