From 7e821fb6188d1a5e1bdfea619efb86fe8a6c5282 Mon Sep 17 00:00:00 2001 From: Wei Fu Date: Mon, 7 Feb 2022 23:31:14 +0800 Subject: [PATCH] fix: .dockerignore makes git working tree dirty The .github/workflows/release/Dockerfile will use working dir as docker build context. But the .dockerignore will ignore the .github/release/... and cause dirty. We should remove it and verify git working tree after build. Fix: #6484 Signed-off-by: Wei Fu --- .dockerignore | 4 ---- .github/workflows/release/Dockerfile | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 6745fa3fc..000000000 --- a/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -.github/ -.dockerignore -releases/ -bin/ diff --git a/.github/workflows/release/Dockerfile b/.github/workflows/release/Dockerfile index b889b59f1..b00f41468 100644 --- a/.github/workflows/release/Dockerfile +++ b/.github/workflows/release/Dockerfile @@ -50,5 +50,10 @@ RUN \ make release cri-release cri-cni-release && \ for f in $(find bin -executable -type f); do xx-verify $f; done +# check git working tree after build +RUN \ + export GIT_STATUS_OUTPUT=$(git status --porcelain) && \ + test -z $GIT_STATUS_OUTPUT || (echo $GIT_STATUS_OUTPUT && exit 1) + FROM scratch AS release COPY --from=target /go/src/github.com/containerd/containerd/releases/ /