-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[7.17](backport #33789) Update test versions of NGINX, Apache and Mon…
…goDB (#33843) * Update test versions of NGINX, Apache and MongoDB (#33789) The old tests were based on Debian Jessie released in April 2015 (end-of-life on June 30, 2020). We started having problems with expired GPG keys when installing dependencies in our Docker files. Also: * Add the missing MPM module and the `ServerName` directive for Apache. * Add retries to Logstash tests because they are flaky * Do not install mage v1.14.0 * Update elastic-agent-client version to avoid broken agent dependency (cherry picked from commit 4f639d7) # Conflicts: # NOTICE.txt # go.mod # go.sum * Resolve conflicts * Rollback the client version update Co-authored-by: Denis <[email protected]>
- Loading branch information
1 parent
a228948
commit 692b4aa
Showing
17 changed files
with
64 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17472,11 +17472,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : golang.org/x/net | ||
| Version: v0.0.0-20211020060615-d418f374d309 | ||
| Version: v0.0.0-20220425223048-2871e0cb64e4 | ||
| Licence type (autodetected): BSD-3-Clause | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20211020060615-d418f374d309/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20220425223048-2871e0cb64e4/LICENSE: | ||
|
|
||
| Copyright (c) 2009 The Go Authors. All rights reserved. | ||
|
|
||
|
|
@@ -17768,11 +17768,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : google.golang.org/genproto | ||
| Version: v0.0.0-20211208223120-3a66f561d7aa | ||
| Version: v0.0.0-20220426171045-31bebdecfb46 | ||
| Licence type (autodetected): Apache-2.0 | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected]20211208223120-3a66f561d7aa/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected]20220426171045-31bebdecfb46/LICENSE: | ||
|
|
||
|
|
||
| Apache License | ||
|
|
@@ -17980,11 +17980,11 @@ Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected] | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : google.golang.org/grpc | ||
| Version: v1.42.0 | ||
| Version: v1.46.0 | ||
| Licence type (autodetected): Apache-2.0 | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.42.0/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.46.0/LICENSE: | ||
|
|
||
|
|
||
| Apache License | ||
|
|
@@ -18192,11 +18192,11 @@ Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected]/LIC | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : google.golang.org/protobuf | ||
| Version: v1.27.1 | ||
| Version: v1.28.0 | ||
| Licence type (autodetected): BSD-3-Clause | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/google.golang.org/protobuf@v1.27.1/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/google.golang.org/protobuf@v1.28.0/LICENSE: | ||
|
|
||
| Copyright (c) 2018 The Go Authors. All rights reserved. | ||
|
|
||
|
|
@@ -25441,11 +25441,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/envoyproxy/go-control-plane | ||
| Version: v0.10.1 | ||
| Version: v0.10.2-0.20220325020618-49ff273808a1 | ||
| Licence type (autodetected): Apache-2.0 | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/envoyproxy/[email protected].1/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/github.com/envoyproxy/[email protected].2-0.20220325020618-49ff273808a1/LICENSE: | ||
|
|
||
| Apache License | ||
| Version 2.0, January 2004 | ||
|
|
@@ -35925,11 +35925,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : golang.org/x/term | ||
| Version: v0.0.0-20210220032956-6a3ed077a48d | ||
| Version: v0.0.0-20210927222741-03fcf44c2211 | ||
| Licence type (autodetected): BSD-3-Clause | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210220032956-6a3ed077a48d/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210927222741-03fcf44c2211/LICENSE: | ||
|
|
||
| Copyright (c) 2009 The Go Authors. All rights reserved. | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| ARG APACHE_VERSION=${APACHE_VERSION} | ||
| FROM httpd:$APACHE_VERSION | ||
| RUN sed -i "/jessie-updates/d" /etc/apt/sources.list | ||
| RUN apt-get update && apt-get install -y curl | ||
| RUN apt update && yes | apt install curl | ||
| HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost | ||
| COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,6 +63,7 @@ Listen 80 | |
| # Example: | ||
| # LoadModule foo_module modules/mod_foo.so | ||
| # | ||
| LoadModule mpm_event_module modules/mod_mpm_event.so | ||
| LoadModule authn_file_module modules/mod_authn_file.so | ||
| #LoadModule authn_dbm_module modules/mod_authn_dbm.so | ||
| #LoadModule authn_anon_module modules/mod_authn_anon.so | ||
|
|
@@ -190,7 +191,7 @@ ServerAdmin [email protected] | |
| # | ||
| # If your host doesn't have a registered DNS name, enter its IP address here. | ||
| # | ||
| #ServerName www.example.com:80 | ||
| ServerName localhost | ||
|
|
||
| # | ||
| # Deny access to the entirety of your server's filesystem. You must | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| # all the versions have to be the valid semantic version syntax x.x.x | ||
| # because of the test check for comparing against older field structure | ||
| variants: | ||
| - APACHE_VERSION: 2.4.12 | ||
| - APACHE_VERSION: 2.4.20 | ||
| - APACHE_VERSION: "2.4.54" | ||
| - APACHE_VERSION: "2.4.12" |
Oops, something went wrong.