diff --git a/docker/Dockerfile b/docker/Dockerfile index e915e7e12a8b69e0281332b8c9e95bea22d9aefb..9e858f091a57249d76285305a43640376d8c495e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,11 +1,11 @@ -FROM alpine:3.8 -MAINTAINER Jacques Grelet "Jacques.Grelet@ird.fr" +FROM alpine:3.6 +LABEL maintainer="Jacques.Grelet_at_ird.fr" ENV PACKAGES="\ dumb-init \ musl \ libc6-compat \ - linux-headers \ + linux-headers \ build-base \ bash \ make \ @@ -17,21 +17,21 @@ ENV PACKAGES="\ libxml2-dev \ hdf5 \ hdf5-dev \ - ca-certificates \ - libgcc \ - libstdc++ \ - tcl \ - tk \ - libssl1.0 \ + ca-certificates \ + libgcc \ + libstdc++ \ + tcl \ + tk \ + libssl1.0 \ net-tools \ iputils-ping \ - " + " ENV PYTHON_PACKAGES="\ - numpy \ - matplotlib \ + numpy \ + matplotlib \ scipy \ -# basemap \ + https://github.com/matplotlib/basemap/archive/v1.1.0.tar.gz \ toml \ pynmea2 \ pySerial \ diff --git a/docker/README.md b/docker/README.md index 9849b818a635080e016d5e3d5fab17816f8db601..c46a044320b48785c87f603788e6d0ac7f2d84c1 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,18 +1,18 @@ -#Docker image for Python oceanographic containers +# Docker image for Python oceanographic containers -## build image from Docker file: +## build image from Docker file '''' -docker build -t jgrelet/oceano2python:3.7 -f Dockerfile . +docker build -t jgrelet/oceano2python:3.6 -f Dockerfile . '''' -## pull pull the existing images from Docker hub: +## pull pull the existing images from Docker hub '''' docker pull jgrelet/oceano2python:3.6 '''' -## run the container: +## run the container '''' docker run -it --rm -v /D_DRIVE:/data -e CRUISE="$CRUISE" -e DRIVE=/data python jgrelet/oceano2python:3.6 /bin/bash