Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docker-stacks and jupyterhub #718

Merged
merged 98 commits into from
Feb 21, 2024
Merged

docker-stacks and jupyterhub #718

merged 98 commits into from
Feb 21, 2024

Commits on Feb 20, 2024

  1. set the environment variables at the end, 

    remove conda lib from LD_LIBRARY_PATH
    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    1f2b556 View commit details
    Browse the repository at this point in the history

  2. requirements for CIL

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    000ec9a View commit details
    Browse the repository at this point in the history

  3. do not run pip install after conda install

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    7e42a95 View commit details
    Browse the repository at this point in the history

  4. do not set LD_LIBRARY_PATH

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    9560bf5 View commit details
    Browse the repository at this point in the history

  5. updates

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    ec6c98b View commit details
    Browse the repository at this point in the history

  6. updates for PSMR2022

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    21978c2 View commit details
    Browse the repository at this point in the history

  7. added CIL dependencies

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    83d0df7 View commit details
    Browse the repository at this point in the history

  8. readme updates

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    6352d47 View commit details
    Browse the repository at this point in the history

  9. add build command

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    5e9a790 View commit details
    Browse the repository at this point in the history

  10. update build command

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    017e447 View commit details
    Browse the repository at this point in the history

  11. copy stuff at the end

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    e43b037 View commit details
    Browse the repository at this point in the history

  12. copy SIRF sources

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    f5b0dc5 View commit details
    Browse the repository at this point in the history

  13. fix formatting

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    8c0e867 View commit details
    Browse the repository at this point in the history

  14. wip

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    0125633 View commit details
    Browse the repository at this point in the history

  15. updates jupyterhub for Ubuntu 22.04

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    92a0047 View commit details
    Browse the repository at this point in the history

  16. update readme

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    7297b87 View commit details
    Browse the repository at this point in the history

  17. removed old text

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    06d4f21 View commit details
    Browse the repository at this point in the history

  18. add astra-toolbox

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    b611c0e View commit details
    Browse the repository at this point in the history

  19. update to jupyterhub dockerfile

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    52716e4 View commit details
    Browse the repository at this point in the history

  20. update the BASE_IMAGE

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    6574861 View commit details
    Browse the repository at this point in the history

  21. install py3.9 and deal with consequences 

    requires to build Boost and boost python
    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    430b86d View commit details
    Browse the repository at this point in the history

  22. simplify the dockerfile to reduce layers

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    5cc13d0 View commit details
    Browse the repository at this point in the history

  23. add boost_python

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    6187f11 View commit details
    Browse the repository at this point in the history

  24. several updates

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    173d5c0 View commit details
    Browse the repository at this point in the history

  25. mainly updates to instruction on jupyterhub image build

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    a6800a5 View commit details
    Browse the repository at this point in the history

  26. remove set e from bash script

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    7a8cbcd View commit details
    Browse the repository at this point in the history

  27. auto OMP_NUM_THREADS = cpu_count//2

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    e3abf7e View commit details
    Browse the repository at this point in the history

  28. add docker-stacks submodule, cleanup build

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    5b29dd8 View commit details
    Browse the repository at this point in the history

  29. better image tags

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    c66e745 View commit details
    Browse the repository at this point in the history

  30. update name of variable

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    e4fb34a View commit details
    Browse the repository at this point in the history

  31. safer directory switching

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    fbb69b9 View commit details
    Browse the repository at this point in the history

  32. update jupyterhub README

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    f3aebea View commit details
    Browse the repository at this point in the history

  33. add SIRF_IMAGE variable

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    df35364 View commit details
    Browse the repository at this point in the history

  34. make SIRF_IMAGE configurable

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    4164ddc View commit details
    Browse the repository at this point in the history

  35. fix some review comments

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    d02886e View commit details
    Browse the repository at this point in the history

  36. migrate build to docker-stacks

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    5fbdb2d View commit details
    Browse the repository at this point in the history

  37. build fixes & ccaching

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    e416e34 View commit details
    Browse the repository at this point in the history

  38. configurable cmake options

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    654b178 View commit details
    Browse the repository at this point in the history

  39. fix build & test

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    a4491b7 View commit details
    Browse the repository at this point in the history

  40. split CPU & GPU images

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    5990ce2 View commit details
    Browse the repository at this point in the history

  41. merge jupyterhub => docker

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    6ebeb79 View commit details
    Browse the repository at this point in the history

  42. mamba install cmake

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    44ddc58 View commit details
    Browse the repository at this point in the history

  43. CIL-Demos and CIL-Exercises in workdir

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    813dcd8 View commit details
    Browse the repository at this point in the history

  44. kill old docker

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    e5ef700 View commit details
    Browse the repository at this point in the history

  45. remove entrypoint, fix cmd

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    94b162b View commit details
    Browse the repository at this point in the history

  46. ninja build, fix CIL gpu/cpu/implicit deps

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    5a11768 View commit details
    Browse the repository at this point in the history

  47. common build & runtime deps

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    05b277c View commit details
    Browse the repository at this point in the history

  48. minor docker improvements

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    ffc3ba6 View commit details
    Browse the repository at this point in the history

  49. local build

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    61a25b8 View commit details
    Browse the repository at this point in the history

  50. revert SIRF_TAG v3.5.0 <= ignore-acq

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    f242861 View commit details
    Browse the repository at this point in the history

  51. misc docker tidy & fixes

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    0a424da View commit details
    Browse the repository at this point in the history

  52. strict priority

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    39d2a64 View commit details
    Browse the repository at this point in the history

  53. fix password & mounts

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    758edf7 View commit details
    Browse the repository at this point in the history

  54. some fixes and docs

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    e08091e View commit details
    Browse the repository at this point in the history

  55. fix UID, slight tidy

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    b34f1bd View commit details
    Browse the repository at this point in the history

  56. fix widgets

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    d49c5b7 View commit details
    Browse the repository at this point in the history

  57. simplify build script

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    2a418db View commit details
    Browse the repository at this point in the history

  58. compose.sh script options

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    3cd942b View commit details
    Browse the repository at this point in the history

  59. demos: remove unneeded GPU deps

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    d312289 View commit details
    Browse the repository at this point in the history

  60. fix GPU build

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    560558b View commit details
    Browse the repository at this point in the history

  61. fix ipywidgets again

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    d43d518 View commit details
    Browse the repository at this point in the history

  62. cleanup started containers

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    01ed0a0 View commit details
    Browse the repository at this point in the history

  63. CI: docker build CPU & GPU

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    ff3f04c View commit details
    Browse the repository at this point in the history

  64. CI: fix & speedup build

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    a4ec488 View commit details
    Browse the repository at this point in the history

  65. CI: drop travis

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    1911bfd View commit details
    Browse the repository at this point in the history

  66. avoid ccache bloat

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    466b6fb View commit details
    Browse the repository at this point in the history

  67. fix test return status

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    c743ac6 View commit details
    Browse the repository at this point in the history

  68. CI: fix empty ccache

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    f41979c View commit details
    Browse the repository at this point in the history

  69. docker tags & pushing

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    42f80ae View commit details
    Browse the repository at this point in the history

  70. better ccache

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    44a9f5a View commit details
    Browse the repository at this point in the history

  71. minor fixes

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    39de615 View commit details
    Browse the repository at this point in the history

  72. cron weekly & master devel builds

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    d714244 View commit details
    Browse the repository at this point in the history

  73. drop SyneRBI#573 work-around

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    e7fa024 View commit details
    Browse the repository at this point in the history

  74. expose SIRF_DOWNLOAD_DATA_ARGS

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    f76e9b7 View commit details
    Browse the repository at this point in the history

  75. compose: -U to disable cache update

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    13e7067 View commit details
    Browse the repository at this point in the history

  76. misc fixes & tidy

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    7813706 View commit details
    Browse the repository at this point in the history

  77. devel build with CIL

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    8864a08 View commit details
    Browse the repository at this point in the history

  78. compose binary & devel-gpu

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    a4ca9c5 View commit details
    Browse the repository at this point in the history

  79. auto-gen help

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    1ebf418 View commit details
    Browse the repository at this point in the history

  80. fix GPU devel

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    724c91b View commit details
    Browse the repository at this point in the history

  81. added some docs in Readme

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    03c3206 View commit details
    Browse the repository at this point in the history

  82. update to python 3.10 and do not fail if Gadgetron tests cannot be run

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    188f8c1 View commit details
    Browse the repository at this point in the history

  83. install dxchange via conda

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    dfc9e20 View commit details
    Browse the repository at this point in the history

  84. temporarily disable CIL test 11

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    0b93393 View commit details
    Browse the repository at this point in the history

  85. reenable tests as fixed in CIL

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    56a0db1 View commit details
    Browse the repository at this point in the history

  86. set python version to 3.10 as string

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    056f186 View commit details
    Browse the repository at this point in the history

  87. test CIL PR

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    6823d86 View commit details
    Browse the repository at this point in the history

  88. revert to default volume mount

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    25f6a14 View commit details
    Browse the repository at this point in the history

  89. [ci skip] update readme

    @paskino @casperdcl
    paskino authored and casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    4a93cac View commit details
    Browse the repository at this point in the history

  90. cleanup post-rebase

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    7e2573e View commit details
    Browse the repository at this point in the history

  91. customisable OMP_NUM_THREADS

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    d8a5249 View commit details
    Browse the repository at this point in the history

  92. fix executable permissions

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    7cb3734 View commit details
    Browse the repository at this point in the history

  93. CI: optimise devel build

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    ea73e05 View commit details
    Browse the repository at this point in the history

  94. docker docs

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    ac7f72f View commit details
    Browse the repository at this point in the history

  95. compose.sh: better help output

    @casperdcl
    casperdcl committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    04e266d View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. merge dev docs

    @casperdcl
    casperdcl committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    ca0e4c3 View commit details
    Browse the repository at this point in the history

  2. fix compose.sh -U

    @casperdcl
    casperdcl committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    69b0963 View commit details
    Browse the repository at this point in the history

  3. CI: separate pull/build, don't cache devel

    @casperdcl
    casperdcl committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    aa0478b View commit details
    Browse the repository at this point in the history