Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • ndip/trame-apps/trame-app-launcher
1 result
Show changes
Commits on Source (1)
Hide whitespace changes
Inline Side-by-side
.env.sample
View file @ 4a785151
TRAME_UCAMS_AUTH_URL = "http://localhost:8082/realms/master/protocol/openid-connect/auth"
TRAME_UCAMS_TOKEN_URL = "http://localhost:8082/realms/master/protocol/openid-connect/token"
TRAME_UCAMS_CLIENT_ID = "trame-demo"
TRAME_UCAMS_CLIENT_SECRET = "secret"
TRAME_UCAMS_REDIRECT_URL = "http://localhost:8080/redirect"
TRAME_UCAMS_SCOPES = ["email", "profile", "openid", "User.Read"]
TRAME_UCAMS_AUTH_URL="http://localhost:8082/realms/master/protocol/openid-connect/auth"
TRAME_UCAMS_TOKEN_URL="http://localhost:8082/realms/master/protocol/openid-connect/token"
TRAME_UCAMS_CLIENT_ID="trame-demo"
TRAME_UCAMS_CLIENT_SECRET="secret"
TRAME_UCAMS_REDIRECT_URL="http://localhost:8080/redirect"
TRAME_UCAMS_SCOPES=["email", "profile", "openid", "User.Read"]
TRAME_XCAMS_AUTH_URL = "http://localhost:8082/realms/master/protocol/openid-connect/auth"
TRAME_XCAMS_TOKEN_URL = "http://localhost:8082/realms/master/protocol/openid-connect/token"
TRAME_XCAMS_CLIENT_ID = "trame-demo"
TRAME_XCAMS_CLIENT_SECRET = "secret"
TRAME_XCAMS_REDIRECT_URL = "http://localhost:8080/authnz/pingfed/callback"
TRAME_XCAMS_SCOPES = ["email", "profile", "openid","https://calvera-test.ornl.gov/api:*"]
TRAME_XCAMS_AUTH_URL="http://localhost:8082/realms/master/protocol/openid-connect/auth"
TRAME_XCAMS_TOKEN_URL="http://localhost:8082/realms/master/protocol/openid-connect/token"
TRAME_XCAMS_CLIENT_ID="trame-demo"
TRAME_XCAMS_CLIENT_SECRET="secret"
TRAME_XCAMS_REDIRECT_URL="http://localhost:8080/authnz/pingfed/callback"
TRAME_XCAMS_SCOPES=["email", "profile", "openid","https://calvera-test.ornl.gov/api:*"]
GALAXY_URL = "https://calvera-test.ornl.gov"
GALAXY_API_KEY = "Leave Empty if using Auth"
GALAXY_API_KEY_ENDPOINT = "/api/authenticate/baseauth"
GALAXY_HISTORY_ID = ""
GALAXY_LAUNCHER_HISTORY_NAME = "launcher_history"
GALAXY_URL="https://calvera-test.ornl.gov"
GALAXY_API_KEY="Leave Empty if using Auth"
GALAXY_API_KEY_ENDPOINT="/api/authenticate/baseauth"
GALAXY_HISTORY_ID=""
GALAXY_LAUNCHER_HISTORY_NAME="launcher_history"
TRAME_LAUNCHER_TOOL_PATH = "launcher_app/app/tools.json"
EP_PATH = "/"
TRAME_LAUNCHER_TOOL_PATH="launcher_app/app/tools.json"
EP_PATH="/"
dockerfiles/Dockerfile
View file @ 4a785151
FROM --platform=amd64 ubuntu:22.04 as build
FROM --platform=amd64 ubuntu:22.04 AS build
RUN DEBIAN_FRONTEND="noninteractive" apt-get update && apt-get -y install tzdata
RUN apt-get install -y python3.10 curl
......@@ -9,11 +9,10 @@ WORKDIR /src
RUN poetry build --format=wheel
FROM --platform=amd64 kitware/trame:py3.10-conda-glvnd-2024-08 AS run
FROM --platform=amd64 kitware/trame:py3.10-conda-glvnd-2024-01 as run
RUN pip install --extra-index-url https://wheels.vtk.org vtk-egl
RUN pip install --extra-index-url https://code.ornl.gov/api/v4/projects/15758/packages/pypi/simple py-mvvm
RUN pip install --extra-index-url https://code.ornl.gov/api/v4/projects/16294/packages/pypi/simple trame-facade
COPY --from=build /src/dist /dist
RUN pip install /dist/*.whl
......@@ -26,8 +25,10 @@ RUN chmod og+rwX -R /etc/nginx
COPY dockerfiles/nginx.conf.template /etc/nginx/nginx.conf.template
COPY dockerfiles/prepare_nginx.sh /
# I don't want to set this in the .env as I don't want this to be configurable.
# In development builds, the default should be used. Here, html5 mode should be used.
ENV TRAME_ROUTER_HISTORY_MODE=html5
RUN python -m trame.tools.www --client-type vue3 --output /app/www-content
USER trame-user
ENTRYPOINT []
poetry.lock
View file @ 4a785151
# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
[[package]]
name = "aiohttp"
......@@ -1691,7 +1691,7 @@ optional = false
python-versions = ">=3.10,<4.0"
files = [
{file = "py_mvvm-0.2.0-py3-none-any.whl", hash = "sha256:2a60c873e0fb021a6b4b67770f52c874e63b26f4b9a7a303ec428603fb05a8f4"},
{file = "py_mvvm-0.2.0.tar.gz", hash = "sha256:c9e00e1203e4d8da41408d43ab6580f5e1f9d5de79125a3bf6abca36432b2422"},
{file = "py_mvvm-0.2.0.tar.gz", hash = "sha256:9ae56b74235d171223b45e7ab8f99d6659772ecac3a63c22f653bdfab403ef5e"},
]
[package.dependencies]
......@@ -2198,13 +2198,13 @@ reference = "py-mvvm"
[[package]]
name = "trame-facade"
version = "0.2.1"
version = "0.2.2"
description = "A Python Package for injecting curated themes into Trame applications"
optional = false
python-versions = ">=3.10,<4.0"
files = [
{file = "trame_facade-0.2.1-py3-none-any.whl", hash = "sha256:ce885570c27fe461a35e871c6b6daedd223dbf1c5923dec9819244b2e0657363"},
{file = "trame_facade-0.2.1.tar.gz", hash = "sha256:a47b9408bc52b6412ffcbdcf9fbd0c886e751cc4121483f13938c6439fbc52be"},
{file = "trame_facade-0.2.2-py3-none-any.whl", hash = "sha256:8f9b3bdcecf70564dc5ea8ff6ca05b16bba3f08fe0dbe10b7f728a2516f54bd2"},
{file = "trame_facade-0.2.2.tar.gz", hash = "sha256:a40bf507a02152946b7da006454d7376350e30980829f9a4261b53c54bb1bae9"},
]
[package.dependencies]
......@@ -2257,13 +2257,13 @@ reference = "py-mvvm"
[[package]]
name = "trame-router"
version = "2.2.0"
version = "2.3.0"
description = "Vue Router widgets for trame"
optional = false
python-versions = "*"
files = [
{file = "trame-router-2.2.0.tar.gz", hash = "sha256:7958924c414497722eb3cbad32f0f92638ea262cff97a3bcab985a87146bfb1a"},
{file = "trame_router-2.2.0-py3-none-any.whl", hash = "sha256:b66c5854c41bd421f39e28fe28bc33b536cb5839ff7d842030e54d3c7d7b5b3a"},
{file = "trame-router-2.3.0.tar.gz", hash = "sha256:b382bdaad59998d5fcb93613a6e6828d68ff168eff87df56b13604a331294216"},
{file = "trame_router-2.3.0-py3-none-any.whl", hash = "sha256:b1d2b94ead3d6d9a731e544a7fbb343788b71e1c4139f2a5e17f19c5f4fa344d"},
]
[package.dependencies]
......@@ -2646,4 +2646,4 @@ reference = "py-mvvm"
[metadata]
lock-version = "2.0"
python-versions = "^3.10"
content-hash = "05369c13c0aef5c737ff20c5a89ab424c736829ed4f892f2f299b7b8edc4d162"
content-hash = "a344eb66006bc319a7e4ad89fd329c75ea450a33426cdbbdf84ffe43cbd2badf"
pyproject.toml
View file @ 4a785151
......@@ -20,9 +20,9 @@ trame-keycloak = "^0.1.1"
oauthlib = "^3.2.2"
requests-oauthlib = "^2.0.0"
aiohttp = "^3.9.3"
trame-router = "^2.2.0"
trame-router = "^2.3.0"
py-mvvm = {extras = ["trame"], version = "^0.2.0"}
trame-facade = "^0.2.1"
trame-facade = "^0.2.2"
pyjwt = "^2.8.0"
python-dotenv = "^1.0.1"
......