Fix FLEXIAPI-382 Package for Rocky 10

This commit is contained in:
Timothée Jaussoin 2025-09-08 16:53:32 +02:00
parent 5f22c8c862
commit 6770e198d9
7 changed files with 34 additions and 1 deletions

View file

@ -14,6 +14,14 @@ rocky9-deploy:
- rocky9-package - rocky9-package
- rocky9-test - rocky9-test
rocky10-deploy:
extends: .deploy
script:
- ./deploy_packages.sh rockylinux 10
needs:
- rocky10-package
- rocky10-test
debian12-deploy: debian12-deploy:
extends: .deploy extends: .deploy
script: script:

View file

@ -14,6 +14,14 @@ rocky9-package:
script: script:
- make package-el9 - make package-el9
rocky10-package:
needs:
- prepare-package
extends: .package
image: gitlab.linphone.org:4567/bc/public/docker/rocky10-php:$ROCKY_10_IMAGE_VERSION
script:
- make package-el10
debian12-package: debian12-package:
needs: needs:
- prepare-package - prepare-package

View file

@ -10,6 +10,12 @@ rocky9-test:
needs: needs:
- rocky9-package - rocky9-package
rocky10-test:
extends: .rocky-test
image: gitlab.linphone.org:4567/bc/public/docker/rocky10-php:$ROCKY_10_IMAGE_VERSION
needs:
- rocky10-package
.rocky-test: .rocky-test:
extends: .test extends: .test
script: script:

View file

@ -1,6 +1,7 @@
variables: variables:
ROCKY_8_IMAGE_VERSION: 20250702_171834_update_rocky8_dockerhub ROCKY_8_IMAGE_VERSION: 20250702_171834_update_rocky8_dockerhub
ROCKY_9_IMAGE_VERSION: 20250702_171314_update_rocky9_dockerhub ROCKY_9_IMAGE_VERSION: 20250702_171314_update_rocky9_dockerhub
ROCKY_10_IMAGE_VERSION: 20250908_164454_rocky10_first
DEBIAN_12_IMAGE_VERSION: 20250908_154742_refresh_dependencies DEBIAN_12_IMAGE_VERSION: 20250908_154742_refresh_dependencies
DEBIAN_13_IMAGE_VERSION: 20250908_114350_debian13_first_push DEBIAN_13_IMAGE_VERSION: 20250908_114350_debian13_first_push
PHP_REDIS_REMI_VERSION: php-pecl-redis6-6.1.0-1 PHP_REDIS_REMI_VERSION: php-pecl-redis6-6.1.0-1

View file

@ -12,6 +12,7 @@ v2.1
- Fix FLEXIAPI-377 Don't reset authInfoIndex in the Provisioning - Fix FLEXIAPI-377 Don't reset authInfoIndex in the Provisioning
- Fix FLEXIAPI-380 Fix CardDav documentation - Fix FLEXIAPI-380 Fix CardDav documentation
- Fix FLEXIAPI-381 Remove Remi in the Rocky9 pipeline - Fix FLEXIAPI-381 Remove Remi in the Rocky9 pipeline
- Fix FLEXIAPI-382 Package for Rocky 10
v2.0 v2.0
---- ----

View file

@ -24,7 +24,7 @@ FlexiAPI is packaged for Debian and RedHat, you can setup those repositories usi
The `artisan` script is in the root directory of where the application is setup, with packages its often `/opt/belledonne-communications/share/flexisip-account-manager/flexiapi/`. The `artisan` script is in the root directory of where the application is setup, with packages its often `/opt/belledonne-communications/share/flexisip-account-manager/flexiapi/`.
⚠️ If you want to enable JWT authentication the php-sodium dependency is required, on Rockylinux it is only available in the Remi repository in some cases. You can install it with the following step: ⚠️ If you want to enable JWT authentication the php-sodium dependency is required, on Rockylinux it is only available in the Remi repository in some cases. You can install it with the following steps:
dnf -y install https://rpms.remirepo.net/enterprise/remi-release-{rockylinux-release}.rpm dnf -y install https://rpms.remirepo.net/enterprise/remi-release-{rockylinux-release}.rpm
dnf -y module reset php dnf -y module reset php

View file

@ -68,6 +68,11 @@ rpm-el9-only:
rpmbuild --quiet -bb --define 'dist .el9' --define '_topdir $(OUTPUT_DIR)/rpmbuild' --define "_rpmdir $(OUTPUT_DIR)/rpmbuild" $(OUTPUT_DIR)/rpmbuild/SPECS/flexisip-account-manager.spec rpmbuild --quiet -bb --define 'dist .el9' --define '_topdir $(OUTPUT_DIR)/rpmbuild' --define "_rpmdir $(OUTPUT_DIR)/rpmbuild" $(OUTPUT_DIR)/rpmbuild/SPECS/flexisip-account-manager.spec
@echo "📦✅ RPM el9 Package Created" @echo "📦✅ RPM el9 Package Created"
rpm-el10-only:
mkdir -p build
rpmbuild --quiet -bb --define 'dist .el10' --define '_topdir $(OUTPUT_DIR)/rpmbuild' --define "_rpmdir $(OUTPUT_DIR)/rpmbuild" $(OUTPUT_DIR)/rpmbuild/SPECS/flexisip-account-manager.spec
@echo "📦✅ RPM el10 Package Created"
rpm-cleanup: rpm-cleanup:
@echo "🧹 Cleanup" @echo "🧹 Cleanup"
mv rpmbuild/*/*.rpm build/. mv rpmbuild/*/*.rpm build/.
@ -101,6 +106,10 @@ package-el9: rpm-el9-only rpm-cleanup cleanup-package-semvers package-end-common
rpm-el9: prepare-common package-el9 rpm-el9: prepare-common package-el9
rpm-el9-dev: prepare-dev package-semvers package-common package-el9 rpm-el9-dev: prepare-dev package-semvers package-common package-el9
package-el10: rpm-el10-only rpm-cleanup cleanup-package-semvers package-end-common
rpm-el10: prepare-common package-el10
rpm-el10-dev: prepare-dev package-semvers package-common package-el10
package-deb: deb-only cleanup-package-semvers package-end-common package-deb: deb-only cleanup-package-semvers package-end-common
deb: prepare-common package-deb deb: prepare-common package-deb
deb-dev: prepare-dev package-semvers package-common package-deb deb-dev: prepare-dev package-semvers package-common package-deb