diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1548438a5a11665714d8176d6be72013ba99e56f..4d174d1aa4e954f108abe2c2435ca6e6f73692b5 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 9fb0deb917eec2ca1d2d37304900ff4a702d3ec7..b0c2ba4c66d950767b403ba5bb380e427f5b3808 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 7377a39188c4b5c35a0a277db2d17225f5822ded..74b6eb7692ae2bc2e9befd3b8eafd0247fbed1a5 100644 --- a/php/7.4-apache/Dockerfile +++ b/php/7.4-apache/Dockerfile @@ -1,4 +1,4 @@ -###### +####### # Base ###### FROM debian:buster