Skip to content

clean up Docker containers, logs directory for before integration tests #44

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.

Sign up for GitHub

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

Merged
marten-seemann merged 2 commits into from
Jun 30, 2025
Merged

clean up Docker containers, logs directory for before integration tests #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8e2ef6
clean up Docker containers, logs directory for before integration tests
marten-seemann Jun 30, 2025
afb1b2b
simplify rm -rf
marten-seemann Jun 30, 2025
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ integration/client/client
integration/server/server
integration/proxy/proxy
integration/proxy/*.pem
integration/logs*
logs/
26 changes: 15 additions & 11 deletions integration/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,37 +21,42 @@ cleanup:
rm server/key.pem server/cert.pem || true
rm proxy/key.pem proxy/cert.pem || true

ping:
clean-containers:
Copy link

Copilot AI Jun 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add clean-containers to the .PHONY declaration so Make treats it as a phony target and avoids conflicts with files of the same name.

Copilot uses AI. Check for mistakes.
docker compose rm -f client proxy server

ping: clean-containers
FILTER_IP_PROTOCOL=0 TESTCASE=ping docker compose --env-file ipv4.env up --exit-code-from client

pingv6:
pingv6: clean-containers
FILTER_IP_PROTOCOL=0 TESTCASE=ping docker compose --env-file ipv6.env up --exit-code-from client

http:
http: clean-containers
FILTER_IP_PROTOCOL=0 TESTCASE=http docker compose --env-file ipv4.env up --exit-code-from client

httpv6:
httpv6: clean-containers
FILTER_IP_PROTOCOL=0 TESTCASE=http docker compose --env-file ipv6.env up --exit-code-from client

http3:
http3: clean-containers
FILTER_IP_PROTOCOL=0 TESTCASE=http3 docker compose --env-file ipv4.env up --exit-code-from client

http3v6:
http3v6: clean-containers
FILTER_IP_PROTOCOL=0 TESTCASE=http3 docker compose --env-file ipv6.env up --exit-code-from client

filtertcp:
filtertcp: clean-containers
FILTER_IP_PROTOCOL=6 TESTCASE=filtertcp docker compose --env-file ipv4.env up --exit-code-from client

filtertcpv6:
filtertcpv6: clean-containers
FILTER_IP_PROTOCOL=6 TESTCASE=filtertcp docker compose --env-file ipv6.env up --exit-code-from client

filetransfer:
filetransfer: clean-containers
FILTER_IP_PROTOCOL=0 TESTCASE=filetransfer docker compose --env-file ipv4.env up --exit-code-from client

filetransferv6:
filetransferv6: clean-containers
FILTER_IP_PROTOCOL=0 TESTCASE=filetransfer docker compose --env-file ipv6.env up --exit-code-from client

copylogs:
if [ -z "$(target)" ]; then echo "target directory not specified"; exit 1; fi
rm -rf $(target)
mkdir -p $(target)
docker compose logs > $(target)/docker-compose.log
docker cp client:/keys.txt $(target)/
Expand All @@ -60,4 +65,3 @@ copylogs:
docker cp proxy:/proxy_eth0.pcap $(target)/
docker cp proxy:/proxy_eth1.pcap $(target)/