Commit 2152e0c1 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Minor adjustments on local scripts

parent e9b1c334

services/docker-compose-capif.yml

+10 −10
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ services: 
      - MONITORING=${MONITORING}

      - LOG_LEVEL=${LOG_LEVEL}

    restart: unless-stopped

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

    image: ${GITLAB_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}/api-invoker-management-api:${OCF_VERSION}

    image: ${GITLAB_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}/api-provider-management-api:${OCF_VERSION}

    image: ${GITLAB_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}/auditing-api:${OCF_VERSION}

    image: ${GITLAB_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}/discover-service-api:${OCF_VERSION}

    image: ${GITLAB_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}/events-api:${OCF_VERSION}

    image: ${GITLAB_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}/api-invocation-logs-api:${OCF_VERSION}

    image: ${GITLAB_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}/publish-service-api:${OCF_VERSION}

    image: ${GITLAB_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}/routing-info-api:${OCF_VERSION}

    image: ${GITLAB_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}/security-api:${OCF_VERSION}

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

    environment:

      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}

      - CONTAINER_NAME=api-security

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: ${GITLAB_BASE_URL}/mock-server:${OCF_VERSION}



networks:

  default:

services/docker-compose-vault.yml

+2 −0
Original line number Diff line number Diff line 
services:

  vault:

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

    build:

      context: ${SERVICES_DIR}/vault

    restart: unless-stopped
@@ -14,3 +15,4 @@ services: 
    volumes:

      - ${SERVICES_DIR}/vault/data:/vault/data

      - ${SERVICES_DIR}/vault/config:/vault/config

      - ${SERVICES_DIR}/vault/vault_prepare_certs.sh:/vault_prepare_certs.sh

services/run.sh

+10 −10
Original line number Diff line number Diff line
@@ -80,18 +80,19 @@ done 


echo Nginx hostname will be $CAPIF_HOSTNAME, deploy $DEPLOY, monitoring $MONITORING_STATE



if [ "$BUILD_DOCKER_IMAGES" == "false" ] ; then

    echo '***Building Docker images set as false***'

    NO_BUILD="--no-build"

if [ "$BUILD_DOCKER_IMAGES" == "true" ] ; then

    echo '***Building Docker images set as true***'

    BUILD="--build"

else

    NO_BUILD=""

  echo '***Building Docker images set as false***'

    BUILD="--no-build"

fi



# Deploy Monitoring stack

if [ "$MONITORING_STATE" == "true" ] ; then

    echo '***Monitoring set as true***'

    echo '***Creating Monitoring stack***'

    DUID=$DUID DGID=$DGID docker compose -f "$SERVICES_DIR/monitoring/docker-compose.yml" up --detach --build $CACHED_INFO $NO_BUILD

    DUID=$DUID DGID=$DGID docker compose -f "$SERVICES_DIR/monitoring/docker-compose.yml" up --detach $BUILD $CACHED_INFO



    status=$?

    if [ $status -eq 0 ]; then
@@ -105,7 +106,7 @@ fi 
docker network create capif-network



# Deploy Vault service

GITLAB_BASE_URL=$GITLAB_BASE_URL OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME docker compose -f "$SERVICES_DIR/docker-compose-vault.yml" up --detach --build $CACHED_INFO $NO_BUILD

GITLAB_BASE_URL=$GITLAB_BASE_URL OCF_VERSION=$OCF_VERSION CAPIF_HOSTNAME=$CAPIF_HOSTNAME docker compose -f "$SERVICES_DIR/docker-compose-vault.yml" up --detach $BUILD $CACHED_INFO



status=$?

if [ $status -eq 0 ]; then
@@ -116,7 +117,7 @@ else 
fi



# Deploy Capif 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 "$SERVICES_DIR/docker-compose-capif.yml" up --detach --build $CACHED_INFO $NO_BUILD

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 "$SERVICES_DIR/docker-compose-capif.yml" up --detach $BUILD $CACHED_INFO



status=$?

if [ $status -eq 0 ]; then
@@ -126,7 +127,6 @@ else 
    exit $status

fi





# Path to the register config.yaml file

REGISTER_CONFIG_FILE="$SERVICES_DIR/register/config.yaml"

# Backup Original config.yaml file
@@ -139,7 +139,7 @@ yq eval ".ccf.url = \"$CAPIF_HOSTNAME\"" -i "$REGISTER_CONFIG_FILE" 


# Deploy Register service

CAPIF_PRIV_KEY_BASE_64=$(echo "$(cat ${SERVICES_DIR}/nginx/certs/server.key)")

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 "$SERVICES_DIR/docker-compose-register.yml" up --detach --build $CACHED_INFO $NO_BUILD

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 "$SERVICES_DIR/docker-compose-register.yml" up --detach $BUILD $CACHED_INFO



status=$?

if [ $status -eq 0 ]; then
@@ -154,7 +154,7 @@ if [ "$ROBOT_MOCK_SERVER" == "true" ] ; then 
    echo '***Robot Mock Server set as true***'

    echo '***Creating Robot Mock Server stack***'



    GITLAB_BASE_URL=$GITLAB_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION IP=$MOCK_SERVER_IP PORT=$MOCK_SERVER_PORT docker compose -f "$SERVICES_DIR/docker-compose-mock-server.yml" up --detach --build $CACHED_INFO $NO_BUILD

    GITLAB_BASE_URL=$GITLAB_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION IP=$MOCK_SERVER_IP PORT=$MOCK_SERVER_PORT docker compose -f "$SERVICES_DIR/docker-compose-mock-server.yml" up --detach $BUILD $CACHED_INFO

    status=$?

    if [ $status -eq 0 ]; then

        echo "*** Mock Server Runing ***"

services/variables.sh

+3 −3
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ export RESULT_FOLDER=$CAPIF_BASE_DIR/results 
export ROBOT_DOCKER_FILE_FOLDER=$CAPIF_BASE_DIR/tools/robot



# Image URL and version

export GITLAB_BASE_URL="labs.etsi.org:5050/ocf/capif/staging"

export OCF_VERSION="v2.x.x-release"

export GITLAB_BASE_URL="labs.etsi.org:5050/ocf/capif/prod"

export OCF_VERSION="v2.0.0-release"



# Capif hostname

export CAPIF_HOSTNAME=capifcore
@@ -30,7 +30,7 @@ export MONITORING_STATE=false 
export DEPLOY=all

export LOG_LEVEL=DEBUG

export CACHED_INFO=""

export BUILD_DOCKER_IMAGES=true

export BUILD_DOCKER_IMAGES=false



# Needed to avoid write permissions on bind volumes with prometheus and grafana

export DUID=$(id -u)