diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index a5715500d83fe..3c5fec535a62d 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -13,19 +13,23 @@ if [[ "$1" == "docs" ]]; then
   make docs
   exit 0
 elif [[ "$1" == "coverage" ]]; then
-  echo "coverage build..."
+  echo "coverage build with tests..."
   EXTRA_CMAKE_FLAGS="-DENVOY_CODE_COVERAGE:BOOL=ON"
   TEST_TARGET="envoy.check-coverage"
 elif [[ "$1" == "asan" ]]; then
-  echo "asan build..."
+  echo "asan build with tests..."
   EXTRA_CMAKE_FLAGS="-DENVOY_SANITIZE:BOOL=ON -DENVOY_DEBUG:BOOL=OFF"
   TEST_TARGET="envoy.check"
 elif [[ "$1" == "debug" ]]; then
-  echo "debug build..."
+  echo "debug build with tests..."
   EXTRA_CMAKE_FLAGS="-DENVOY_DEBUG:BOOL=ON"
   TEST_TARGET="envoy.check"
+elif [[ "$1" == "server_only" ]]; then
+  echo "normal build server only..."
+  EXTRA_CMAKE_FLAGS="-DENVOY_DEBUG:BOOL=OFF"
+  TEST_TARGET="envoy"
 else
-  echo "normal build..."
+  echo "normal build with tests..."
   EXTRA_CMAKE_FLAGS="-DENVOY_DEBUG:BOOL=OFF"
   TEST_TARGET="envoy.check"
 fi
diff --git a/docs/install/building.rst b/docs/install/building.rst
index fb5195da54a54..c34daa2ccd056 100644
--- a/docs/install/building.rst
+++ b/docs/install/building.rst
@@ -3,11 +3,13 @@ Building
 
 The Envoy build system uses cmake. In order to ease initial building and for a quick start, we
 provide an Ubuntu 14 based docker container that has everything needed inside of it to build
-and *statically link* envoy. The following command will build and run all of the tests.
+and *statically link* envoy. The following command will build the server.
 
 .. code-block:: console
 
-  docker run -t -i -v <SOURCE_DIR>:/source lyft/envoy-build:latest /bin/bash -c "cd /source && ci/do_ci.sh normal"
+  docker run -t -i -v <SOURCE_DIR>:/source lyft/envoy-build:latest /bin/bash -c "cd /source && ci/do_ci.sh server_only"
+
+See :repo:`ci/do_ci.sh` for other possible targets (to run tests, etc.).
 
 In order to build manually, cmake is used like so: