diff --git a/Makefile b/Makefile index 91e1575..0404c16 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,9 @@ $(eval GIT_DESCRIBE = $(shell sh -c "git describe")) OUTPUT_DIR = ${CURDIR} -rpm: +prepare: + cd flexiapi && composer install --no-dev + +rpm-only: rm -rf $(OUTPUT_DIR)/flexisip-account-manager mkdir $(OUTPUT_DIR)/flexisip-account-manager mkdir -p $(OUTPUT_DIR)/rpmbuild/SPECS @@ -8,6 +11,7 @@ rpm: cp -R --parents src/**/*.php $(OUTPUT_DIR)/flexisip-account-manager/ cp -R --parents src/api/**/*.php $(OUTPUT_DIR)/flexisip-account-manager/ cp -R --parents conf/*.conf $(OUTPUT_DIR)/flexisip-account-manager/ + cp -R --parents flexiapi/**/* $(OUTPUT_DIR)/flexisip-account-manager/ cp README.md $(OUTPUT_DIR)/flexisip-account-manager/ cp -R httpd/ $(OUTPUT_DIR)/flexisip-account-manager/ cp flexisip-account-manager.spec $(OUTPUT_DIR)/rpmbuild/SPECS/ @@ -16,4 +20,6 @@ rpm: rpmbuild -v -bb --define '_topdir $(OUTPUT_DIR)/rpmbuild' --define "_rpmdir $(OUTPUT_DIR)/rpmbuild" $(OUTPUT_DIR)/rpmbuild/SPECS/flexisip-account-manager.spec rm -rf $(OUTPUT_DIR)/flexisip-account-manager +rpm: prepare rpm-only + .PHONY: rpm diff --git a/README.md b/README.md index 3ed09e1..d8c978f 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,16 @@ Finally start composer: `cd /opt/belledonne-communications/share/flexisip-account-manager/ && composer install` -### 6. Miscellaneous +### 6. Packaging +-------------------- +To build a rpm package on centos7: +make rpm +To build a rpm package with docker: +docker run -v $PWD:/home/bc -it gitlab.linphone.org:4567/bc/public/flexisip-account-manager/bc-dev-centos:7 make rpm +The flexisip-account-manager rpm package can be found in rpmbuild/RPMS/x86_64/bc-flexisip-account-manager*.rpm +Installation requires package centos-release-scl-rh to be installed for php7.1 + +### 7. Miscellaneous -------------------- - For remote provisioning create a `default.rc` file in `/opt/belledonne-communications/` and set the values you want diff --git a/README.packaging.md b/README.packaging.md deleted file mode 100644 index 1032ca9..0000000 --- a/README.packaging.md +++ /dev/null @@ -1,16 +0,0 @@ -PHP Authenticated Lime server -============================== - -Packaging ---------- - -To build a rpm package on centos7: - -`make rpm` - -To build a rpm package with docker: - -`docker run -v $PWD:/home/bc -it gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 make` - -The lime-server rpm package can be found in rpmbuild/RPMS/x86_64/bc-lime-server*.rpm -Installation requires package centos-release-scl-rh to be installed for php7.1 diff --git a/docker/build-image.docker b/docker/build-image.docker new file mode 100644 index 0000000..03cf8f2 --- /dev/null +++ b/docker/build-image.docker @@ -0,0 +1,10 @@ +FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 +USER root + +# Install dependencies +RUN yum -y install centos-release-scl.noarch +RUN yum -y install composer.noarch rh-php73 rh-php73-php-mbstring +RUN mkdir -p /usr/local/bin +RUN echo -e "#!/usr/bin/bash\nsource scl_source enable rh-php73\nexec \"\$@\"\n" >> /usr/local/bin/entry-point.sh +RUN chmod a+x /usr/local/bin/entry-point.sh +ENTRYPOINT ["/usr/local/bin/entry-point.sh"] diff --git a/docker/test-image.docker b/docker/test-image.docker new file mode 100644 index 0000000..2eb2e9a --- /dev/null +++ b/docker/test-image.docker @@ -0,0 +1,17 @@ +FROM centos/httpd-24-centos7 +MAINTAINER Jehan Monnier + +USER root + +# Install dependencies +RUN yum -y install epel-release +COPY rpmbuild/x86_64/bc-flexisip-account-manager-*.rpm / +# Install lime-server +RUN yum -y localinstall /bc-flexisip-account-manager-*.rpm +#bc-flexisip-account-manager + +# Apache configuration +# account manager is reachable on port 8082 +#RUN sed -i 's/8080/8082/g' /opt/rh/httpd24/root/etc/httpd/conf/httpd.conf +# do not mess with ssl server from other containers +#RUN sed -i 's/8443/9443/g' /opt/rh/httpd24/root/etc/httpd/conf.d/ssl.conf diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec index f74286a..fca01d6 100644 --- a/flexisip-account-manager.spec +++ b/flexisip-account-manager.spec @@ -26,7 +26,7 @@ Source0: flexisip-account-manager.tar.gz #BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot # dependencies -Requires: rh-php71-php rh-php71-php-xmlrpc rh-php71-php-pdo rh-php71-php-mysqlnd rh-php71-php-mbstring +Requires: rh-php73-php rh-php73-php-xmlrpc rh-php73-php-pdo rh-php73-php-mysqlnd rh-php73-php-mbstring %description PHP server for Linphone and Flexisip providing module for account creation. @@ -39,6 +39,8 @@ PHP server for Linphone and Flexisip providing module for account creation. rm -rf "$RPM_BUILD_ROOT" mkdir -p "$RPM_BUILD_ROOT/opt/belledonne-communications/share/flexisip-account-manager" cp -R src/* "$RPM_BUILD_ROOT/opt/belledonne-communications/share/flexisip-account-manager/" +mkdir -p "$RPM_BUILD_ROOT/opt/belledonne-communications/share/flexisip-account-manager/flexiapi" +cp -R flexiapi/* "$RPM_BUILD_ROOT/opt/belledonne-communications/share/flexisip-account-manager/flexiapi" cp README* "$RPM_BUILD_ROOT/opt/belledonne-communications/share/flexisip-account-manager/" mkdir -p "$RPM_BUILD_ROOT/etc/flexisip-account-manager" cp -R conf/* "$RPM_BUILD_ROOT/etc/flexisip-account-manager/" @@ -57,6 +59,7 @@ fi %files +/opt/belledonne-communications/share/flexisip-account-manager/flexiapi/**/* /opt/belledonne-communications/share/flexisip-account-manager/api/account/*.php /opt/belledonne-communications/share/flexisip-account-manager/config/*.php /opt/belledonne-communications/share/flexisip-account-manager/database/*.php