Merge pull request #4455 from gizmoguy/dind-ulimit

Fix docker-in-docker test on latest version of docker-ce for amd64.
faucetsdn · Jan 26, 2024 · 8deb602 · 8deb602
2 parents 8cf7aaa + 64c0dad
commit 8deb602
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/Dockerfile.fuzz-config b/Dockerfile.fuzz-config
@@ -1,6 +1,6 @@
 ## Image name: faucet/config-fuzzer
 
-FROM faucet/test-base:23.0.1
+FROM faucet/test-base:24.0.0
 
 ENV PIP3="pip3 --no-cache-dir install --upgrade"
 ENV PATH="/venv/bin:$PATH"

diff --git a/Dockerfile.fuzz-packet b/Dockerfile.fuzz-packet
@@ -1,6 +1,6 @@
 ## Image name: faucet/packet-fuzzer
 
-FROM faucet/test-base:23.0.1
+FROM faucet/test-base:24.0.0
 
 ENV PIP3="pip3 --no-cache-dir install --upgrade"
 ENV PATH="/venv/bin:$PATH"

diff --git a/Dockerfile.tests b/Dockerfile.tests
@@ -1,6 +1,6 @@
 ## Image name: faucet/tests
 
-FROM faucet/test-base:23.0.1
+FROM faucet/test-base:24.0.0
 
 COPY ./ /faucet-src/
 WORKDIR /faucet-src/

diff --git a/docker/runtests.sh b/docker/runtests.sh
@@ -19,8 +19,7 @@ if [ -z "${FAUCET_TESTS:-}" ]; then
   FAUCET_TESTS="$*"
 fi
 
-# TODO: FaucetDockerHostTest docker-in-docker currently broken
-PARAMS="-x FaucetDockerHostTest"
+PARAMS=""
 
 # Parse options, some are used by this script, some are
 # passed onto mininet_main.py & clib_mininet_main.py