pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adapted deployment configs

Browse source
This commit is contained in:
Luis Aleixo 2023-05-09 17:17:52 +02:00
parent 7fd0e0f8ec
commit 18978aef20
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app-config/docker-compose.yml
View file

@ -20,7 +20,7 @@ services:
- APPLICATION_ROOT=/ - APPLICATION_ROOT=/
- CAIMIRA_CALCULATOR_PREFIX=/calculator-cern - CAIMIRA_CALCULATOR_PREFIX=/calculator-cern
- CAIMIRA_THEME=caimira/apps/templates/cern - CAIMIRA_THEME=caimira/apps/templates/cern
- EXTRA_PAGES=[{"url":"/about","filename":"about", "is_root":True},{"url":"/user-guide","filename":"userguide","is_root":False}] - EXTRA_PAGES=[{"url_path":"/about","filename":"about.html.j2"},{"url_path":"/calculator/user-guide","filename":"userguide.html.j2"}]
user: ${CURRENT_UID} user: ${CURRENT_UID}
calculator-open-app: calculator-open-app:
@ -30,7 +30,7 @@ services:
- APP_NAME=calculator-app - APP_NAME=calculator-app
- APPLICATION_ROOT=/ - APPLICATION_ROOT=/
- CAIMIRA_CALCULATOR_PREFIX=/calculator-open - CAIMIRA_CALCULATOR_PREFIX=/calculator-open
- EXTRA_PAGES=[{"url":"/about","filename":"about", "is_root":True},{"url":"/user-guide","filename":"userguide","is_root":False}] - EXTRA_PAGES=[{"url_path":"/about","filename":"about.html.j2"},{"url_path":"/calculator/user-guide","filename":"userguide.html.j2"}]
user: ${CURRENT_UID} user: ${CURRENT_UID}
auth-service: auth-service:

2
app-config/openshift/deploymentconfig.yaml
View file

@ -284,7 +284,7 @@
key: ARVE_API_KEY key: ARVE_API_KEY
name: arve-api name: arve-api
- name: EXTRA_PAGES - name: EXTRA_PAGES
value: '[{"url":"/about","filename":"about","is_root":True},{"url":"/user-guide","filename":"userguide","is_root":False}]' value: '[{"url_path":"/about","filename":"about.html.j2"},{"url_path":"/calculator/user-guide","filename":"userguide.html.j2"}]'
image: '${PROJECT_NAME}/calculator-app' image: '${PROJECT_NAME}/calculator-app'
ports: ports:
- containerPort: 8080 - containerPort: 8080

1
caimira/apps/calculator/__init__.py
View file

@ -374,6 +374,7 @@ def make_app(
# Any extra generic page must be declared in the env. variable "EXTRA_PAGES" # Any extra generic page must be declared in the env. variable "EXTRA_PAGES"
extra_pages: typing.Union[str, typing.List] = os.environ.get('EXTRA_PAGES', []) extra_pages: typing.Union[str, typing.List] = os.environ.get('EXTRA_PAGES', [])
pages: typing.List = []
try: try:
pages = ast.literal_eval(extra_pages) # type: ignore pages = ast.literal_eval(extra_pages) # type: ignore
except (SyntaxError, ValueError): except (SyntaxError, ValueError):