From 5ac8684a971f230c7d30bbf5b62a79f4cce0c020 Mon Sep 17 00:00:00 2001 From: Soufiane Jounaid Date: Mon, 1 Apr 2024 18:03:12 -0400 Subject: [PATCH] added edgehwdiscovery service deployment code --- .env.sample | 16 +++++++++++++--- docker-compose.yml | 3 +-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.env.sample b/.env.sample index f0e4df33..1c64df27 100644 --- a/.env.sample +++ b/.env.sample @@ -1,9 +1,9 @@ # Chameleon Environment Variables -# +# # This file is used by docker-compose to set and pass # environment variables into the container(s) that make # up the chameleon portal deployment. -# +# # Make a copy of this file called '.env' and # fill in the appropriate values below. @@ -14,6 +14,7 @@ NODE_VER=lts PORTAL_PORT=8888 DOCKER_REGISTRY=docker.chameleoncloud.org DOCKER_IMAGE_LATEST=docker.chameleoncloud.org/portal:latest +EDGEHWDISCOVERY_TAG=ghcr.io/chameleoncloud/edge-hw-discovery:latest DJANGO_LOG_LEVEL="DEBUG" DJANGO_SQL_LEVEL="INFO" DJANGO_LOG_VERBOSITY="SHORT" #SHORT/VERBOSE @@ -97,4 +98,13 @@ LOGOUT_REDIRECT_URL=https://auth.dev.chameleoncloud.org/auth/realms/chameleon/pr # Publication APIs SEMANTIC_SCHOLAR_API_KEY= -SCRAPER_API_KEY= \ No newline at end of file +SCRAPER_API_KEY= + +# Edge HW discovery app credential +EDGE_OS_AUTH_TYPE=v3applicationcredential +EDGE_OS_AUTH_URL=https://chi.edge.chameleoncloud.org:5000/v3 +EDGE_OS_IDENTITY_API_VERSION=3 +EDGE_OS_REGION_NAME="CHI@Edge" +EDGE_OS_INTERFACE=public +EDGE_OS_APPLICATION_CREDENTIAL_ID= +EDGE_OS_APPLICATION_CREDENTIAL_SECRET= \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0a6c92c9..e8b29391 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -64,9 +64,8 @@ services: depends_on: - mysql - redis - restart: always vue: - image: node:lts + image: node:16.20.2 command: sh -c 'yarn && yarn serve' working_dir: /project volumes: