-
Notifications
You must be signed in to change notification settings - Fork 128
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Update docker files * Add esmvaltool install command * Upload coverage for regular unit tests Co-authored-by: Bouwe Andela <[email protected]>
- Loading branch information
1 parent
6cdf84a
commit 346841b
Showing
12 changed files
with
218 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
|
||
**/__pycache__ | ||
.* | ||
doc | ||
package | ||
tests | ||
ESMValTool.egg-info | ||
|
||
|
||
!.zenodo.json | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,16 @@ | ||
# To build this container, go to ESMValTool root folder and execute: | ||
# docker build -t esmvaltool:latest . -f docker/Dockerfile | ||
FROM continuumio/miniconda3 | ||
|
||
# update the conda packages | ||
RUN conda update -y conda pip | ||
RUN apt install julia -y && apt-get clean | ||
COPY ./environment.yml /src/ESMValTool/environment.yml | ||
WORKDIR /src/ESMValTool | ||
RUN conda update -y conda pip && conda env update --name base --file environment.yml && conda clean --all -y | ||
|
||
# install development tools | ||
RUN apt-get update -y && apt-get install -y \ | ||
build-essential \ | ||
curl \ | ||
unzip | ||
COPY ./esmvaltool/install/R /src/ESMValTool/esmvaltool/install/R | ||
RUN Rscript ./esmvaltool/install/R/setup.R | ||
|
||
# install environment packages | ||
RUN conda install -c conda-forge -c esmvalgroup -c birdhouse esmvaltool | ||
|
||
# run tests | ||
RUN esmvaltool -h | ||
COPY . /src/ESMValTool | ||
RUN pip install -e . && pip cache purge && esmvaltool install Julia | ||
|
||
ENTRYPOINT ["esmvaltool"] | ||
CMD ["-h"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# To build this container, go to ESMValTool root folder and execute: | ||
# docker build -t esmvaltool:development . -f docker/Dockerfile.dev | ||
FROM continuumio/miniconda3 | ||
|
||
RUN apt install julia -y && apt-get clean | ||
COPY ./environment.yml /src/ESMValTool/environment.yml | ||
WORKDIR /src/ESMValTool | ||
RUN conda update -y conda pip && conda env update --name base --file environment.yml && conda clean --all -y | ||
|
||
COPY ./esmvaltool/install/R /src/ESMValTool/esmvaltool/install/R | ||
RUN Rscript ./esmvaltool/install/R/setup.R | ||
|
||
COPY . /src/ESMValTool | ||
RUN pip install -e .[test] && pip cache purge && esmvaltool install Julia && pip uninstall esmvaltool -y | ||
RUN rm -rf /src | ||
|
||
ENTRYPOINT ["esmvaltool"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# To build this container, go to ESMValTool root folder and execute: | ||
# docker build -t esmvaltool:experimental . -f docker/Dockerfile.exp | ||
FROM esmvalgroup/esmvalcore:latest | ||
|
||
RUN apt install julia -y && apt-get clean | ||
COPY ./environment.yml /src/ESMValTool/environment.yml | ||
WORKDIR /src/ESMValTool | ||
RUN conda update -y conda pip && conda env update --name base --file environment.yml && conda clean --all -y | ||
|
||
COPY ./esmvaltool/install/R /src/ESMValTool/esmvaltool/install/R | ||
RUN Rscript ./esmvaltool/install/R/setup.R | ||
|
||
COPY . /src/ESMValTool | ||
RUN pip install -e . && pip install ../ESMValCore && pip cache purge && esmvaltool install Julia | ||
|
||
ENTRYPOINT ["esmvaltool"] |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.