multi-user: provide example

README.md

@@ -25,22 +25,16 @@ to configure your IDE to select the correct Python interpreter.
 ## Docker
 ### Build the image
 
-without conda and mantid:
-
-```bash
-docker build -f dockerfiles/Dockerfile -t app .
-```
-
 with conda and mantid
 
 ```bash
-docker build --build-arg BUILD_ENV=conda -f dockerfiles/Dockerfile -t app .
+docker build -f dockerfiles/Dockerfile --no-cache --progress=plain -t app .
 ```
 
 ### Run the container
 
 ```
-docker run -p 8081:8081 -it -e EP_PATH=/app app bash -c "/prepare_nginx.sh && python -m template_app.app --host 0.0.0.0 --server"  
+docker run -p 8080:80 -it -e EP_PATH=/app -e TRAME_URL_PREFIX=/app app
 ```
 
 then open your browser at http://localhost:8081/app/

dockerfiles/Dockerfile

@@ -11,32 +11,9 @@ COPY pyproject.toml poetry.lock /src/
 WORKDIR /src
 RUN poetry build --format=wheel
 
-FROM --platform=amd64 kitware/trame:py3.10-conda-glvnd-2024-01 as build_no_conda
-ONBUILD RUN echo "skipping conda"
-ONBUILD ENTRYPOINT []
-
-FROM --platform=amd64 kitware/trame:py3.10-conda-glvnd-2024-01 as build_conda
-ONBUILD RUN conda config --add channels mantid
-ONBUILD RUN conda config --add channels conda-forge
-ONBUILD RUN conda create -n trame python=3.10
-ONBUILD RUN conda install -n trame mantid
-ONBUILD SHELL ["conda", "run", "-n", "trame", "/bin/bash", "-c"]
-ONBUILD ENTRYPOINT ["conda", "run", "--no-capture-output", "-n", "trame"]
-
-FROM build_${BUILD_ENV}
+FROM --platform=amd64 kitware/trame:py3.10-conda-glvnd-2024-06
 
 COPY --from=build /src/dist /dist
-RUN pip install /dist/*
-
-RUN apt update && apt install -y nginx
-RUN chmod og+rwX -R /var/lib/nginx
-RUN chmod og+rwX -R /var/log/nginx
-RUN chmod og+rwX -R /etc/nginx
-
-COPY dockerfiles/nginx.conf.template /etc/nginx/nginx.conf.template
-COPY dockerfiles/prepare_nginx.sh /
-
-RUN python -m trame.tools.www --client-type vue3 --output /app/www-content
-
-
-USER trame-user
+COPY --chown=trame-user:trame-user dockerfiles/setup /deploy/setup
+ENV TRAME_CLIENT_TYPE=vue3
+RUN /opt/trame/entrypoint.sh build

dockerfiles/setup/apps.yml

@@ -0,0 +1,14 @@
+trame: 
+  cmd:
+    - python
+    - -m
+    - template_app.app
+    - --host
+    - ${host}
+    - --port
+    - ${port}
+    - --authKey
+    - ${secret}
+    - --server
+    - --session
+    - ${id}

dockerfiles/setup/initialize.sh

@@ -0,0 +1,4 @@
+conda config --add channels mantid
+conda config --add channels conda-forge
+conda install mantid -y
+pip install /dist/*

template_app/app/core.py

@@ -28,15 +28,6 @@
 
 @TrameApp()
 class App:
-    def _parse_args(self):
-        parser = argparse.ArgumentParser()
-        parser.add_argument("--galaxy-url", help="URL of the Galaxy server")
-        parser.add_argument("--galaxy-key", help="API key for accessing the Galaxy server")
-        parser.add_argument("--galaxy-history-id", help="Default Galaxy history ID to use")
-        parser.add_argument("--config", help="Path to configuration file")
-        args, unknown = parser.parse_known_args()
-        return args
-
     def _sync_histories(self):
         try:
             self.state.items_galaxyHistory = galaxy.get_histories(self.state)
@@ -65,10 +56,25 @@ def _connect_to_galaxy(self, args):
 
     def __init__(self, server=None, data=None):
         self.server = get_server(server, client_type="vue3")
+
+        # CLI
+        self.server.cli.add_argument("--galaxy-url", help="URL of the Galaxy server")
+        self.server.cli.add_argument("--galaxy-key", help="API key for accessing the Galaxy server")
+        self.server.cli.add_argument("--galaxy-history-id", help="Default Galaxy history ID to use")
+        self.server.cli.add_argument("--config", help="Path to configuration file")
+        self.server.cli.add_argument("--session", help="Session identifier")
+        args, _ = self.server.cli.parse_known_args()
+
+        # TODO use it in auth
+        root_path = os.environ.get("EP_PATH", "")
+        # I don't think you need it in the state
+        self.state.base_url = f"{root_path}/api/{args.session}/"
+        print(f"Base URL to use: {self.state.base_url}")
+
         # todo:  can we put config as state variable so that a change to a nested field would trigger state change
         self.state.model = Model()
         self.state.config_file = None
-        args = self._parse_args()
+
         self._connect_to_galaxy(args)
         if args.config:
             self.state.model.loadConfig(open(args.config).read())