[GitHub] [airflow] feluelle commented on a change in pull request #12181: Simplifies check whether the CI image should be rebuilt

[GitBox <gi...@apache.org>]

feluelle commented on a change in pull request #12181:
URL: https://github.com/apache/airflow/pull/12181#discussion_r522152876



##########
File path: Dockerfile.ci
##########
@@ -132,7 +132,9 @@ ARG RUNTIME_APT_DEPS="\
       sqlite3 \
       tmux \
       unzip \
-      vim"
+      vim \
+      xxd"
+ENV RUNTIME_APT_DEP=${RUNTIME_APT_DEPS}

Review comment:
       ```suggestion
   ENV RUNTIME_APT_DEPS=${RUNTIME_APT_DEPS}
   ```

##########
File path: scripts/ci/libraries/_build_images.sh
##########
@@ -427,14 +416,12 @@ function build_images::rebuild_ci_image_if_needed() {
             echo
             echo "Checking if the remote image needs to be pulled"
             echo
-            build_images::get_remote_image_info
-            if [[ ${REMOTE_DOCKER_REGISTRY_UNREACHABLE:=} != "true" ]]; then
-                build_images::get_local_image_info
-                if [[ ${LOCAL_MANIFEST_IMAGE_UNAVAILABLE:=} != "true" ]]; then
-                    build_images::compare_layers
-                else
-                    FORCE_PULL_IMAGES="true"
-                fi
+            build_images::get_remote_image_build_cache_indicator
+            if [[ ${REMOTE_DOCKER_REGISTRY_UNREACHABLE:=} != "true" && \
+                  ${LOCAL_MANIFEST_IMAGE_UNAVAILABLE:=} != "true" ]]; then
+                    build_images::compare_local_and_remote_build_cache_indicator

Review comment:
       ```suggestion
                   build_images::compare_local_and_remote_build_cache_indicator
   ```
   Shouldn't it be indented less (i.e. 4 spaces from the beginning of the if statement)?
   




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org