diff --git a/.github/workflows/docker_build_test_publish.yml b/.github/workflows/docker_build_test_publish.yml index 2ac21e39..710db6de 100644 --- a/.github/workflows/docker_build_test_publish.yml +++ b/.github/workflows/docker_build_test_publish.yml @@ -29,9 +29,23 @@ jobs: shell: bash -l {0} run: | docker build -t cil-viewer docker/web-app + + - name : docker save container + # https://docs.docker.com/engine/reference/commandline/save/ + shell: bash -l {0} + run: | + docker image ls + docker save cil-viewer | gzip > cil-viewer.tar.gz + ls -l + + - name: Upload artifact of the image. + uses: actions/upload-artifact@v2 + with: + name: cil-viewer + path: cil-viewer.tar.gz - name: Run docker container with tests shell: bash -l {0} run: | - docker run --rm --entrypoint /bin/bash -v /home/runner/work/CILViewer/CILViewer:/root/source_code cil-viewer -c "source ./mambaforge/etc/profile.d/conda.sh && conda activate cilviewer_webapp && conda install cil-data pytest -c ccpi && python -m pytest /root/source_code/Wrappers/Python -k 'not test_version'" - # TODO: publish to come later \ No newline at end of file + docker run --rm --entrypoint /bin/bash -v /home/runner/work/CILViewer/CILViewer:/root/source_code cil-viewer -c "source ./mambaforge/etc/profile.d/conda.sh && conda activate cilviewer_webapp && pip show ccpi-viewer && ls -l /home/abc/mambaforge/envs/cilviewer_webapp/lib/python3.9/site-packages/ccpi/viewer && python -m pytest /root/source_code/Wrappers/Python/" + # TODO: publish to come later diff --git a/docker/web-app/environment.yml b/docker/web-app/environment.yml index a6d0dff3..3f1a86c6 100644 --- a/docker/web-app/environment.yml +++ b/docker/web-app/environment.yml @@ -1,12 +1,20 @@ name: cilviewer_webapp channels: - conda-forge + - ccpi + - paskino dependencies: - python==3.9 - matplotlib # Optional for more colormaps - h5py +- numpy +- pyside2 +- paskino::eqt +- importlib_metadata # [py<38] +- ccpi::cil-data >=22.0.0 +- pytest - pip - pip: # Have to install Trame via pip due to unavailability on conda - trame <3, >=2.1.1 # Unpinned worked with version 2.1.1, should work with higher versions. - - vtk==9.1 \ No newline at end of file + - vtk==9.1