From 13ee3ecca3613b9bea287baf0430e19d515a86a4 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Wed, 5 Sep 2018 15:16:45 +0530 Subject: OCLIP: Enable docker compose for grpc Issue-ID: CLI-123 Change-Id: I12e0fe1406f02c7418ba3331f5bc1adb96ffec97 Signed-off-by: Kanagaraj Manickam k00365106 --- deployment/docker/src/main/docker/Dockerfile | 2 +- .../docker/src/main/docker/docker-compose.yaml | 49 +++++++++++++++++++--- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile index 54f296bc..21630d17 100644 --- a/deployment/docker/src/main/docker/Dockerfile +++ b/deployment/docker/src/main/docker/Dockerfile @@ -20,7 +20,7 @@ ENV OPEN_CLI_HOME=/opt/oclip \ OPEN_CLI_MODE=shell \ OPEN_CLI_PRODUCT_IN_USE=onap-beijing \ GOTTY_TITLE_FORMAT="{{ .command }}" \ - OCLIP_GRPC_SERVER="http://oclip_grpc:50051" + OCLIP_GRPC_SERVER="http://oclip_ocs_grpc:50051" ADD ./STAGE $OPEN_CLI_HOME WORKDIR $OPEN_CLI_HOME diff --git a/deployment/docker/src/main/docker/docker-compose.yaml b/deployment/docker/src/main/docker/docker-compose.yaml index f7b6127d..3104f97f 100644 --- a/deployment/docker/src/main/docker/docker-compose.yaml +++ b/deployment/docker/src/main/docker/docker-compose.yaml @@ -23,18 +23,57 @@ services: - "21:21" - 30000-30009:30000-30009 - oclip_cli: +#OCLIP Web Command Center + oclip_ocs_web: stdin_open: true tty: true image: onap/cli environment: - OPEN_CLI_MODE: 'daemon' + OPEN_CLI_MODE: 'ocs-web' OPEN_CLI_DEBUG: 'false' volumes: - /var/run/docker.sock:/var/run/docker.sock ports: - - 30260:80 - - 30261:8080 - - 5005:5005 + - 8080:80 + - 50050:5005 +#OCLIP Command Console server + oclip_occ: + stdin_open: true + tty: true + image: onap/cli + environment: + OPEN_CLI_MODE: 'occ' + OPEN_CLI_DEBUG: 'false' + volumes: + - /var/run/docker.sock:/var/run/docker.sock + ports: + - 8081:8080 + - 50051:5005 +#OCLIP gRPC server + oclip_ocs_grpc: + stdin_open: true + tty: true + image: onap/cli + environment: + OPEN_CLI_MODE: 'ocs-grpc' + OPEN_CLI_DEBUG: 'false' + volumes: + - /var/run/docker.sock:/var/run/docker.sock + ports: + - 8082:50051 + - 50052:5005 + +#Remote OCLIP CLI and OCLIP CLI + oclip_cli: + stdin_open: true + tty: true + image: onap/cli + environment: + OPEN_CLI_MODE: 'console' + OPEN_CLI_DEBUG: 'false' + volumes: + - /var/run/docker.sock:/var/run/docker.sock + ports: + - 5005:5005 -- cgit 1.2.3-korg