From 0d2209713580840e0a790c33a28586bed33820da Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 8 Aug 2024 08:58:46 +0200 Subject: [PATCH] chore: Stop building CentOS 7 images CentOS 7 is EOL. --- .../Build_And_Publish_Docker_Images.yml | 2 +- .github/workflows/Build_Docker_Image_PR.yml | 2 +- Tuleap.repo | 2 +- c7.dockerfile | 67 ------------------- el9.dockerfile | 1 - 5 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 c7.dockerfile diff --git a/.github/workflows/Build_And_Publish_Docker_Images.yml b/.github/workflows/Build_And_Publish_Docker_Images.yml index 6a7041b..4e8c5df 100644 --- a/.github/workflows/Build_And_Publish_Docker_Images.yml +++ b/.github/workflows/Build_And_Publish_Docker_Images.yml @@ -18,7 +18,7 @@ jobs: build: strategy: matrix: - os_base: ["c7", "el9"] + os_base: ["el9"] php_base: ["php82", "php83"] runs-on: ubuntu-22.04 steps: diff --git a/.github/workflows/Build_Docker_Image_PR.yml b/.github/workflows/Build_Docker_Image_PR.yml index 28df21d..42358fa 100644 --- a/.github/workflows/Build_Docker_Image_PR.yml +++ b/.github/workflows/Build_Docker_Image_PR.yml @@ -13,7 +13,7 @@ jobs: build: strategy: matrix: - os_base: ["c7", "el9"] + os_base: ["el9"] php_base: ["php82", "php83"] runs-on: ubuntu-22.04 steps: diff --git a/Tuleap.repo b/Tuleap.repo index a3beac9..e1e3720 100644 --- a/Tuleap.repo +++ b/Tuleap.repo @@ -1,6 +1,6 @@ [Tuleap] name=Tuleap -baseurl=https://ci.tuleap.net/yum/tuleap/rhel/7/dev/$basearch +baseurl=https://ci.tuleap.net/yum/tuleap/rhel/$releasever/dev/$basearch enabled=1 gpgcheck=1 gpgkey=https://ci.tuleap.net/yum/tuleap/gpg.key \ No newline at end of file diff --git a/c7.dockerfile b/c7.dockerfile deleted file mode 100644 index 19954dd..0000000 --- a/c7.dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -FROM centos:7 - -ARG PHP_BASE -ARG PHP_CURRENT - -COPY *.repo /etc/yum.repos.d/ - -RUN yum -y install epel-release centos-release-scl && \ - yum -y install \ - tuleap \ - tuleap-plugin-git \ - tuleap-plugin-svn \ - sha1collisiondetector \ - rh-mysql80-mysql \ - ${PHP_CURRENT}-php-gd \ - ${PHP_CURRENT}-php-mysqlnd \ - ${PHP_CURRENT}-php-xml \ - ${PHP_CURRENT}-php-mbstring \ - ${PHP_CURRENT}-php-opcache \ - ${PHP_CURRENT}-php-cli \ - ${PHP_CURRENT}-php-pdo \ - ${PHP_CURRENT}-php-xml \ - ${PHP_CURRENT}-php-mbstring \ - ${PHP_CURRENT}-php-process \ - ${PHP_CURRENT}-php-sodium \ - ${PHP_CURRENT}-php-ldap \ - ${PHP_CURRENT}-php-pecl-zip \ - ${PHP_CURRENT}-php-pecl-redis5 \ - ${PHP_CURRENT}-php-pecl-mailparse \ - ${PHP_BASE}-php-gd \ - ${PHP_BASE}-php-mysqlnd \ - ${PHP_BASE}-php-xml \ - ${PHP_BASE}-php-mbstring \ - ${PHP_BASE}-php-opcache \ - ${PHP_BASE}-php-fpm \ - ${PHP_BASE}-php-cli \ - ${PHP_BASE}-php-pdo \ - ${PHP_BASE}-php-xml \ - ${PHP_BASE}-php-mbstring \ - ${PHP_BASE}-php-process \ - ${PHP_BASE}-php-sodium \ - ${PHP_BASE}-php-ldap \ - ${PHP_BASE}-php-pecl-zip \ - ${PHP_BASE}-php-pecl-redis5 \ - ${PHP_BASE}-php-pecl-mailparse \ - java-1.8.0-openjdk \ - sudo \ - && \ - rm -rf /usr/share/tuleap/ && \ - rm /usr/bin/tuleap-cfg /usr/bin/tuleap && \ - yum clean all - -RUN mkdir -p /etc/tuleap/conf \ - /etc/tuleap/plugins \ - /var/log/tuleap \ - /usr/lib/tuleap/bin \ - /var/lib/tuleap/ftp/incoming \ - /var/lib/tuleap/ftp/tuleap && \ - chown -R codendiadm:codendiadm /etc/tuleap /var/lib/tuleap/ftp /var/log/tuleap && \ - echo "zend.assertions = 1" >> /etc/opt/remi/${PHP_BASE}/php.ini && \ - echo "assert.exception = 1" >> /etc/opt/remi/${PHP_BASE}/php.ini && \ - echo "date.timezone = Europe/Paris" >> /etc/opt/remi/${PHP_BASE}/php.ini - -CMD /usr/share/tuleap/tests/rest/bin/run.sh - -ENV PHP_FPM=/opt/remi/${PHP_BASE}/root/usr/sbin/php-fpm -ENV PHP_CLI=/opt/remi/${PHP_BASE}/root/usr/bin/php diff --git a/el9.dockerfile b/el9.dockerfile index a8285ee..78c59bf 100644 --- a/el9.dockerfile +++ b/el9.dockerfile @@ -9,7 +9,6 @@ RUN dnf -y install epel-release rocky-release-security https://ci.tuleap.net/yum tuleap \ tuleap-plugin-git \ tuleap-plugin-svn \ - sha1collisiondetector \ ${PHP_CURRENT}-php-gd \ ${PHP_CURRENT}-php-mysqlnd \ ${PHP_CURRENT}-php-xml \