From 2dfe04da6286931d74b57a4b4b6d22009ed0be24 Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Mon, 21 Apr 2025 06:48:18 +0200
Subject: [PATCH] PHP: 7.4 rebuild
---
.gitlab-ci.yml | 2 +-
build_containers.sh | 2 +-
php/7.4-apache/Dockerfile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1548438a..4d174d1a 100644
--- a/.gitlab-ci.yml
+++ b/.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
- |
diff --git a/build_containers.sh b/build_containers.sh
index 9fb0deb9..b0c2ba4c 100755
--- a/build_containers.sh
+++ b/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}
diff --git a/php/7.4-apache/Dockerfile b/php/7.4-apache/Dockerfile
index 7377a391..74b6eb76 100644
--- a/php/7.4-apache/Dockerfile
+++ b/php/7.4-apache/Dockerfile
@@ -1,4 +1,4 @@
-######
+#######
# Base
######
FROM debian:buster
--
GitLab