Merge pull request #10127 from filecoin-project/gstuart/backport-dock…

…er-fix

backport: fix: ci: Fix dirty git state when building docker images

.circleci/config.yml

@@ -426,6 +426,10 @@ jobs:
     steps:
       - setup_remote_docker
       - checkout
+      - git_fetch_all_tags
+      - run: git submodule sync
+      - run: git submodule update --init
+
       - docker/check:
           docker-username: DOCKERHUB_USERNAME
           docker-password: DOCKERHUB_PASSWORD

.circleci/template.yml

@@ -426,6 +426,10 @@ jobs:
     steps:
       - setup_remote_docker
       - checkout
+      - git_fetch_all_tags
+      - run: git submodule sync
+      - run: git submodule update --init
+
       - docker/check:
           docker-username: DOCKERHUB_USERNAME
           docker-password: DOCKERHUB_PASSWORD

.gitignore

@@ -1,6 +1,3 @@
-/AppDir
-/appimage-builder-cache
-*.AppImage
 /lotus
 /lotus-miner
 /lotus-worker
@@ -50,3 +47,8 @@ build/builtin-actors/v*
 build/builtin-actors/*.car
 
 dist/
+
+
+# The following files are checked into git and result
+# in dirty git state if removed from the docker context
+!extern/filecoin-ffi/rust/filecoin.pc

Dockerfile

@@ -33,6 +33,8 @@ RUN set -eux; \
 COPY ./ /opt/filecoin
 WORKDIR /opt/filecoin
 
+RUN scripts/docker-git-state-check.sh
+
 ### make configurable filecoin-ffi build
 ARG FFI_BUILD_FROM_SOURCE=0
 ENV FFI_BUILD_FROM_SOURCE=${FFI_BUILD_FROM_SOURCE}

scripts/docker-git-state-check.sh

@@ -0,0 +1,12 @@
+set -e
+
+if [ -z "$(git status --porcelain)" ]; then
+  echo "PASSED: Working directory clean"
+else
+  echo "FAILED: Working directory not clean."
+  echo "This is likely because the .dockerignore file has removed something checked into git."
+  echo "Add the missing files listed below to the .dockerignore to fix this issue:"
+  echo "$(git status)"
+  exit 1
+fi
+