Commit to go back from test; add helper messages

integrations/docker/images/chip-build-zap/Dockerfile

@@ -13,19 +13,14 @@ ENV REMOTE_ZAP_CACHE_FILE=/remote_zap_commit.txt
 ENV REMOTE_DOCKERFILE_CACHE_FILE=/remote_dockerfile_commit.txt
 ENV VERIFY_SCRIPT=zapverify.sh
 
-# TODO
-# Check if verify script exists, warn cannot build out of context
-
-# TODO
-# Check if context exists, warn must be built with included build.sh
-
 # Check zap in chip origin
+RUN echo 'If you receive a "file not found in build context" error, ensure you are building with the included build.sh to populate the build context'
 COPY context.txt $LOCAL_COMMIT_CACHE_FILE
 WORKDIR /tmp
 RUN git clone $CHIP_ORIGIN
 WORKDIR ./connectedhomeip
 # TODO
-RUN echo 'If you receieve the error "git reference is not a tree", you are on a commit not found in $CHIP_ORIGIN'
+RUN echo 'If you receive the error "fatal: reference is not a tree:", you are on a commit not found in' $CHIP_ORIGIN
 RUN git checkout $(cat $LOCAL_COMMIT_CACHE_FILE)
 RUN git ls-tree master third_party/zap/repo | awk '{print $3}'> $REMOTE_ZAP_CACHE_FILE
 RUN cat $REMOTE_ZAP_CACHE_FILE
@@ -37,6 +32,7 @@ RUN cat $REMOTE_DOCKERFILE_CACHE_FILE
 
 # Verify local against origin
 WORKDIR /
+RUN echo 'If you receive a "file not found in build context" error, ensure you are building in a CHIP repo with the included build.sh'"
 COPY $VERIFY_SCRIPT $VERIFY_SCRIPT
 RUN chmod +x $VERIFY_SCRIPT
 RUN $VERIFY_SCRIPT