diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000000..19a040b3fd
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,43 @@
+name: Build docker image
+# Note: This doesn't push images to the repository,
+# since GCP authorization hasn't been set up.
+
+on:
+  pull_request:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+env:
+  USE_BAZEL_VERSION: "7.2.1"
+
+jobs:
+  build_docker:
+    name: Build docker
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out the repo
+      uses: actions/checkout@v4
+
+    - name: Set up python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.10'
+
+    - name: install python dependencies
+      run: |
+        pip install pip --upgrade --quiet
+        pip install wheel setuptools pipdeptree --upgrade --quiet
+
+    - name: install docker
+      run: |
+        docker --version
+
+    - name: Build docker
+      run: |
+        export BUILD_ID="$(date +%s)-$(LC_ALL=C tr -dc a-z0-9 </dev/urandom | head -c 10)"
+        export DOCKER_IMAGE="gcr.io/tfx-oss-public/tfx_smoke_test:${BUILD_ID}"
+        export docker_image_repo=$(echo "${DOCKER_IMAGE}" | cut -d ':' -f 1)
+        export docker_image_tag=$(echo "${DOCKER_IMAGE}" | cut -d ':' -f 2)
+        DOCKER_IMAGE_REPO="${docker_image_repo}" DOCKER_IMAGE_TAG="${docker_image_tag}" tfx/tools/docker/build_docker_image.sh
+        docker inspect ${DOCKER_IMAGE}
diff --git a/tfx/tools/docker/Dockerfile b/tfx/tools/docker/Dockerfile
index 4278f4beef..bc021d972d 100644
--- a/tfx/tools/docker/Dockerfile
+++ b/tfx/tools/docker/Dockerfile
@@ -64,7 +64,10 @@ RUN cd ${TFX_DIR}/src; \
 FROM apache/beam_python3.10_sdk:${BEAM_VERSION} as beam-worker
 
 # Build stage to extend DLVM image.
-FROM ${BASE_IMAGE} as install
+RUN if [ -n "$BASE_IMAGE" ]; then \
+        echo "Using base image: $BASE_IMAGE"; \
+        FROM ${BASE_IMAGE} as install; \
+    fi
 
 # Additional Python packages which will be installed.
 ARG ADDITIONAL_PACKAGES