From fe2d5b91a32f6747b7df6afa1aae97ba462ae688 Mon Sep 17 00:00:00 2001 From: Oleg Smirnov Date: Sun, 10 May 2020 17:29:04 +0200 Subject: [PATCH 1/5] trying a different image for ragavi --- stimela/cargo/base/ragavi/Dockerfile | 13 ++++++++----- stimela/cargo/cab/ragavi/parameters.json | 2 +- stimela/cargo/cab/ragavi_vis/parameters.json | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/stimela/cargo/base/ragavi/Dockerfile b/stimela/cargo/base/ragavi/Dockerfile index a6899d7f..a02ad475 100644 --- a/stimela/cargo/base/ragavi/Dockerfile +++ b/stimela/cargo/base/ragavi/Dockerfile @@ -1,8 +1,11 @@ -FROM stimela/base:1.4.6 +FROM stimela/base:1.2.5 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - -RUN pip install -U pip setuptools -RUN pip install ragavi>=0.3.5 -RUN pip install --force-reinstall -U git+https://github.com/o-smirnov/datashader -RUN pip install -I numpy +RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.6 10 +RUN pip3 install -U pip setuptools pyyaml +RUN pip3 install -U python-casacore +RUN pip3 install ragavi>=0.3.5 +# RUN pip install --force-reinstall -U git+https://github.com/o-smirnov/datashader +RUN pip3 install -I numpy RUN ragavi-gains -h RUN ragavi-vis -h +#RUN python3 -c "import yaml" \ No newline at end of file diff --git a/stimela/cargo/cab/ragavi/parameters.json b/stimela/cargo/cab/ragavi/parameters.json index 590278e0..5dda800c 100644 --- a/stimela/cargo/cab/ragavi/parameters.json +++ b/stimela/cargo/cab/ragavi/parameters.json @@ -1,7 +1,7 @@ { "task": "ragavi", "base": "stimela/ragavi", - "tag": "1.4.6-1", + "tag": "1.4.6-2", "description": "Radio Astronomy Gain and Visibility Inspector", "prefix": "--", "binary": "ragavi-gains", diff --git a/stimela/cargo/cab/ragavi_vis/parameters.json b/stimela/cargo/cab/ragavi_vis/parameters.json index 76970572..41010963 100644 --- a/stimela/cargo/cab/ragavi_vis/parameters.json +++ b/stimela/cargo/cab/ragavi_vis/parameters.json @@ -1,7 +1,7 @@ { "task": "ragavi", "base": "stimela/ragavi", - "tag": "1.4.6-1", + "tag": "1.4.6-2", "description": "Radio Astronomy Gain and Visibility Inspector", "prefix": "--", "binary": "ragavi-vis", From ea71bccd560ed23a6c3da0575740925858b183c0 Mon Sep 17 00:00:00 2001 From: Oleg Smirnov Date: Sun, 10 May 2020 20:35:05 +0200 Subject: [PATCH 2/5] desperate messing with images and dask-mss --- stimela/cargo/base/ragavi/Dockerfile | 2 +- stimela/cargo/base/ragavi_vis/Dockerfile | 11 +++++++++++ stimela/cargo/cab/ragavi_vis/parameters.json | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 stimela/cargo/base/ragavi_vis/Dockerfile diff --git a/stimela/cargo/base/ragavi/Dockerfile b/stimela/cargo/base/ragavi/Dockerfile index a02ad475..97679dc9 100644 --- a/stimela/cargo/base/ragavi/Dockerfile +++ b/stimela/cargo/base/ragavi/Dockerfile @@ -2,7 +2,7 @@ FROM stimela/base:1.2.5 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.6 10 RUN pip3 install -U pip setuptools pyyaml -RUN pip3 install -U python-casacore +RUN pip3 install -U python-casacore dask-ms==0.2.3 RUN pip3 install ragavi>=0.3.5 # RUN pip install --force-reinstall -U git+https://github.com/o-smirnov/datashader RUN pip3 install -I numpy diff --git a/stimela/cargo/base/ragavi_vis/Dockerfile b/stimela/cargo/base/ragavi_vis/Dockerfile new file mode 100644 index 00000000..e32536b5 --- /dev/null +++ b/stimela/cargo/base/ragavi_vis/Dockerfile @@ -0,0 +1,11 @@ +FROM stimela/base:1.2.5 +RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - +RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.6 10 +RUN pip3 install -U pip setuptools pyyaml +RUN pip3 install -U python-casacore dask-ms==0.2.4 +RUN pip3 install ragavi>=0.3.5 +# RUN pip install --force-reinstall -U git+https://github.com/o-smirnov/datashader +RUN pip3 install -I numpy +RUN ragavi-gains -h +RUN ragavi-vis -h +#RUN python3 -c "import yaml" diff --git a/stimela/cargo/cab/ragavi_vis/parameters.json b/stimela/cargo/cab/ragavi_vis/parameters.json index 41010963..4e1c06d0 100644 --- a/stimela/cargo/cab/ragavi_vis/parameters.json +++ b/stimela/cargo/cab/ragavi_vis/parameters.json @@ -1,6 +1,6 @@ { "task": "ragavi", - "base": "stimela/ragavi", + "base": "stimela/ragavi_vis", "tag": "1.4.6-2", "description": "Radio Astronomy Gain and Visibility Inspector", "prefix": "--", From 2be25debb0a1567e8e677666e9371e9a7df5d71d Mon Sep 17 00:00:00 2001 From: Oleg Smirnov Date: Sun, 10 May 2020 20:44:34 +0200 Subject: [PATCH 3/5] dev branch for ragavi --- stimela/cargo/base/ragavi_vis/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stimela/cargo/base/ragavi_vis/Dockerfile b/stimela/cargo/base/ragavi_vis/Dockerfile index e32536b5..0583ffe3 100644 --- a/stimela/cargo/base/ragavi_vis/Dockerfile +++ b/stimela/cargo/base/ragavi_vis/Dockerfile @@ -3,7 +3,7 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.6 10 RUN pip3 install -U pip setuptools pyyaml RUN pip3 install -U python-casacore dask-ms==0.2.4 -RUN pip3 install ragavi>=0.3.5 +RUN pip3 install git+https://github.com/ratt-ru/ragavi@dev # RUN pip install --force-reinstall -U git+https://github.com/o-smirnov/datashader RUN pip3 install -I numpy RUN ragavi-gains -h From 5a8935f1bccf03c076c1822f4346ef5aaf165015 Mon Sep 17 00:00:00 2001 From: Oleg Smirnov Date: Sun, 10 May 2020 22:28:53 +0200 Subject: [PATCH 4/5] another version of 'stable' images --- stimela/cargo/base/ragavi_vis/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stimela/cargo/base/ragavi_vis/Dockerfile b/stimela/cargo/base/ragavi_vis/Dockerfile index 0583ffe3..2cf6d271 100644 --- a/stimela/cargo/base/ragavi_vis/Dockerfile +++ b/stimela/cargo/base/ragavi_vis/Dockerfile @@ -2,7 +2,8 @@ FROM stimela/base:1.2.5 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.6 10 RUN pip3 install -U pip setuptools pyyaml -RUN pip3 install -U python-casacore dask-ms==0.2.4 +RUN pip3 install -U python-casacore dask-ms==0.2.3 +# RUN pip3 install -U ragavi RUN pip3 install git+https://github.com/ratt-ru/ragavi@dev # RUN pip install --force-reinstall -U git+https://github.com/o-smirnov/datashader RUN pip3 install -I numpy From a7066379faf9db3e6e2cf02339d0295a674dfbc5 Mon Sep 17 00:00:00 2001 From: Oleg Smirnov Date: Mon, 11 May 2020 13:09:46 +0200 Subject: [PATCH 5/5] working dev version of ragavi --- stimela/cargo/base/ragavi/Dockerfile | 8 +++++--- stimela/cargo/base/ragavi_vis/Dockerfile | 12 ------------ stimela/cargo/cab/ragavi/parameters.json | 2 +- stimela/cargo/cab/ragavi_vis/parameters.json | 4 ++-- 4 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 stimela/cargo/base/ragavi_vis/Dockerfile diff --git a/stimela/cargo/base/ragavi/Dockerfile b/stimela/cargo/base/ragavi/Dockerfile index 97679dc9..c9fe505b 100644 --- a/stimela/cargo/base/ragavi/Dockerfile +++ b/stimela/cargo/base/ragavi/Dockerfile @@ -2,10 +2,12 @@ FROM stimela/base:1.2.5 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.6 10 RUN pip3 install -U pip setuptools pyyaml -RUN pip3 install -U python-casacore dask-ms==0.2.3 -RUN pip3 install ragavi>=0.3.5 +RUN pip3 install -U python-casacore git+https://github.com/ska-sa/dask-ms@remove-table-proxy-weakref-finalize +#dask-ms==0.2.3 +# RUN pip3 install -U ragavi +RUN pip3 install git+https://github.com/ratt-ru/ragavi@dev # RUN pip install --force-reinstall -U git+https://github.com/o-smirnov/datashader RUN pip3 install -I numpy RUN ragavi-gains -h RUN ragavi-vis -h -#RUN python3 -c "import yaml" \ No newline at end of file +#RUN python3 -c "import yaml" diff --git a/stimela/cargo/base/ragavi_vis/Dockerfile b/stimela/cargo/base/ragavi_vis/Dockerfile deleted file mode 100644 index 2cf6d271..00000000 --- a/stimela/cargo/base/ragavi_vis/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM stimela/base:1.2.5 -RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - -RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.6 10 -RUN pip3 install -U pip setuptools pyyaml -RUN pip3 install -U python-casacore dask-ms==0.2.3 -# RUN pip3 install -U ragavi -RUN pip3 install git+https://github.com/ratt-ru/ragavi@dev -# RUN pip install --force-reinstall -U git+https://github.com/o-smirnov/datashader -RUN pip3 install -I numpy -RUN ragavi-gains -h -RUN ragavi-vis -h -#RUN python3 -c "import yaml" diff --git a/stimela/cargo/cab/ragavi/parameters.json b/stimela/cargo/cab/ragavi/parameters.json index 5dda800c..970d64d9 100644 --- a/stimela/cargo/cab/ragavi/parameters.json +++ b/stimela/cargo/cab/ragavi/parameters.json @@ -1,7 +1,7 @@ { "task": "ragavi", "base": "stimela/ragavi", - "tag": "1.4.6-2", + "tag": "1.5.0", "description": "Radio Astronomy Gain and Visibility Inspector", "prefix": "--", "binary": "ragavi-gains", diff --git a/stimela/cargo/cab/ragavi_vis/parameters.json b/stimela/cargo/cab/ragavi_vis/parameters.json index 4e1c06d0..774e5a2d 100644 --- a/stimela/cargo/cab/ragavi_vis/parameters.json +++ b/stimela/cargo/cab/ragavi_vis/parameters.json @@ -1,7 +1,7 @@ { "task": "ragavi", - "base": "stimela/ragavi_vis", - "tag": "1.4.6-2", + "base": "stimela/ragavi", + "tag": "1.5.0", "description": "Radio Astronomy Gain and Visibility Inspector", "prefix": "--", "binary": "ragavi-vis",