diff --git a/.devcontainer/README.md b/.devcontainer/README.md index f28e0c72e6143f03e9e87eaba4ebbaf034adccf1..a1f130e4ab85497b48f605931715e3da79b4dec8 100644 --- a/.devcontainer/README.md +++ b/.devcontainer/README.md @@ -6,5 +6,4 @@ The *library-script* folder contains all the scripts needed for the build of the * *build-install-openresty.sh* configures, builds and installs openresty as a check to see if everything is ok The *assets* folder contains all the scripts copied inside the container that could be used for the development: - * *build-install-openresty-voms.sh* configures, builds and installs openresty-voms - * *install-build-deps.sh* is used by the CI to install the packages for the deployment environment + * *build-install-openresty-voms.sh* configures, builds and installs openresty-voms \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 484e7319fd1b351472d55ef831d17599249e4f9e..47b2078f9e1401b9ffb094d7885c0c68e72ebcd7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ build-rpm: image: centos:7 script: - env | sort - - sh .devcontainer/assets/install-build-deps.sh + - sh docker/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 diff --git a/.devcontainer/assets/install-build-deps.sh b/docker/assets/install-build-deps.sh similarity index 100% rename from .devcontainer/assets/install-build-deps.sh rename to docker/assets/install-build-deps.sh