Merge branch 'fix-docker-rebuild-rule' into 'master'

.gitlab: fix building docker image even when skipping ci on first commit

See merge request hdl-libraries/bedrock!241

Author: lerwys

.gitlab-ci.yml

@@ -11,6 +11,7 @@ variables:
   CONTAINER_IMAGE: $CI_REGISTRY/bedrock_testing_base_bookworm
   DOCKER_HOST: tcp://docker:2375/
   DOCKER_DRIVER: overlay2
+  FF_SCRIPT_SECTIONS: "true"
 
 image: $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME
 

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

@@ -1,3 +1,32 @@
+check_rebuild:
+  image: docker:stable
+  stage: build
+  script: |
+    echo "DOCKER_IMAGE_REBUILD=1" > build.env
+  artifacts:
+    reports:
+      dotenv: build.env
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: $CI_COMMIT_BRANCH
+      changes:
+        - Dockerfile*
+        - build-tools/litex_meta.sh
+        - .gitlab/ci/build.gitlab-ci.yml
+
+check_exists:
+  image: docker:stable
+  stage: build
+  script: |
+    export DOCKER_CLI_EXPERIMENTAL=enabled
+    docker manifest inspect \
+      $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME > /dev/null && \
+    DOCKER_IMAGE_EXISTS=1 || DOCKER_IMAGE_EXISTS=0
+    echo "DOCKER_IMAGE_EXISTS=${DOCKER_IMAGE_EXISTS}" > build.env
+  artifacts:
+    reports:
+      dotenv: build.env
+
 build:
   image: docker:stable
   stage: build
@@ -8,7 +37,18 @@ build:
     - echo $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME
     - echo $CONTAINER_IMAGE:$CI_COMMIT_SHORT_SHA
     - echo $CONTAINER_IMAGE:$CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA
+  needs:
+    - job: check_rebuild
+      optional: true
+    - job: check_exists
+      optional: true
   script: |
+    echo "DOCKER_IMAGE_REBUILD=${DOCKER_IMAGE_REBUILD}"
+    echo "DOCKER_IMAGE_EXISTS=${DOCKER_IMAGE_EXISTS}"
+    if [ \( -z "$DOCKER_IMAGE_REBUILD" -o "$DOCKER_IMAGE_REBUILD" == "0" \) -a \
+        "$DOCKER_IMAGE_EXISTS" == "1" ]; then
+      exit 0
+    fi
     docker pull $CONTAINER_IMAGE:latest || true
     docker build --cache-from $CONTAINER_IMAGE:latest \
         -t $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME \
@@ -19,9 +59,3 @@ build:
     docker push $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME
     docker push $CONTAINER_IMAGE:$CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA
     docker push $CONTAINER_IMAGE:latest
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
-    - if: $CI_COMMIT_BRANCH
-      changes:
-        - Dockerfile*
-        - .gitlab/ci/build.gitlab-ci.yml