diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f404471a01e31802dacfdf20fdec2e9e5651a8ff..2493973572dcee2c8a50ff668572d6c7d3ba7f0e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ build-ngx-httpg-rpm: script: - env | sort - sh docker/library-scripts/provide-deps.sh + - pwd && echo ${CI_PROJECT_DIR} - sh rpm/build-httpg-nginx-rpm.sh - mkdir ngx-artifacts - cp rpmbuild/SRPMS/* ngx-artifacts/ diff --git a/rpm/build-httpg-nginx-rpm.sh b/rpm/build-httpg-nginx-rpm.sh index 6377d94aea9727390de68ebb70f40404c19d5dac..db0d69bf10230d4281eff5e19b3288b5b242da7c 100644 --- a/rpm/build-httpg-nginx-rpm.sh +++ b/rpm/build-httpg-nginx-rpm.sh @@ -19,8 +19,8 @@ wget http://nginx.org/packages/centos/7/SRPMS/nginx-$ngxVersion-1.el7.ngx.src.rp rpm2cpio nginx-$ngxVersion-1.el7.ngx.src.rpm | cpio -idm # set the nginx spec file with the httpg patch -cp ~/nginx-httpg_no_delegation.patch ${HOME}/rpmbuild/SOURCES/ -cp ~/rpm/nginx.spec ~/rpmbuild/SPECS +cp ${CI_PROJECT_DIR}/nginx-httpg_no_delegation.patch ${HOME}/rpmbuild/SOURCES/ +cp ${CI_PROJECT_DIR}/rpm/nginx.spec ~/rpmbuild/SPECS # build rpm rpmlint ~/rpmbuild/SPECS/nginx.spec diff --git a/rpm/build-voms-rpm.sh b/rpm/build-voms-rpm.sh index 28d91726362087e10a906cba33c17172b7e478e8..7023ece14e8957704a1c7a9ccf545472c9109297 100644 --- a/rpm/build-voms-rpm.sh +++ b/rpm/build-voms-rpm.sh @@ -21,10 +21,10 @@ tar xzf ngx-http-echo-module.tar.gz # set voms modules sources mkdir ngx-http-voms-module -cp ~/config ngx-http-voms-module/ -cp ~/config.make ngx-http-voms-module/ -cp -r ~/src ngx-http-voms-module/ -cp ~/rpm/nginx-module-http-voms.spec ~/rpmbuild/SPECS +cp ${CI_PROJECT_DIR}/config ngx-http-voms-module/ +cp ${CI_PROJECT_DIR}/config.make ngx-http-voms-module/ +cp -r ${CI_PROJECT_DIR}/src ngx-http-voms-module/ +cp ${CI_PROJECT_DIR}/rpm/nginx-module-http-voms.spec ~/rpmbuild/SPECS # build and install rpm rpmlint ~/rpmbuild/SPECS/nginx-module-http-voms.spec