From 87a8c4ce75d8de3e9beca34f6a0e3fe4117468c6 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 20 Jul 2024 18:04:04 +0200 Subject: [PATCH 1/3] feature branch --- spcd.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index b8d7ed1..47c5c23 100644 --- a/spcd.sh +++ b/spcd.sh @@ -3,6 +3,7 @@ # defaults [ -n "${SPCD_BRANCH_RELEASE}" ] || SPCD_BRANCH_RELEASE="main" [ -n "${SPCD_BRANCH_STAGING}" ] || SPCD_BRANCH_STAGING="dev" +[ -n "${SPCD_BRANCH_FEATURE}" ] || SPCD_BRANCH_FEATURE="f" [ -n "${SPCD_DNS}" ] || SPCD_DNS="\ 9.9.9.9 \ " @@ -129,7 +130,7 @@ spcd_set_environment_variables() { fi # check project variables case "${SPCD_PROJECT_BRANCH}" in - "${SPCD_BRANCH_RELEASE}" | "${SPCD_BRANCH_STAGING}") ;; + "${SPCD_BRANCH_RELEASE}" | "${SPCD_BRANCH_STAGING}" | "${SPCD_BRANCH_FEATURE}") ;; *) spcd_error_ci "SPCD_PROJECT_BRANCH" ;; esac [ -n "${SPCD_PROJECT_ROOT}" ] || spcd_error_ci "SPCD_PROJECT_ROOT" From c5c28e22e245e404bdd7f8ca4d297260edeb64aa Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 20 Jul 2024 18:07:42 +0200 Subject: [PATCH 2/3] readme/branches --- readme.md | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/readme.md b/readme.md index 3c9a4e0..e41602d 100644 --- a/readme.md +++ b/readme.md @@ -39,21 +39,24 @@ from various contexts of CA, CI and OCI / OS. ## How -| Variable | Description | Default | -|:----------------|:------------------------|:--------------------------------| -| SPCD_CA_n | Numbered CA certificate | | -| SPCD_DNS | Space separated servers | 9.9.9.9 | -| SPCD_GIT_MAIN | Main Git repository | spcd | -| SPCD_GIT_ROOT | Root Git repository | rwx | -| SPCD_SSH_HOSTS | domain.tld ssh-type pub | | -| SPCD_SSH_KEY | SSH private key | | -| SPCD_URL_ALMA | Alma repository URL | https://repo.almalinux.org | -| SPCD_URL_ALPINE | Alpine repository URL | https://dl-cdn.alpinelinux.org | -| SPCD_URL_ARCH | Arch repository URL | https://geo.mirror.pkgbuild.com | -| SPCD_URL_DEBIAN | Debian repository URL | https://deb.debian.org | -| SPCD_URL_FEDORA | Fedora repository URL | https://rpmfind.net | -| SPCD_URL_ROCKY | Rocky repository URL | https://dl.rockylinux.org | -| SPCD_URL_UBUNTU | Ubuntu repository URL | https://ubuntu.mirrors.ovh.net | +| Variable | Description | Default | +|:--------------------|:--------------------------|:--------------------------------| +| SPCD_BRANCH_RELEASE | Release deployment branch | main | +| SPCD_BRANCH_STAGING | Staging deployment branch | dev | +| SPCD_BRANCH_FEATURE | Feature deployment branch | f | +| SPCD_CA_n | Numbered CA certificate | | +| SPCD_DNS | Space separated servers | 9.9.9.9 | +| SPCD_GIT_MAIN | Main Git repository | spcd | +| SPCD_GIT_ROOT | Root Git repository | rwx | +| SPCD_SSH_HOSTS | domain.tld ssh-type pub | | +| SPCD_SSH_KEY | SSH private key | | +| SPCD_URL_ALMA | Alma repository URL | https://repo.almalinux.org | +| SPCD_URL_ALPINE | Alpine repository URL | https://dl-cdn.alpinelinux.org | +| SPCD_URL_ARCH | Arch repository URL | https://geo.mirror.pkgbuild.com | +| SPCD_URL_DEBIAN | Debian repository URL | https://deb.debian.org | +| SPCD_URL_FEDORA | Fedora repository URL | https://rpmfind.net | +| SPCD_URL_ROCKY | Rocky repository URL | https://dl.rockylinux.org | +| SPCD_URL_UBUNTU | Ubuntu repository URL | https://ubuntu.mirrors.ovh.net | ## HTTPS & Python From dec6cf211a94dad2b3c0265d0461d4edd24e7ec8 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 20 Jul 2024 19:45:52 +0200 Subject: [PATCH 3/3] */* path --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 47c5c23..f596325 100644 --- a/spcd.sh +++ b/spcd.sh @@ -632,7 +632,7 @@ spcd_install_python_modules() { for spcd_ipm__repository in "${SPCD_GIT_MAIN}" "${SPCD_GIT_ROOT}"; do case "${spcd_ipm__repository}" in http*) spcd_ipm__url="${spcd_ipm__repository}" ;; - /*) spcd_ipm__url="${SPCD_PROJECT_ROOT}${spcd_ipm__repository}" ;; + */*) spcd_ipm__url="${SPCD_PROJECT_ROOT}/${spcd_ipm__repository}" ;; *) spcd_ipm__url="\ ${SPCD_PROJECT_ROOT}/${SPCD_PROJECT_PATH}/${spcd_ipm__repository}" ;; esac