CI: push ubuntu variants for php-8.(1|2)-apache

build_containers.sh

@@ -19,11 +19,14 @@ if [[ ! -z "${DOCKERFILES-}" ]]; then
       BUILDRESULT=$?
       if [ ${BUILDRESULT} -eq 0 ]; then
           docker push ${REGISTRY_PATH}/${DOCKERTAG#db-}:${GITBRANCH}
-          #TODO: this currently assumes that the only containers we are working on are the php containers.
-          # Legacy from when this was a Jenkins script
-          #if [ "${GITBRANCH}" != "production" ]; then
-          #  curl https://dispatcher.drupalci.org/job/drupalci_test_containers/buildWithParameters?token=${2}\&DCI_PHPVersion=${DOCKERTAG}:${GITBRANCH}
-          #fi
+
+          # Check if we're building 8.1-apache or 8.2-apache images
+          if [[ "${DOCKERTAG}" == "php-8.1-apache" || "${DOCKERTAG}" == "php-8.2-apache" ]]; then
+              # Tag and push with -ubuntu suffix
+              docker tag ${REGISTRY_PATH}/${DOCKERTAG}:${GITBRANCH} \
+                        ${REGISTRY_PATH}/${DOCKERTAG}-ubuntu:${GITBRANCH}
+              docker push ${REGISTRY_PATH}/${DOCKERTAG}-ubuntu:${GITBRANCH}
+          fi
       fi
     done
 fi

php/8.1-apache/Dockerfile

@@ -8,7 +8,7 @@ ARG PHP_CFLAGS="-O2 -g"
 FROM ${THE_BASE_IMAGE} as builder
 ENV DRUPALCI=TRUE TERM=xterm DEBIAN_FRONTEND=noninteractive
 
-#########
+########
 # Php build
 ######