diff --git a/.dri.gitlab-ci.yml b/.dri.gitlab-ci.yml index 772d7fa3ca0c291daa56c89dc8f3bbd2a39bb6a2..0545cb49c78765ed32d4e22f694890aeceefa7ff 100644 --- a/.dri.gitlab-ci.yml +++ b/.dri.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: DOCKER_DRIVER: overlay2 TEST_IMAGE: "$CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME" REGISTRY_URL: "$CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME" - CENTOS_VERSION: "7.7.1908" + CENTOS_VERSION: "7.9.2009" stages: @@ -65,6 +65,12 @@ httpd-phpfpm:7.4-centos: PHPVERSION: "7.4" build_context: "centos" +httpd-phpfpm:8.0-centos: + extends: .build + variables: + PHPVERSION: "8.0" + build_context: "centos" + diff --git a/centos/files/ep-httpd.sh b/centos/files/ep-httpd.sh index 9e533f3f32a9783f84a64e3ac9a91d70191f1d97..ff17a65e948cbc7e8ee3931b38424de55ddee8b4 100755 --- a/centos/files/ep-httpd.sh +++ b/centos/files/ep-httpd.sh @@ -84,8 +84,7 @@ sed -i -e '/LoadModule slotmem_shm_module/s/^#//' ${LOADMODULE_BASE_FILE} # modules to disable # - autoindex sed -i -e '/LoadModule autoindex_module/s/^/#/' ${LOADMODULE_BASE_FILE} -mv /etc/httpd/conf.d/autoindex.conf /etc/httpd/conf.d/autoindex.disabled - +mv -f /etc/httpd/conf.d/autoindex.conf /etc/httpd/conf.d/autoindex.disabled # ================================ # HTTPD_ENABLE_PERSISTENT_ERRORLOG diff --git a/centos/files/install-composer.sh b/centos/files/install-composer.sh index f671a0a99bee76e8c20757b3bf604afee9baa6db..e1ac6a253010bcb5be14eff23bcb5df1b3ceaf27 100755 --- a/centos/files/install-composer.sh +++ b/centos/files/install-composer.sh @@ -1,6 +1,14 @@ #!/bin/bash + +# Latest cd /root php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"; php -r "\$lines=file('https://composer.github.io/installer.sig',FILE_IGNORE_NEW_LINES); if ( hash_file('SHA384', 'composer-setup.php') === \$lines[0] ) { echo 'Installer verified'; } else { echo 'Insta ller corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"; -php composer-setup.php --install-dir=/usr/local/bin --filename=composer; +php composer-setup.php --install-dir=/usr/local/bin --1 --filename=composer1; +php composer-setup.php --install-dir=/usr/local/bin --2 --filename=composer2; php -r "unlink('composer-setup.php');" + +# Pointage vers la version 1 pour l'instant +ln -s /usr/local/bin/composer1 /usr/local/bin/composer + +echo "=====> $(/usr/local/bin/composer --version)"