Seperate stages for regular and base images.

Some images are base images for other images. There's a need to build
the base images first.

.gitlab-ci.yml

@@ -7,12 +7,29 @@ include:
   - project: shore/ci-stuff
     file: templates/containerfiles.yml
 
+# Base image templates:
+stages:
+  - build-base
+  - deploy-base
+  - build
+  - deploy
+
+.container-build-base:
+  extends: .container-build
+  stage: build-base
+
+.container-push-base:
+  extends: .container-push
+  stage: deploy-base
+
 # cgit image:
 
 build-cgit:
   extends: .container-build
   variables:
     CONTEXT: cgit
+  needs:
+    - job: push-httpd
 
 push-cgit:
   extends: .container-push
@@ -26,12 +43,12 @@ push-cgit:
 # httpd latest image:
 
 build-httpd:
-  extends: .container-build
+  extends: .container-build-base
   variables:
     CONTEXT: httpd/buster
 
 push-httpd:
-  extends: .container-push
+  extends: .container-push-base
   variables:
     CONTEXT: httpd/buster
     IMAGE: httpd
@@ -42,7 +59,7 @@ push-httpd:
 # httpd buster image:
 
 push-httpd-buster:
-  extends: .container-push
+  extends: .container-push-base
   variables:
     CONTEXT: httpd/buster
     IMAGE: httpd
@@ -54,7 +71,7 @@ push-httpd-buster:
 # httpd bullseye image:
 
 build-httpd-bullseye:
-  extends: .container-build
+  extends: .container-build-base
   variables:
     CONTEXT: httpd/bullseye
 
@@ -88,12 +105,12 @@ push-sshd:
 # crond image:
 
 build-crond:
-  extends: .container-build
+  extends: .container-build-base
   variables:
     CONTEXT: crond
 
 push-crond:
-  extends: .container-push
+  extends: .container-push-base
   variables:
     CONTEXT: crond
     IMAGE: cron
@@ -123,6 +140,8 @@ build-webdav:
   extends: .container-build
   variables:
     CONTEXT: webdav
+  needs:
+    - job: push-httpd
 
 push-webdav:
   extends: .container-push

webdav/Dockerfile

-FROM registry.shore.co.il/httpd:bullseye
+# hadolint ignore=DL3006
+FROM registry.shore.co.il/httpd
 USER root
 RUN a2enmod dav && \
     a2enmod dav_fs && \