From 81893a3edcde633cd4652fe18538dc97eecaec7d Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sun, 26 Nov 2017 11:32:09 +0100 Subject: [PATCH 1/8] Dockerfile: minor cleanup --- docker/python2/Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docker/python2/Dockerfile b/docker/python2/Dockerfile index 7b4f375..30cacb7 100644 --- a/docker/python2/Dockerfile +++ b/docker/python2/Dockerfile @@ -6,10 +6,6 @@ MAINTAINER Luca Delucchi # system environment ENV DEBIAN_FRONTEND noninteractive -#### ENV CPLUS_INCLUDE_PATH=/usr/include/gdal \ -#### C_INCLUDE_PATH=/usr/include/gdal - -# ?? && apt-get install -y --install-recommends \ # fetch dependencies RUN apt-get update \ @@ -23,9 +19,7 @@ RUN apt-get update \ python-future \ python-requests -# && apt-get autoremove \ -# && apt-get clean +RUN apt-get autoremove && apt-get clean # Install pyModis -#####? RUN pip install GDAL==$(gdal-config --version | awk -F'[.]' '{print $1"."$2}') RUN pip install pyModis From 7b91965eff58e773600329b44b4360998adf0b23 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sun, 26 Nov 2017 11:40:55 +0100 Subject: [PATCH 2/8] Dockerfile: minor cleanup --- docker/python3/Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docker/python3/Dockerfile b/docker/python3/Dockerfile index 29048e9..288841d 100644 --- a/docker/python3/Dockerfile +++ b/docker/python3/Dockerfile @@ -6,10 +6,6 @@ MAINTAINER Luca Delucchi # system environment ENV DEBIAN_FRONTEND noninteractive -#### ENV CPLUS_INCLUDE_PATH=/usr/include/gdal \ -#### C_INCLUDE_PATH=/usr/include/gdal - -# ?? && apt-get install -y --install-recommends \ # fetch dependencies RUN apt-get update \ @@ -23,9 +19,7 @@ RUN apt-get update \ python3-future \ python3-requests -# && apt-get autoremove \ -# && apt-get clean +RUN apt-get autoremove && apt-get clean # Install pyModis -#####? RUN pip install GDAL==$(gdal-config --version | awk -F'[.]' '{print $1"."$2}') RUN pip3 install pyModis From 303a11690ece8f2a63c925a8aab419715b8ab1e7 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sun, 26 Nov 2017 14:37:39 +0100 Subject: [PATCH 3/8] Dockerize the modis_* scripts --- docker/python2/Dockerfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docker/python2/Dockerfile b/docker/python2/Dockerfile index 30cacb7..302c5db 100644 --- a/docker/python2/Dockerfile +++ b/docker/python2/Dockerfile @@ -23,3 +23,17 @@ RUN apt-get autoremove && apt-get clean # Install pyModis RUN pip install pyModis + +# make scripts available as dockerized applications +ADD modis_download.py /modis_download.py +ADD modis_download_from_list.py /modis_download_from_list.py +ADD modis_convert.py /modis_convert.py +ADD modis_mosaic.py /modis_mosaic.py +ADD modis_parse.py /modis_parse.py +ADD modis_multiparse.py /modis_multiparse.py +ADD modis_quality.py /modis_quality.py + +RUN chmod +x modis_download.py modis_download_from_list.py modis_convert.py modis_mosaic.py modis_parse.py modis_multiparse.py modis_quality.py + +WORKDIR / + From ce50eab064e28fa8b21c5f55cf27da212cbb6971 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sun, 26 Nov 2017 15:10:32 +0100 Subject: [PATCH 4/8] Dockerize the modis_* scripts --- docker/python2/Dockerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/python2/Dockerfile b/docker/python2/Dockerfile index 302c5db..ab70cd2 100644 --- a/docker/python2/Dockerfile +++ b/docker/python2/Dockerfile @@ -1,11 +1,13 @@ FROM ubuntu:16.04 -# http://www.pymodis.org/ docker image +# Dockerfile by M Neteler and L Delucchi +# http://www.pymodis.org/ MAINTAINER Luca Delucchi # system environment ENV DEBIAN_FRONTEND noninteractive +WORKDIR / # fetch dependencies RUN apt-get update \ @@ -25,15 +27,13 @@ RUN apt-get autoremove && apt-get clean RUN pip install pyModis # make scripts available as dockerized applications -ADD modis_download.py /modis_download.py -ADD modis_download_from_list.py /modis_download_from_list.py -ADD modis_convert.py /modis_convert.py -ADD modis_mosaic.py /modis_mosaic.py -ADD modis_parse.py /modis_parse.py -ADD modis_multiparse.py /modis_multiparse.py -ADD modis_quality.py /modis_quality.py +ADD modis_download.py / +ADD modis_download_from_list.py / +ADD modis_convert.py / +ADD modis_mosaic.py / +ADD modis_parse.py / +ADD modis_multiparse.py / +ADD modis_quality.py / RUN chmod +x modis_download.py modis_download_from_list.py modis_convert.py modis_mosaic.py modis_parse.py modis_multiparse.py modis_quality.py -WORKDIR / - From 8a10eaf19b05f64d8324df40e758ac75e9ea320f Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sun, 26 Nov 2017 15:30:20 +0100 Subject: [PATCH 5/8] Dockerize the modis_* scripts --- docker/python2/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/python2/Dockerfile b/docker/python2/Dockerfile index ab70cd2..cf3092a 100644 --- a/docker/python2/Dockerfile +++ b/docker/python2/Dockerfile @@ -7,7 +7,6 @@ MAINTAINER Luca Delucchi # system environment ENV DEBIAN_FRONTEND noninteractive -WORKDIR / # fetch dependencies RUN apt-get update \ @@ -27,13 +26,14 @@ RUN apt-get autoremove && apt-get clean RUN pip install pyModis # make scripts available as dockerized applications -ADD modis_download.py / -ADD modis_download_from_list.py / -ADD modis_convert.py / -ADD modis_mosaic.py / -ADD modis_parse.py / -ADD modis_multiparse.py / -ADD modis_quality.py / +ADD /usr/local/bin/modis_download.py / +ADD /usr/local/bin/modis_download_from_list.py / +ADD /usr/local/bin/modis_convert.py / +ADD /usr/local/bin/modis_mosaic.py / +ADD /usr/local/bin/modis_parse.py / +ADD /usr/local/bin/modis_multiparse.py / +ADD /usr/local/bin/modis_quality.py / +WORKDIR / RUN chmod +x modis_download.py modis_download_from_list.py modis_convert.py modis_mosaic.py modis_parse.py modis_multiparse.py modis_quality.py From 88552d0180bb59affbf1a799f0e5a5ee8d72459d Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sun, 26 Nov 2017 20:49:19 +0100 Subject: [PATCH 6/8] Dockerize only the modis_download.py script --- docker/python2/Dockerfile | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/docker/python2/Dockerfile b/docker/python2/Dockerfile index cf3092a..346191e 100644 --- a/docker/python2/Dockerfile +++ b/docker/python2/Dockerfile @@ -25,15 +25,4 @@ RUN apt-get autoremove && apt-get clean # Install pyModis RUN pip install pyModis -# make scripts available as dockerized applications -ADD /usr/local/bin/modis_download.py / -ADD /usr/local/bin/modis_download_from_list.py / -ADD /usr/local/bin/modis_convert.py / -ADD /usr/local/bin/modis_mosaic.py / -ADD /usr/local/bin/modis_parse.py / -ADD /usr/local/bin/modis_multiparse.py / -ADD /usr/local/bin/modis_quality.py / - -WORKDIR / -RUN chmod +x modis_download.py modis_download_from_list.py modis_convert.py modis_mosaic.py modis_parse.py modis_multiparse.py modis_quality.py - +ENTRYPOINT ["python", "/usr/local/bin/modis_download.py"] From 23830215d79fbc5dbf240f0bd5865ad58b64006b Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sun, 26 Nov 2017 21:39:51 +0100 Subject: [PATCH 7/8] Attempt to fix data exchange --- docker/python2/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/python2/Dockerfile b/docker/python2/Dockerfile index 346191e..4bca408 100644 --- a/docker/python2/Dockerfile +++ b/docker/python2/Dockerfile @@ -25,4 +25,6 @@ RUN apt-get autoremove && apt-get clean # Install pyModis RUN pip install pyModis -ENTRYPOINT ["python", "/usr/local/bin/modis_download.py"] +# where to store the MODIS data, run the container using -v /path/on/host:/export to access directory +VOLUME ["/export"] +ENTRYPOINT ["python", "/usr/local/bin/modis_download.py", "/export"] From f01dc2fa09c53b49ba2c104a1d0e4406baf438c9 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sun, 26 Nov 2017 21:41:45 +0100 Subject: [PATCH 8/8] Attempt to fix data exchange --- docker/python3/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/python3/Dockerfile b/docker/python3/Dockerfile index 288841d..3b3dc1f 100644 --- a/docker/python3/Dockerfile +++ b/docker/python3/Dockerfile @@ -1,7 +1,8 @@ FROM ubuntu:16.04 -# http://www.pymodis.org/ docker image +# Dockerfile by M Neteler and L Delucchi +# http://www.pymodis.org/ MAINTAINER Luca Delucchi # system environment @@ -23,3 +24,7 @@ RUN apt-get autoremove && apt-get clean # Install pyModis RUN pip3 install pyModis + +# where to store the MODIS data, run the container using -v /path/on/host:/export to access directory +VOLUME ["/export"] +ENTRYPOINT ["python3", "/usr/local/bin/modis_download.py", "/export"]