Merge branch '334483-build-assets-image-failed-on-dev' into 'master'

Resolve "build-assets-image failed on dev"

See merge request gitlab-org/gitlab!64757

.gitlab/ci/build-images.gitlab-ci.yml

@@ -3,7 +3,7 @@
   script:
     # With .git/hooks/post-checkout in place, Git tries to pull LFS objects, but the image doesn't have Git LFS, and we actually don't care about it for this specific so we just remove the file.
     # Without removing the file, the error is as follows: "This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-checkout."
-    - rm .git/hooks/post-checkout
+    - rm -f .git/hooks/post-checkout
     - if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_SHA" ]; then
         echo "Checking out \$CI_MERGE_REQUEST_SOURCE_BRANCH_SHA ($CI_MERGE_REQUEST_SOURCE_BRANCH_SHA) instead of \$CI_COMMIT_SHA (merge result commit $CI_COMMIT_SHA) so that GitLab image built in omnibus-gitlab-mirror and QA image are in sync.";
         git checkout -f ${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA};