set the dependencies right

.gitlab-ci.yml

@@ -8,52 +8,68 @@ variables:
 .common_build:
   image: docker:latest
   stage: 🏗️ build_and_push
-  rules:
-    - changes: 
-      - $IMAGE_NAME/Dockerfile
-      - basis/*
   before_script:
     - docker login -u "$DOCKER_HUB_USER" -p $DOCKER_TOKEN
   script:
       - docker build -t "$DOCKER_HUB_USER/etp_$IMAGE_NAME" $IMAGE_NAME --no-cache;
       - docker push "$DOCKER_HUB_USER/etp_$IMAGE_NAME";
 
-.extend_build_image:
-  extends:
-    - .common_build
-  needs:  # if the build_and_push step basis has to be done, then make the other build_and_push steps dependend of it
-    - job: basis
-      optional: true # only run if basis is added to the pipeline (depends on the rules).
-
 basis:
   variables:
     IMAGE_NAME: "basis"
   extends:
     - .common_build
+  rules: # only execute if Dockerfile was changed
+    - changes: 
+      - $IMAGE_NAME/Dockerfile
 
 tp:
   variables:
     IMAGE_NAME: "tp"
   extends:
-    - .extend_build_image
+    - .common_build
+  needs:  # if the build_and_push step basis has to be done, then make the other build_and_push steps dependend of it
+    - job: basis
+      optional: true # only run if basis is added to the pipeline (depends on the rules).
+  rules: # only execute if Dockerfile or basis/Dockerfile was changed
+    - changes: 
+      - $IMAGE_NAME/Dockerfile
+      - basis/*
 
 python311:
   variables:
     IMAGE_NAME: "python311"
   extends:
-    - .extend_build_image
+    - .common_build
+  rules: # only execute if Dockerfile was changed
+    - changes: 
+      - $IMAGE_NAME/Dockerfile
       
 basis_jupytermachine:
   variables:
     IMAGE_NAME: "basis_jupytermachine"
   extends:
-    - .extend_build_image
+    - .common_build
+  needs:  # if the build_and_push step basis has to be done, then make the other build_and_push steps dependend of it
+    - job: basis
+      optional: true # only run if basis is added to the pipeline (depends on the rules).
+  rules: # only execute if Dockerfile or basis/Dockerfile was changed
+    - changes: 
+      - $IMAGE_NAME/Dockerfile
+      - basis/*
       
 tp_herwig:
   variables:
     IMAGE_NAME: "tp_herwig"
   extends:
-    - .extend_build_image
+    - .common_build
+  needs:  # if the build_and_push step basis has to be done, then make the other build_and_push steps dependend of it
+    - job: tp
+      optional: true # only run if basis is added to the pipeline (depends on the rules).
+  rules: # only execute if Dockerfile or tp/Dockerfile was changed
+    - changes: 
+      - $IMAGE_NAME/Dockerfile
+      - tp/*
       
 create_jupytermachine_version:
   stage: create_jupytermachine_version

tp_herwig/Dockerfile

@@ -2,8 +2,6 @@ FROM jeppelt/etp_tp:latest
 
 USER root
 
-RUN python3 -m pip install bash_kernel
-
 RUN mkdir /herwig
 ENV INSTALL_LOC=/herwig