From ce8b481c87b090af7f00a054fa2b66e4c3969882 Mon Sep 17 00:00:00 2001
From: lcappelli <laura.cappelli@cnaf.infn.it>
Date: Fri, 13 May 2022 13:24:32 +0000
Subject: [PATCH] Move install-build-deps.sh
This script is used during the CI.
It is moved from .devocontainer to docker folder, probably this is not the correct place.
---
.devcontainer/README.md | 3 +--
.gitlab-ci.yml | 2 +-
{.devcontainer => docker}/assets/install-build-deps.sh | 0
3 files changed, 2 insertions(+), 3 deletions(-)
rename {.devcontainer => docker}/assets/install-build-deps.sh (100%)
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index f28e0c7..a1f130e 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 484e731..47b2078 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
--
GitLab