Merge remote-tracking branch 'origin/main' into criemen/datadog-tag

This commit is contained in:
Cornelius Riemenschneider 2022-11-01 16:15:42 +01:00
commit 77b1f7e44c
2 changed files with 4 additions and 4 deletions

4
.github/workflows/__test-proxy.yml generated vendored
View file

@ -51,10 +51,10 @@ jobs:
https_proxy: http://squid-proxy:3128 https_proxy: http://squid-proxy:3128
INTERNAL_CODEQL_ACTION_DEBUG_LOC: true INTERNAL_CODEQL_ACTION_DEBUG_LOC: true
container: container:
image: ubuntu:18.04 image: ubuntu:22.04
options: --dns 127.0.0.1 options: --dns 127.0.0.1
services: services:
squid-proxy: squid-proxy:
image: datadog/squid:latest image: ubuntu/squid:latest
ports: ports:
- 3128:3128 - 3128:3128

View file

@ -3,11 +3,11 @@ description: "Tests using a proxy specified by the https_proxy environment varia
versions: ["latest"] versions: ["latest"]
operatingSystems: ["ubuntu"] operatingSystems: ["ubuntu"]
container: container:
image: ubuntu:18.04 image: ubuntu:22.04
options: --dns 127.0.0.1 options: --dns 127.0.0.1
services: services:
squid-proxy: squid-proxy:
image: datadog/squid:latest image: ubuntu/squid:latest
ports: ports:
- 3128:3128 - 3128:3128
env: env: