From f036c47baaabbcdf7702ba75a32aa90226f594c3 Mon Sep 17 00:00:00 2001 From: guillecxb Date: Thu, 23 Oct 2025 12:23:57 +0200 Subject: [PATCH] add regisgter hostname for certificate and deployment --- services/docker-compose-register.yml | 3 +++ services/register/register_prepare.sh | 2 +- services/run.sh | 8 ++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/services/docker-compose-register.yml b/services/docker-compose-register.yml index 4abed673..66607e55 100644 --- a/services/docker-compose-register.yml +++ b/services/docker-compose-register.yml @@ -1,5 +1,7 @@ services: register: + hostname: ${CAPIF_REGISTER} + container_name: ${CAPIF_REGISTER} build: context: ${SERVICES_DIR}/register ports: @@ -14,6 +16,7 @@ services: - LOG_LEVEL=${LOG_LEVEL} - TIMEOUT=10 - CAPIF_HOSTNAME=${CAPIF_HOSTNAME} + - REGISTER_HOSTNAME=${CAPIF_REGISTER} extra_hosts: - host.docker.internal:host-gateway - vault:host-gateway diff --git a/services/register/register_prepare.sh b/services/register/register_prepare.sh index 2ae8deff..7cc7b376 100644 --- a/services/register/register_prepare.sh +++ b/services/register/register_prepare.sh @@ -17,7 +17,7 @@ STATE="Madrid" # state or province name LOCALITY="Madrid" # Locality Name (e.g. city) ORGNAME="Telefonica I+D" # Organization Name (eg, company) ORGUNIT="Innovation" # Organizational Unit Name (eg. section) -COMMONNAME="register" +COMMONNAME=${REGISTER_HOSTNAME:-register} EMAIL="inno@tid.es" # certificate's email address # optional extra details CHALLENGE="" # challenge password diff --git a/services/run.sh b/services/run.sh index 9f2983bb..5acc9afe 100755 --- a/services/run.sh +++ b/services/run.sh @@ -4,6 +4,7 @@ source $(dirname "$(readlink -f "$0")")/variables.sh help() { echo "Usage: $1 " echo " -c : Setup different hostname for capif" + echo " -R : Setup different hostname for register service" echo " -s : Run Mock server. Default true" echo " -m : Run monitoring service" echo " -l : Set Log Level (default DEBUG). Select one of: [CRITICAL, FATAL, ERROR, WARNING, WARN, INFO, DEBUG, NOTSET]" @@ -40,6 +41,9 @@ while getopts ":c:l:ms:hrv:f:g:b:" opt; do c) CAPIF_HOSTNAME="$OPTARG" ;; + R) + CAPIF_REGISTER="$OPTARG" + ;; m) MONITORING_STATE=true ;; @@ -78,7 +82,7 @@ while getopts ":c:l:ms:hrv:f:g:b:" opt; do esac done -echo Nginx hostname will be $CAPIF_HOSTNAME, deploy $DEPLOY, monitoring $MONITORING_STATE +echo Nginx hostname will be $CAPIF_HOSTNAME, Register Hostname $CAPIF_REGISTER, deploy $DEPLOY, monitoring $MONITORING_STATE if [ "$BUILD_DOCKER_IMAGES" == "true" ] ; then echo '***Building Docker images set as true***' @@ -139,7 +143,7 @@ yq eval ".ccf.url = \"$CAPIF_HOSTNAME\"" -i "$REGISTER_CONFIG_FILE" -P # Deploy Register service CAPIF_PRIV_KEY_BASE_64=$(echo "$(cat ${SERVICES_DIR}/nginx/certs/server.key)") -REGISTRY_BASE_URL=$REGISTRY_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-register.yml" up --detach $BUILD $CACHED_INFO +REGISTRY_BASE_URL=$REGISTRY_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL CAPIF_REGISTER=$CAPIF_REGISTER docker compose -f "$SERVICES_DIR/docker-compose-register.yml" up --detach $BUILD $CACHED_INFO status=$? if [ $status -eq 0 ]; then -- GitLab