From b049cbeccb7cf679e145dbcff6eee33108fc5483 Mon Sep 17 00:00:00 2001 From: Naman Nandan Date: Wed, 8 Nov 2023 16:48:04 -0800 Subject: [PATCH 1/3] Fix docker nightly build --- kubernetes/kserve/Dockerfile | 2 ++ kubernetes/kserve/build_image.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/kubernetes/kserve/Dockerfile b/kubernetes/kserve/Dockerfile index eb32f579bc..06018f5b32 100644 --- a/kubernetes/kserve/Dockerfile +++ b/kubernetes/kserve/Dockerfile @@ -24,10 +24,12 @@ RUN pip install -r requirements.txt COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh COPY kserve_wrapper kserve_wrapper +COPY third_party third_party COPY ./*.proto ./kserve_wrapper/ RUN python -m grpc_tools.protoc \ + -I third_party/google/rpc \ --proto_path=./kserve_wrapper \ --python_out=./kserve_wrapper \ --grpc_python_out=./kserve_wrapper \ diff --git a/kubernetes/kserve/build_image.sh b/kubernetes/kserve/build_image.sh index 630d5d7694..906e557801 100755 --- a/kubernetes/kserve/build_image.sh +++ b/kubernetes/kserve/build_image.sh @@ -55,5 +55,6 @@ then fi cp ../../frontend/server/src/main/resources/proto/*.proto . +cp -r ../../third_party . DOCKER_BUILDKIT=1 docker build --file "$DOCKER_FILE" --build-arg BASE_IMAGE=$BASE_IMAGE -t "$DOCKER_TAG" . From e5033b86d9a533f16bf109f005733466305780c3 Mon Sep 17 00:00:00 2001 From: Naman Nandan Date: Wed, 8 Nov 2023 16:50:44 -0800 Subject: [PATCH 2/3] test docker nightly build fix --- .github/workflows/docker-nightly-build.yml | 9 ++------- kubernetes/kserve/docker_nightly.py | 8 ++++---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker-nightly-build.yml b/.github/workflows/docker-nightly-build.yml index 9e6528deb5..90dbcc3fff 100644 --- a/.github/workflows/docker-nightly-build.yml +++ b/.github/workflows/docker-nightly-build.yml @@ -1,9 +1,8 @@ name: Push Docker Nightly on: - # run every day at 1:15pm - schedule: - - cron: "15 13 * * *" + push + jobs: nightly: runs-on: [self-hosted, ci-gpu] @@ -28,10 +27,6 @@ jobs: env: DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} run: docker login --username pytorchbot --password "$DOCKER_PASSWORD" - - name: Push Docker Nightly - run: | - cd docker - python docker_nightly.py --cleanup - name: Push KServe Docker Nightly run: | cd kubernetes/kserve diff --git a/kubernetes/kserve/docker_nightly.py b/kubernetes/kserve/docker_nightly.py index 209c0d976e..148cc901b6 100644 --- a/kubernetes/kserve/docker_nightly.py +++ b/kubernetes/kserve/docker_nightly.py @@ -44,8 +44,8 @@ ) # Push Nightly images to official PyTorch Dockerhub account - try_and_handle(f"docker push {organization}/{cpu_version}", dry_run) - try_and_handle(f"docker push {organization}/{gpu_version}", dry_run) + # try_and_handle(f"docker push {organization}/{cpu_version}", dry_run) + # try_and_handle(f"docker push {organization}/{gpu_version}", dry_run) # Tag nightly images with latest try_and_handle( @@ -58,8 +58,8 @@ ) # Push images with latest tag - try_and_handle(f"docker push {organization}/{project}:latest-cpu", dry_run) - try_and_handle(f"docker push {organization}/{project}:latest-gpu", dry_run) + # try_and_handle(f"docker push {organization}/{project}:latest-cpu", dry_run) + # try_and_handle(f"docker push {organization}/{project}:latest-gpu", dry_run) # Cleanup built images if args.cleanup: From 0a3a78bd89bf7946ae1d384cf2b5de2eb791b5e1 Mon Sep 17 00:00:00 2001 From: Naman Nandan Date: Wed, 8 Nov 2023 17:32:16 -0800 Subject: [PATCH 3/3] Revert "test docker nightly build fix" This reverts commit e5033b86d9a533f16bf109f005733466305780c3. --- .github/workflows/docker-nightly-build.yml | 9 +++++++-- kubernetes/kserve/docker_nightly.py | 8 ++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-nightly-build.yml b/.github/workflows/docker-nightly-build.yml index 90dbcc3fff..9e6528deb5 100644 --- a/.github/workflows/docker-nightly-build.yml +++ b/.github/workflows/docker-nightly-build.yml @@ -1,8 +1,9 @@ name: Push Docker Nightly on: - push - + # run every day at 1:15pm + schedule: + - cron: "15 13 * * *" jobs: nightly: runs-on: [self-hosted, ci-gpu] @@ -27,6 +28,10 @@ jobs: env: DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} run: docker login --username pytorchbot --password "$DOCKER_PASSWORD" + - name: Push Docker Nightly + run: | + cd docker + python docker_nightly.py --cleanup - name: Push KServe Docker Nightly run: | cd kubernetes/kserve diff --git a/kubernetes/kserve/docker_nightly.py b/kubernetes/kserve/docker_nightly.py index 148cc901b6..209c0d976e 100644 --- a/kubernetes/kserve/docker_nightly.py +++ b/kubernetes/kserve/docker_nightly.py @@ -44,8 +44,8 @@ ) # Push Nightly images to official PyTorch Dockerhub account - # try_and_handle(f"docker push {organization}/{cpu_version}", dry_run) - # try_and_handle(f"docker push {organization}/{gpu_version}", dry_run) + try_and_handle(f"docker push {organization}/{cpu_version}", dry_run) + try_and_handle(f"docker push {organization}/{gpu_version}", dry_run) # Tag nightly images with latest try_and_handle( @@ -58,8 +58,8 @@ ) # Push images with latest tag - # try_and_handle(f"docker push {organization}/{project}:latest-cpu", dry_run) - # try_and_handle(f"docker push {organization}/{project}:latest-gpu", dry_run) + try_and_handle(f"docker push {organization}/{project}:latest-cpu", dry_run) + try_and_handle(f"docker push {organization}/{project}:latest-gpu", dry_run) # Cleanup built images if args.cleanup: