From 8239dee8d22f2dba038cb6e761a22a85de4645f3 Mon Sep 17 00:00:00 2001 From: Qinlong Wang Date: Fri, 22 Sep 2023 11:32:30 +0800 Subject: [PATCH 1/2] Update the base image to easydl/dlrover:ci --- .github/actions/pre-commit/action.yml | 2 +- docker/Dockerfile | 2 +- docker/ci.dockerfile | 3 ++- examples/pytorch/mnist/mnist.dockerfile | 2 +- examples/pytorch/nanogpt/nanogpt.dockerfile | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/actions/pre-commit/action.yml b/.github/actions/pre-commit/action.yml index 1a9cf128f..97f92bc6f 100644 --- a/.github/actions/pre-commit/action.yml +++ b/.github/actions/pre-commit/action.yml @@ -3,7 +3,7 @@ name: pre-commit description: run pre-commit to check codes runs: using: 'docker' - image: "easydl/easydl:ci" + image: "easydl/dlrover:ci" args: - "/bin/bash" - "-c" diff --git a/docker/Dockerfile b/docker/Dockerfile index dd67655be..bd602ccfe 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM easydl/easydl:ci as builder +FROM easydl/dlrover:ci as builder WORKDIR /dlrover COPY ./ . diff --git a/docker/ci.dockerfile b/docker/ci.dockerfile index eb10ce47a..90c08cd56 100644 --- a/docker/ci.dockerfile +++ b/docker/ci.dockerfile @@ -33,7 +33,8 @@ COPY docker/scripts/install-protobuf.bash / RUN /install-protobuf.bash && rm /install-protobuf.bash # Install Pre-commit -RUN pip install pre-commit pytest -i https://mirrors.aliyun.com/pypi/simple/ +RUN pip install pre-commit pytest kubernetes grpcio-tools psutil \ + deprecated -i https://mirrors.aliyun.com/pypi/simple/ # Configure envtest for integration tests of kubebuilder ENV KUBEBUILDER_CONTROLPLANE_START_TIMEOUT 60s diff --git a/examples/pytorch/mnist/mnist.dockerfile b/examples/pytorch/mnist/mnist.dockerfile index 9379d5016..abe6fddde 100644 --- a/examples/pytorch/mnist/mnist.dockerfile +++ b/examples/pytorch/mnist/mnist.dockerfile @@ -1,4 +1,4 @@ -FROM easydl/easydl:ci as builder +FROM easydl/dlrover:ci as builder WORKDIR /dlrover COPY ./ . diff --git a/examples/pytorch/nanogpt/nanogpt.dockerfile b/examples/pytorch/nanogpt/nanogpt.dockerfile index 03940daed..7745efc67 100644 --- a/examples/pytorch/nanogpt/nanogpt.dockerfile +++ b/examples/pytorch/nanogpt/nanogpt.dockerfile @@ -1,4 +1,4 @@ -FROM easydl/easydl:ci as builder +FROM easydl/dlrover:ci as builder WORKDIR /dlrover COPY ./ . From f53452c5f1facfff50671e40abbed66d25d7e75a Mon Sep 17 00:00:00 2001 From: Qinlong Wang Date: Fri, 22 Sep 2023 20:43:33 +0800 Subject: [PATCH 2/2] Execute git config in the pre-commit action. --- .github/actions/pre-commit/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/pre-commit/action.yml b/.github/actions/pre-commit/action.yml index 97f92bc6f..66d5ac67e 100644 --- a/.github/actions/pre-commit/action.yml +++ b/.github/actions/pre-commit/action.yml @@ -7,4 +7,5 @@ runs: args: - "/bin/bash" - "-c" - - "pre-commit run -a --show-diff-on-failure --color=always" + - "git config --global --add safe.directory '*' && \ + pre-commit run -a --show-diff-on-failure --color=always"