Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
gauravsaini04 committed Aug 29, 2024
1 parent 0e180ad commit 8aa19ee
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 33 deletions.
2 changes: 1 addition & 1 deletion src/docker-in-docker/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ DEFAULT_IP6_TABLES=""
if [ -n "$version_to_check" ] && [ "$version_to_check" -ge 27 ] || [ "$DOCKER_VERSION" = "latest" ]; then
if [ -z "$IP6_TABLES" ]; then
DEFAULT_IP6_TABLES=""
else
elif [ "$IP6_TABLES" == false ]; then
DEFAULT_IP6_TABLES="--ip6tables=$IP6_TABLES"
fi
fi
Expand Down
1 change: 1 addition & 0 deletions test/docker-in-docker/dockerIp6tablesDisabledTest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ ip6tablesCheck() {

check "ip6tables" ip6tablesCheck
check "ip6tables check" bash -c "docker network inspect bridge"
check "docker-build" docker build ./

reportResults
23 changes: 0 additions & 23 deletions test/docker-in-docker/dockerIp6tablesEnabledTest.sh

This file was deleted.

10 changes: 1 addition & 9 deletions test/docker-in-docker/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,11 @@
}
},
"dockerIp6tablesDisabledTest": {
"image": "ubuntu:focal",
"features": {
"docker-in-docker": {
"ip6tables": false
}
}
},
"dockerIp6tablesEnabledTest": {
"image": "ubuntu:focal",
"features": {
"docker-in-docker": {
"version": "27.0.3",
"ip6tables": true
"ip6tables": false
}
}
},
Expand Down

0 comments on commit 8aa19ee

Please sign in to comment.