Change Dockerfile to build p4tools by default. (#4049)

* Change Dockerfile to build p4tools by default. Will affect images published to Dockerhub. * Suppress CI from building p4tools for Ubuntu 18.04.
p4lang · Jun 27, 2023 · a6553f1 · a6553f1
1 parent e741876
commit a6553f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
@@ -129,7 +129,8 @@ jobs:
 
     - name: Build (Ubuntu 18.04, GCC)
       run: |
-        docker build -t p4c --build-arg BASE_IMAGE=ubuntu:18.04 --build-arg IMAGE_TYPE=test .
+        docker build -t p4c --build-arg BASE_IMAGE=ubuntu:18.04 --build-arg IMAGE_TYPE=test \
+        --build-arg ENABLE_TEST_TOOLS=OFF .
         ./tools/export_ccache.sh
 
       # run with sudo (...) --privileged

diff --git a/Dockerfile b/Dockerfile
@@ -25,7 +25,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 # Whether to install dependencies required to run PTF-ebpf tests
 ARG INSTALL_PTF_EBPF_DEPENDENCIES=OFF
 # Whether to build the P4Tools back end and platform.
-ARG ENABLE_TEST_TOOLS=OFF
+ARG ENABLE_TEST_TOOLS=ON
 # Whether to treat warnings as errors.
 ARG ENABLE_WERROR=ON
 # Compile with Clang compiler