Commit 72fdab4f authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Change of local variables of REGISTRY URL

parent 74e79b92

services/check_services_are_running.sh

+6 −6
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ source $(dirname "$(readlink -f "$0")")/variables.sh 
export CAPIF_PRIV_KEY=

export CAPIF_PRIV_KEY_BASE_64=



running="$(GITLAB_BASE_URL=$GITLAB_BASE_URL OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME docker compose -f docker-compose-vault.yml ps --services --all --filter "status=running")"

services="$(GITLAB_BASE_URL=$GITLAB_BASE_URL OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME docker compose -f docker-compose-vault.yml ps --services --all)"

running="$(REGISTRY_BASE_URL=$REGISTRY_BASE_URL OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME docker compose -f docker-compose-vault.yml ps --services --all --filter "status=running")"

services="$(REGISTRY_BASE_URL=$REGISTRY_BASE_URL OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME docker compose -f docker-compose-vault.yml ps --services --all)"

if [ "$running" != "$services" ]; then

    echo "Following Vault services are not running:"

    # Bash specific
@@ -15,8 +15,8 @@ else 
    echo "All Vault services are running"

fi



running="$(GITLAB_BASE_URL=$GITLAB_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-capif.yml ps --services --all --filter "status=running")"

services="$(GITLAB_BASE_URL=$GITLAB_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-capif.yml ps --services --all)"

running="$(REGISTRY_BASE_URL=$REGISTRY_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-capif.yml ps --services --all --filter "status=running")"

services="$(REGISTRY_BASE_URL=$REGISTRY_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f docker-compose-capif.yml ps --services --all)"

if [ "$running" != "$services" ]; then

    echo "Following CCF services are not running:"

    # Bash specific
@@ -26,8 +26,8 @@ else 
    echo "All CCF services are running"

fi



running="$(GITLAB_BASE_URL=$GITLAB_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 docker-compose-register.yml ps --services --all --filter "status=running")"

services="$(GITLAB_BASE_URL=$GITLAB_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 docker-compose-register.yml ps --services --all)"

running="$(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 docker-compose-register.yml ps --services --all --filter "status=running")"

services="$(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 docker-compose-register.yml ps --services --all)"

if [ "$running" != "$services" ]; then

    echo "Following Register services are not running:"

    # Bash specific

services/clean_capif_docker_services.sh

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ fi 


for FILE in "${FILES[@]}"; do

  echo "Executing 'docker compose down' for file $FILE"

  GITLAB_BASE_URL=$GITLAB_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 DUID=$DUID DGID=$DGID MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$FILE" down $REMOVE_IMAGES

  REGISTRY_BASE_URL=$REGISTRY_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 DUID=$DUID DGID=$DGID MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$FILE" down $REMOVE_IMAGES

  status=$?

    if [ $status -eq 0 ]; then

        echo "*** Removed Service from $FILE ***"

services/docker-compose-capif.yml

+12 −12
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ services: 
      - VAULT_ACCESS_TOKEN=dev-only-token

      - VAULT_PORT=8200

      - LOG_LEVEL=${LOG_LEVEL}

    image: ${GITLAB_BASE_URL}/helper:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/helper:${OCF_VERSION}

    depends_on:

      - nginx
@@ -53,7 +53,7 @@ services: 
      - MONITORING=${MONITORING}

      - LOG_LEVEL=${LOG_LEVEL}

    restart: unless-stopped

    image: ${GITLAB_BASE_URL}/ocf-access-control-policy-api:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/ocf-access-control-policy-api:${OCF_VERSION}

    depends_on:

      - redis

      - nginx
@@ -79,7 +79,7 @@ services: 
      - VAULT_PORT=8200

      - LOG_LEVEL=${LOG_LEVEL}

    restart: unless-stopped

    image: ${GITLAB_BASE_URL}/ocf-api-invoker-management-api:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/ocf-api-invoker-management-api:${OCF_VERSION}

    depends_on:

    - redis

    - nginx
@@ -96,7 +96,7 @@ services: 
      - fluent-bit:host-gateway

      - otel-collector:host-gateway

      - vault:host-gateway

    image: ${GITLAB_BASE_URL}/ocf-api-provider-management-api:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/ocf-api-provider-management-api:${OCF_VERSION}

    environment:

      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}

      - CONTAINER_NAME=api-provider-management
@@ -121,7 +121,7 @@ services: 
      - fluent-bit:host-gateway

      - otel-collector:host-gateway

    restart: unless-stopped

    image: ${GITLAB_BASE_URL}/ocf-auditing-api:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/ocf-auditing-api:${OCF_VERSION}

    environment:

      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}

      - CONTAINER_NAME=api-auditing
@@ -142,7 +142,7 @@ services: 
      - host.docker.internal:host-gateway

      - fluent-bit:host-gateway

      - otel-collector:host-gateway

    image: ${GITLAB_BASE_URL}/ocf-discover-service-api:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/ocf-discover-service-api:${OCF_VERSION}

    environment:

      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}

      - CONTAINER_NAME=services-apis
@@ -158,7 +158,7 @@ services: 
      - "8080"

    volumes:

      - ${SERVICES_DIR}/TS29222_CAPIF_Events_API:/usr/src/app

    image: ${GITLAB_BASE_URL}/ocf-events-api:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/ocf-events-api:${OCF_VERSION}

    environment:

      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}

      - CONTAINER_NAME=api-events
@@ -181,7 +181,7 @@ services: 
    volumes:

      - ${SERVICES_DIR}/TS29222_CAPIF_Logging_API_Invocation_API:/usr/src/app

    restart: unless-stopped

    image: ${GITLAB_BASE_URL}/ocf-logging-api-invocation-api:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/ocf-logging-api-invocation-api:${OCF_VERSION}

    extra_hosts:

      - host.docker.internal:host-gateway

      - fluent-bit:host-gateway
@@ -202,7 +202,7 @@ services: 
    volumes:

      - ${SERVICES_DIR}/TS29222_CAPIF_Publish_Service_API:/usr/src/app

    restart: unless-stopped

    image: ${GITLAB_BASE_URL}/ocf-publish-service-api:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/ocf-publish-service-api:${OCF_VERSION}

    extra_hosts:

      - host.docker.internal:host-gateway

      - fluent-bit:host-gateway
@@ -221,7 +221,7 @@ services: 
      context: ${SERVICES_DIR}/TS29222_CAPIF_Routing_Info_API

    expose:

      - "8080"

    image: ${GITLAB_BASE_URL}/ocf-routing-info-api:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/ocf-routing-info-api:${OCF_VERSION}



  capif-security:

    build:
@@ -231,7 +231,7 @@ services: 
    volumes:

      - ${SERVICES_DIR}/TS29222_CAPIF_Security_API:/usr/src/app

    restart: unless-stopped

    image: ${GITLAB_BASE_URL}/ocf-security-api:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/ocf-security-api:${OCF_VERSION}

    environment:

      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}

      - CONTAINER_NAME=api-security
@@ -282,7 +282,7 @@ services: 
    ports:

      - "8080:8080"

      - "443:443"

    image: ${GITLAB_BASE_URL}/nginx:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/nginx:${OCF_VERSION}

    environment:

      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}

      - VAULT_HOSTNAME=vault

services/docker-compose-mock-server.yml

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ services: 
    environment:

      - DEBUG_MODE=True

    restart: unless-stopped

    image: ${GITLAB_BASE_URL}/mock-server:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/mock-server:${OCF_VERSION}



networks:

  default:

services/docker-compose-register.yml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ services: 
      - host.docker.internal:host-gateway

      - vault:host-gateway

    restart: unless-stopped

    image: ${GITLAB_BASE_URL}/register:${OCF_VERSION}

    image: ${REGISTRY_BASE_URL}/register:${OCF_VERSION}

    depends_on:

       - mongo_register