PHP: 7.4 rebuild

(cherry picked from commit 2dfe04da)

Co-authored-by: Andy Postnikov <apostnikov@gmail.com>

.gitlab-ci.yml

@@ -75,7 +75,7 @@ stages:
       - .
   script:
     - ln -s buildah /usr/bin/docker
-    - dnf install -y --nodocs git awk
+    - dnf install -y --nodocs git-core awk
     - git config --global --add safe.directory $(pwd)
     - echo "${REGISTRY_PASSWORD}" | buildah login -u "${REGISTRY_USERNAME}" --password-stdin registry.gitlab.com
     - |

build_containers.sh

@@ -21,7 +21,7 @@ if [[ ! -z "${DOCKERFILES-}" ]]; then
           docker push ${REGISTRY_PATH}/${DOCKERTAG#db-}:${GITBRANCH}
 
           # 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
+          if [[ "${DOCKERTAG}" == "php-8.1-apache" || "${DOCKERTAG}" == "php-8.2-apache" || "${DOCKERTAG}" == "php-7.4-apache" ]]; then
               # Tag and push with -ubuntu suffix
               docker tag ${REGISTRY_PATH}/${DOCKERTAG}:${GITBRANCH} \
                         ${REGISTRY_PATH}/${DOCKERTAG}-ubuntu:${GITBRANCH}

php/7.4-apache/Dockerfile

-######
+#######
 # Base
 ######
 FROM debian:buster