Commit 309662d1 authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

refactor ubitech private repo

parent edbf32a2

.gitlab-ci.yml

+3 −8
Changes for .gitlab-ci.yml: 3 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -5,18 +5,15 @@ stages: 
  - release

  - image_build







variables:

  DOCKER_HOST: tcp://localhost:2375

  DOCKER_TLS_CERTDIR: ""

  DOCKER_TLS_CERTDIR: ''

  DOCKER_DRIVER: overlay2

  IMAGE_NAME: 'hypo-portal'

  TESTCONTAINERS_HOST_OVERRIDE: "localhost"

  TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/"

  TESTCONTAINERS_HOST_OVERRIDE: 'localhost'

  TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: 'labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/'

  TESTCONTAINERS_CHECKS_DISABLE: 'true'





dev_image_build_job:

  stage: dev_image_build

  tags:
@@ -87,8 +84,6 @@ dev_deploy_job: 
  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'







semantic_versioning_job:

  image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/node:lts

  tags:

README.md

+3 −3
Changes for README.md: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line 
[Ubitech Gitlab](https://gitlab.ubitech.eu)

[Etsi Gitlab](https://labs.etsi.org/)



[Creating new SSH key](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)
@@ -197,7 +197,7 @@ TMF_633_BASE_URL="http://192.168.5.196:30088/tmf-api/serviceCatalogManagement/v4 
TMF_641_BASE_URL="http://192.168.5.196:30088/tmf-api/serviceOrdering/v4"

TMF_638_BASE_URL="http://192.168.5.196:30088/tmf-api/serviceInventory/v4"

TMF_639_BASE_URL="http://192.168.5.196:30088/tmf-api/resourceInventoryManagement/v4"

CART_BASE_URL="http://192.168.5.196:30092/maestro-portal/cart"

CART_BASE_URL="http://192.168.5.196:30092/hypo-portal/cart"

```



You can generate a new AUTH_SECRET any time using:
@@ -213,7 +213,7 @@ Reference: https://authjs.dev/guides/environment-variables#auth-secret 
## App setup (initially)



```bash

git clone https://gitlab.ubitech.eu/maestro-v2/io.maestro.portal/maestro-portal.git

git clone https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.portal/web.git

npm install

npm run build

pm2 start npm -- start

app/logout/page.tsx

+1 −2
Changes for app/logout/page.tsx: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ export default async function SignOutPage() { 
          'use server';



          const keycloakIssuer = process.env.KEYCLOAK_ISSUER;

          const postLogoutRedirectUri =

            process.env.AUTH_URL || process.env.NEXTAUTH_URL || 'https://hypo.ubitech.eu';

          const postLogoutRedirectUri = process.env.AUTH_URL || process.env.NEXTAUTH_URL;



          let logoutUrl = '/';

local-deploy.sh

+2 −2
Changes for local-deploy.sh: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ VERSION="v0" 
HOST_PORT=30000



# build the image

docker buildx build -t "ubitech/maestro-portal:$VERSION" .

docker buildx build -t "etsi/hypo-portal:$VERSION" .



# Read the .env file and export the variables

set -a
@@ -32,7 +32,7 @@ while IFS= read -r line || [ -n "$line" ]; do 
done < .env.local



# Append the image name

DOCKER_CMD+=" ubitech/maestro-portal:$VERSION"

DOCKER_CMD+=" etsi/hypo-portal:$VERSION"

echo "-----------------------------------"

echo $DOCKER_CMD

echo "-----------------------------------"

package-lock.json

+407 −12

File changed.

Preview size limit exceeded, changes collapsed.