Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/InseeFrLab/onyxia
Browse files Browse the repository at this point in the history
  • Loading branch information
garronej committed Nov 3, 2023
2 parents 3caee25 + e71497f commit 70b57ee
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion helm-chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 6.2.1
version: 6.3.0
8 changes: 4 additions & 4 deletions helm-chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ingress:
- host: datalab.my-domain.net
EOF

helm install onyxia onyxia/onyxia --version "6.2.1" -f onyxia-values.yaml
helm install onyxia onyxia/onyxia --version "6.3.0" -f onyxia-values.yaml
```

### Using the Keycloak Theme (Optional)
Expand All @@ -44,7 +44,7 @@ extraInitContainers: |
args:
- -c
- |
curl -L -f -S -o /extensions/onyxia.jar https://github.com/InseeFrLab/onyxia/releases/download/v6.2.1/keycloak-theme.jar
curl -L -f -S -o /extensions/onyxia.jar https://github.com/InseeFrLab/onyxia/releases/download/v6.3.0/keycloak-theme.jar
volumeMounts:
- name: extensions
mountPath: /extensions
Expand All @@ -71,7 +71,7 @@ After that, you should be able to select *onyxia* as *Login Theme*.
Documentation reference for the available configuration parameter of the Onyxia Helm Chart.

- [The REST API (`api`)](https://github.com/InseeFrLab/onyxia-api/blob/v1.1.0/README.md#configuration)
- [The Web Application (`web`)](https://github.com/InseeFrLab/onyxia/blob/web-v3.4.4/web/.env)
- [The Web Application (`web`)](https://github.com/InseeFrLab/onyxia/blob/web-v3.5.0/web/.env)

Below is a sample `onyxia-values.yaml` file that illustrates where to specify the `api` and `web` configuration parameters.

Expand Down Expand Up @@ -107,4 +107,4 @@ Below is a sample `onyxia-values.yaml` file that illustrates where to specify th
If you are building your own service catalog for Onyxia ([learn how](https://docs.onyxia.sh/catalog-of-services)).
Here are defined the onyxia reserved parameter and the structure of the dynamic context:

[`values.schema.json` `"x-onyxia"` specifications](https://github.com/InseeFrLab/onyxia/blob/web-v3.4.4/web/src/core/ports/OnyxiaApi/XOnyxia.ts)
[`values.schema.json` `"x-onyxia"` specifications](https://github.com/InseeFrLab/onyxia/blob/web-v3.5.0/web/src/core/ports/OnyxiaApi/XOnyxia.ts)
2 changes: 1 addition & 1 deletion helm-chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ web:
replicaCount: 1
image:
repository: inseefrlab/onyxia-web
tag: 3.4.4
tag: 3.5.0
pullPolicy: IfNotPresent

## Pod priority settings
Expand Down
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"buffer": "^6.0.3",
"color": "^4.2.3",
"compare-versions": "^5.0.1",
"cra-envs": "^1.2.8",
"cra-envs": "^1.2.9",
"crypto-browserify": "^3.12.0",
"evt": "^2.5.3",
"file-saver": "^2.0.2",
Expand Down
8 changes: 4 additions & 4 deletions web/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6838,10 +6838,10 @@ cpy@^8.1.2:
p-filter "^2.1.0"
p-map "^3.0.0"

cra-envs@^1.2.8:
version "1.2.8"
resolved "https://registry.yarnpkg.com/cra-envs/-/cra-envs-1.2.8.tgz#1c4d8bc2cac0066686c8422bf6e7346e8b662f3d"
integrity sha512-V9AI4VF6ibLwE3b/1srlCeebpi4PTPpP6VRhiGiX39lv7BNZ69B7XI1xI2+XTnw9jO7UaxG5/RFDTB3ncC9JLA==
cra-envs@^1.2.9:
version "1.2.9"
resolved "https://registry.yarnpkg.com/cra-envs/-/cra-envs-1.2.9.tgz#f2cc262f815dc84ea58eb6e8c191b85be40146e1"
integrity sha512-Yu8vaiWNAij3jTetxBI1GofURlyUCKlzLdFNppoTfeCmFN+nQwbkDib87cgBHEeTDP79wT7AgaBpIBhXjuZY6g==
dependencies:
"@types/ejs" "^3.1.0"
"@types/node" "^10.0.0"
Expand Down

0 comments on commit 70b57ee

Please sign in to comment.