Commit 5416a6b2 authored by Duggan, John's avatar Duggan, John
Browse files

Merge branch '8-simplify-docker-image' into 'main' 

Remove unnecessary installs in Dockerfile

Closes #8

See merge request ndip/trame-apps/ct-scan-visualizer!5
parents 650f6cb7 06a89abd

dockerfiles/Dockerfile

+5 −4
Original line number Diff line number Diff line
@@ -28,12 +28,14 @@ RUN chmod og+rwX -R /src 
# This is a workaround that allows the COPY --from location to be defined as a build argument.

# With this, we can reference the built source image from Harbor in our pipelines, while still

# defaulting to using the previous stage for local builds.

FROM $SOURCE_IMAGE as source_image

FROM $SOURCE_IMAGE AS source_image





FROM --platform=amd64 regproxy.ornl.gov/hub_proxy/kitware/trame:py3.10-glvnd-2024-10 AS run

FROM --platform=amd64 regproxy.ornl.gov/hub_proxy/kitware/trame:py3.10-glvnd-2024-12 AS run



RUN apt update && apt install -y libgl1-mesa-dev libxrender1 nginx xvfb

ENV VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow



RUN apt update && apt install -y libxrender1 nginx

RUN chmod og+rwX -R /var/lib/nginx

RUN chmod og+rwX -R /var/log/nginx

RUN chmod og+rwX -R /etc/nginx
@@ -46,7 +48,6 @@ COPY scripts/run_trame.sh / 
COPY --from=source_image /src/dist /dist

RUN pip install /dist/*.whl

RUN pip install supervisor

RUN pip install --extra-index-url https://wheels.vtk.org vtk-egl



RUN python -m trame.tools.www --client-type vue3 --output /app/www-content

pyproject.toml

+2 −2
Original line number Diff line number Diff line 
[tool.poetry]

name = "ctscan-viz"

version = "0.3.2"

description = "Template application"

version = "0.3.3"

description = "Trame application for volume rendering CT scans stored in TIFF stacks"

authors = []

readme = "README.md"

license = "MIT"