Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use PIA lib version 4.3.0 #12

Merged
merged 2 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,10 @@ on:
branches:
- 'main'
- 'fix/[0-9]+.[0-9]+.x'
paths-ignore:
- '.gitignore'
- 'CODEOWNERS'
- 'LICENSE'
- '*.md'
- '*.adoc'
- '*.txt'
- '.all-contributorsrc'

jobs:
build:
uses: onecx/ci-angular/.github/workflows/build.yml@v1
secrets: inherit
with:
helmEventTargetRepository: onecx/onecx-workspace
9 changes: 9 additions & 0 deletions .github/workflows/create-new-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Create new build

on:
workflow_dispatch:

jobs:
build:
uses: onecx/ci-common/.github/workflows/create-new-build.yml@v1
secrets: inherit
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM harbor.1000kit.org/1000kit/spa-base:v1
FROM ghcr.io/onecx/docker-spa-base:1.3.0

# Copy locations config
# Copy nginx configuration
COPY nginx/locations.conf $DIR_LOCATION/locations.conf
# Copy application build
COPY dist/onecx-workspace-ui/ $DIR_HTML

#Optional extend list of application environments
# Optional extend list of application environments
#ENV CONFIG_ENV_LIST BFF_URL,APP_BASE_HREF

# Application environments default values
ENV BFF_URL http://onecx-workspace-management-bff:8080/
ENV BFF_URL http://onecx-workspace-bff:8080/
ENV APP_BASE_HREF /

RUN chmod 775 -R $DIR_HTML/assets
RUN chmod 775 -R "$DIR_HTML"/assets
USER 1001
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# onecx-workspace-ui
OneCx workspace UI

OneCX Workspace UI
1 change: 1 addition & 0 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ description: OneCX Workspace UI
home: https://github.com/onecx/onecx-workspace-ui
keywords:
- workspace
- menu
sources:
- https://github.com/onecx/onecx-workspace-ui
maintainers:
Expand Down
6 changes: 3 additions & 3 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ app:
microfrontend:
enabled: true
spec:
exposedModule: "./WorkspaceMgmtModule"
description: "OneCX Workspace Mgmt"
note: "OneCX Workspace Mgmt module auto import via MF operator"
exposedModule: "./OneCXWorkspaceModule"
description: "OneCX Workspace UI"
note: "OneCX Workspace UI module auto import via MF operator"
# Permission
permission:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion nginx/locations.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
location @@APP_BASE_HREFportal-api/ {
location @@APP_BASE_HREFbff {
proxy_pass @@BFF_URL;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $remote_addr;
Expand Down
Loading
Loading