Commit 2ececf37 authored by Duggan, John's avatar Duggan, John
Browse files

Fix pipeline

parent 067e9bfa

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ build-image: 
    OVERWRITE_IMAGE: "false"

  when: manual

  script:

    - IMAGE_TAG=$(VERSION)

    - IMAGE_TAG=${VERSION}

    - docker pull ${IMAGE_NAME}:src-${CI_COMMIT_SHA}

    - docker build -f dockerfiles/Dockerfile -t image .

    - docker tag image ${IMAGE_NAME}:bin-${CI_COMMIT_SHA}

dockerfiles/Dockerfile

+7 −4
Original line number Diff line number Diff line 
FROM --platform=amd64 regproxy.ornl.gov/hub_proxy/python:3.10-slim AS source



# make sure image can run as non-root user



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

RUN install -d -m 0755 /etc/apt/keyrings

RUN wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null

RUN echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" | tee -a /etc/apt/sources.list.d/mozilla.list > /dev/null

RUN apt update && apt install -y firefox

RUN mkdir -p /.cache /.mozilla && chmod 777 /.cache /.mozilla



# make sure image can run as non-root user

ENV POETRY_CACHE_DIR=/poetry/.cache

ENV POETRY_CONFIG_DIR=/poetry/.config

ENV POETRY_HOME=/poetry
@@ -28,8 +33,6 @@ RUN chmod og+rwX -R /etc/nginx 
COPY dockerfiles/nginx.conf.template /etc/nginx/nginx.conf.template

COPY scripts/prepare_nginx.sh /



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



COPY --from=source /src/dist /dist

RUN pip install /dist/*.whl

pyproject.toml

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

name = "ctscan-viz"

version = "0.1.0"

version = "0.1.2"

description = "Template application"

authors = []

readme = "README.md"