diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab33d04de8507c95c40e7a17c6b7ea50b28bb72e..c9bfb7595bb405d12d515e59780a7ebf4b1bcd9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,10 +23,12 @@ docker:
   - docker build -t ${IMAGE_NAME}:latest -f Dockerfile-base .
   - docker push ${IMAGE_NAME}:latest
   image: docker:20.10.17
-  allow_failure: true
-  only:
-    changes:
-      - Dockerfile-base
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      changes:
+        paths:
+        - Dockerfile-base
+    - if: $COMPILE_DOCKER
 
 test_ppparis:
   stage: test