diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index b234c9975..89f33f81a 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -102,7 +102,7 @@ services: condition: service_healthy frontend: - image: node:23-alpine + image: node:24-alpine profiles: ["new-ui"] container_name: iris_sveltekit_frontend working_dir: /app diff --git a/docker/webApp/Dockerfile b/docker/webApp/Dockerfile index fc8e22ded..219e61068 100644 --- a/docker/webApp/Dockerfile +++ b/docker/webApp/Dockerfile @@ -19,7 +19,7 @@ #################### # COMPILE JS IMAGE # #################### -FROM node:20-alpine AS compile-js-image +FROM node:24-alpine AS compile-js-image COPY ui/ /ui @@ -40,10 +40,12 @@ RUN python -m venv /opt/venv # Make sure we use the virtualenv: ENV PATH="/opt/venv/bin:$PATH" +RUN python -m pip install --upgrade pip wheel + COPY source/dependencies /dependencies COPY source/requirements.txt / -RUN pip3 install -r requirements.txt +RUN python -m pip install --no-cache-dir -r /requirements.txt ############### # BUILD IMAGE # diff --git a/source/app/blueprints/graphql/graphql_route.py b/source/app/blueprints/graphql/graphql_route.py index bfa7b9e9d..d63773bb0 100644 --- a/source/app/blueprints/graphql/graphql_route.py +++ b/source/app/blueprints/graphql/graphql_route.py @@ -22,7 +22,7 @@ from flask_wtf import FlaskForm from flask import Blueprint -from graphql_server.flask import GraphQLView +from graphql_server.flask.views import GraphQLView from graphene import ObjectType from graphene import Schema from graphene import Float @@ -119,7 +119,7 @@ def wrap(*args, **kwargs): def _create_blueprint(): schema = Schema(query=Query, mutation=Mutation) - graphql_view = GraphQLView.as_view('graphql', schema=schema) + graphql_view = GraphQLView.as_view('graphql', schema=schema.graphql_schema) graphql_view_with_authentication = _check_authentication_wrapper(graphql_view) blueprint = Blueprint('graphql', __name__) diff --git a/source/app/blueprints/pages/demo_landing/templates/demo-landing.html b/source/app/blueprints/pages/demo_landing/templates/demo-landing.html index 7b1885006..4072735b8 100644 --- a/source/app/blueprints/pages/demo_landing/templates/demo-landing.html +++ b/source/app/blueprints/pages/demo_landing/templates/demo-landing.html @@ -155,7 +155,7 @@