From ff8fb978549cc10ce19f8e1ed6b1e0c065be9081 Mon Sep 17 00:00:00 2001 From: Doojin Park Date: Thu, 28 Nov 2024 00:49:50 +0000 Subject: [PATCH 1/8] Add docker build github action --- .github/workflows/docker.yml | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000000..60ceccdecd --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,37 @@ +name: Build docker image + +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: Build docker + run: | + export BUILD_ID="$(date +%s)-$(LC_ALL=C tr -dc a-z0-9 Date: Thu, 28 Nov 2024 00:53:38 +0000 Subject: [PATCH 2/8] Update docker build script --- .github/workflows/docker.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 60ceccdecd..3dc919be56 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,4 +1,6 @@ name: Build docker image +# Note: This doesn't push images to the repository, since gcp authorization hasn't been set up. +# because GCP authorization hasn't been set up. on: pull_request: @@ -31,7 +33,8 @@ jobs: run: | export BUILD_ID="$(date +%s)-$(LC_ALL=C tr -dc a-z0-9 Date: Thu, 28 Nov 2024 00:55:20 +0000 Subject: [PATCH 3/8] correct notes --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3dc919be56..a1b7d67c52 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,6 +1,6 @@ name: Build docker image -# Note: This doesn't push images to the repository, since gcp authorization hasn't been set up. -# because GCP authorization hasn't been set up. +# Note: This doesn't push images to the repository, +# since GCP authorization hasn't been set up. on: pull_request: From 58803ca1d05a128d57256232ceb2cd2d8e3a06d8 Mon Sep 17 00:00:00 2001 From: Doojin Park Date: Thu, 28 Nov 2024 01:10:57 +0000 Subject: [PATCH 4/8] Update scripts --- .github/workflows/docker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a1b7d67c52..8220c4d447 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -36,5 +36,4 @@ jobs: 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 - tfx/tools/docker/build_docker_image.sh docker inspect ${DOCKER_IMAGE} From a31500aa60c2a4f6f313f91cd95db1f3a75204d7 Mon Sep 17 00:00:00 2001 From: Doojin Park Date: Thu, 28 Nov 2024 01:14:08 +0000 Subject: [PATCH 5/8] add a step for docker install --- .github/workflows/docker.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8220c4d447..ba6fcfaae2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -29,6 +29,12 @@ jobs: pip install pip --upgrade --quiet pip install wheel setuptools pipdeptree --upgrade --quiet + - name: install docker + run: | + systemctl --user stop docker + rm -f ~/bin/dockerd + curl -fsSL https://get.docker.com/rootless | sh + - name: Build docker run: | export BUILD_ID="$(date +%s)-$(LC_ALL=C tr -dc a-z0-9 Date: Thu, 28 Nov 2024 01:16:44 +0000 Subject: [PATCH 6/8] update to check docker version --- .github/workflows/docker.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ba6fcfaae2..19a040b3fd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -31,9 +31,7 @@ jobs: - name: install docker run: | - systemctl --user stop docker - rm -f ~/bin/dockerd - curl -fsSL https://get.docker.com/rootless | sh + docker --version - name: Build docker run: | From 2731a506b61a2d73872870836fc3a0ad2fc05bcc Mon Sep 17 00:00:00 2001 From: Doojin Park Date: Thu, 28 Nov 2024 01:22:54 +0000 Subject: [PATCH 7/8] Update Docker file --- tfx/tools/docker/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tfx/tools/docker/Dockerfile b/tfx/tools/docker/Dockerfile index 4278f4beef..91d1a189d6 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 From 3995751dc03c3fd725efb2a5f368319cafeb1ec2 Mon Sep 17 00:00:00 2001 From: Doojin Park Date: Thu, 28 Nov 2024 01:25:27 +0000 Subject: [PATCH 8/8] fix continuation --- tfx/tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tfx/tools/docker/Dockerfile b/tfx/tools/docker/Dockerfile index 91d1a189d6..bc021d972d 100644 --- a/tfx/tools/docker/Dockerfile +++ b/tfx/tools/docker/Dockerfile @@ -67,7 +67,7 @@ FROM apache/beam_python3.10_sdk:${BEAM_VERSION} as beam-worker RUN if [ -n "$BASE_IMAGE" ]; then \ echo "Using base image: $BASE_IMAGE"; \ FROM ${BASE_IMAGE} as install; \ - fi; \ + fi # Additional Python packages which will be installed. ARG ADDITIONAL_PACKAGES