diff --git a/docker/Dockerfile.peacock b/docker/Dockerfile.peacock index 250d4df..04c7276 100644 --- a/docker/Dockerfile.peacock +++ b/docker/Dockerfile.peacock @@ -3,8 +3,8 @@ FROM node:20-bookworm AS js_assets_builder WORKDIR /work RUN git clone https://github.com/idaholab/moose-language-support.git && \ - cd moose-language-support && npm install --no-audit && \ - npm run esbuild + cd moose-language-support && git checkout v0.6.2 && npm install --no-audit && \ + npm run compile ENV NODE_OPTIONS=--openssl-legacy-provider @@ -14,9 +14,14 @@ RUN git clone https://github.com/Kitware/peacock.git && \ FROM moosepv:latest +SHELL ["/bin/bash", "-ce"] + +RUN dnf remove -qy nodejs && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash +RUN source /root/.nvm/nvm.sh && nvm install 20 + WORKDIR /work -COPY --from=js_assets_builder /work/moose-language-support/out /work/moose-language-support/out +COPY --from=js_assets_builder /work/moose-language-support /work/moose-language-support COPY --from=js_assets_builder /work/peacock /work/peacock COPY ./run_peacock.bash /work/run_peacock.bash diff --git a/docker/run_peacock.bash b/docker/run_peacock.bash index 6d54720..011f341 100755 --- a/docker/run_peacock.bash +++ b/docker/run_peacock.bash @@ -1,4 +1,4 @@ #!/bin/bash export PYTHONPATH=/opt/moose/share/moose/python:/opt/paraview/lib/python3.12/site-packages:$PYTHONPATH -/work/venv/bin/peacock-trame --server --host 0.0.0.0 -L /work/moose-language-support/out/main.js $@ +/work/venv/bin/peacock-trame --server --host 0.0.0.0 -L /work/moose-language-support/server/out/server.js $@