diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94cd3af36ca99d7e8267a5804b6764e0ae9b4ad0..484e7319fd1b351472d55ef831d17599249e4f9e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,3 @@ -image: ${CI_REGISTRY}/storm2/build/ngx-voms-build:issue-17-latest -#image: storm2/ngx-voms-build:latest stages: - build @@ -8,8 +6,11 @@ stages: build-rpm: stage: build + image: centos:7 script: - env | sort + - sh .devcontainer/assets/install-build-deps.sh + - yum install -y rpm-build redhat-rpm-config rpmdevtools - cd rpm && sh make_packaging.sh ${CI_PROJECT_DIR} && cd .. - mv ${HOME}/rpmbuild ./rpmbuild artifacts: diff --git a/rpm/make_packaging.sh b/rpm/make_packaging.sh index 8e74c00c9a30a131747fd8d26e48f73c832cb9b9..97537e98402306ceee491a0a051721224909a752 100644 --- a/rpm/make_packaging.sh +++ b/rpm/make_packaging.sh @@ -10,9 +10,6 @@ if [ ! -d "$voms_module_prefix" ]; then exit 1 fi -# install rpm build tools: -sudo yum install -y rpm-build redhat-rpm-config rpmdevtools - mkdir -p ${HOME}/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} cat <<EOF > ${HOME}/.rpmmacros %_topdir %{getenv:HOME}/rpmbuild @@ -21,7 +18,7 @@ EOF cat ${HOME}/.rpmmacros -cp ${HOME}/nginx-httpg_no_delegation.patch ${HOME}/rpmbuild/SOURCES/ +cp ${voms_module_prefix}/nginx-httpg_no_delegation.patch ${HOME}/rpmbuild/SOURCES/ cp SOURCES/* ${HOME}/rpmbuild/SOURCES/ cp SPECS/*.spec ${HOME}/rpmbuild/SPECS/