Updating Dockerfiles

rpratt20 · May 16, 2015 · 34d890a · 34d890a
1 parent e2345b4
commit 34d890a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/misc/docker_tests/base_images/centos_7/Dockerfile b/misc/docker_tests/base_images/centos_7/Dockerfile
@@ -8,6 +8,3 @@ RUN yum -y upgrade || true
 RUN yum install -y gcc numpy scipy python-matplotlib python-sqlalchemy python-lxml python-mock python-basemap python-basemap-data python-pip
 RUN easy_install -U setuptools pip
 RUN pip install flake8 suds-jurko future
-# CentOS 7 has a slightly messed up basemap installation.
-RUN mkdir -p /usr/lib64/python2.7/site-packages/mpl_toolkits/basemap/data/
-RUN mv /usr/share/basemap/* /usr/lib64/python2.7/site-packages/mpl_toolkits/basemap/data/
diff --git a/misc/docker_tests/base_images/fedora_20/Dockerfile b/misc/docker_tests/base_images/fedora_20/Dockerfile
@@ -4,5 +4,5 @@ MAINTAINER Lion Krischer
 
 # Can fail on occasion.
 RUN yum -y upgrade || true
-RUN yum install -y numpy scipy python-matplotlib python-sqlalchemy python-lxml python-mock python-basemap python-basemap-data python-tornado python-pip
+RUN yum install -y gcc numpy scipy python-matplotlib python-sqlalchemy python-lxml python-mock python-basemap python-basemap-data python-tornado python-pip
 RUN pip install flake8 suds-jurko future
diff --git a/misc/docker_tests/base_images/fedora_21/Dockerfile b/misc/docker_tests/base_images/fedora_21/Dockerfile
@@ -4,8 +4,5 @@ MAINTAINER Lion Krischer
 
 # Can fail on occasion.
 RUN yum -y upgrade || true
-RUN yum install -y numpy scipy python-matplotlib python-sqlalchemy python-lxml python-mock python-basemap python-basemap-data python-tornado python-pip
+RUN yum install -y gcc numpy scipy python-matplotlib python-sqlalchemy python-lxml python-mock python-basemap python-basemap-data python-tornado python-pip
 RUN pip install flake8 suds-jurko future
-# Fedora has a slightly messed up basemap installation.
-RUN mkdir -p /usr/lib64/python2.7/site-packages/mpl_toolkits/basemap/data/
-RUN mv /usr/share/basemap/* /usr/lib64/python2.7/site-packages/mpl_toolkits/basemap/data/
diff --git a/misc/docker_tests/base_images/opensuse_13_1/Dockerfile b/misc/docker_tests/base_images/opensuse_13_1/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER Lion Krischer
 RUN zypper addrepo http://download.opensuse.org/repositories/Application:/Geo/openSUSE_13.1/Application:Geo.repo
 RUN zypper --no-gpg-checks refresh
 RUN zypper update
-RUN zypper install -y python-devel python-numpy python-scipy python-matplotlib gcc-fortran python-SQLAlchemy python-lxml python-mock python-pip libgeos0 libgeos-devel python-numpy-devel python-tornado
+RUN zypper install -y gcc python-devel python-numpy python-scipy python-matplotlib gcc-fortran python-SQLAlchemy python-lxml python-mock python-pip geos geos-devel python-numpy-devel python-tornado
 RUN pip install -U setuptools
 RUN pip install flake8 suds-jurko future
 RUN GEOS_DIR=/usr/lib64 pip install basemap
diff --git a/misc/docker_tests/base_images/opensuse_13_2/Dockerfile b/misc/docker_tests/base_images/opensuse_13_2/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER Lion Krischer
 RUN zypper addrepo http://download.opensuse.org/repositories/Application:/Geo/openSUSE_13.2/Application:Geo.repo
 RUN zypper --no-gpg-checks refresh
 RUN zypper update
-RUN zypper install -y python-devel python-numpy python-scipy python-matplotlib gcc-fortran python-SQLAlchemy python-lxml python-mock python-pip libgeos0 libgeos-devel python-numpy-devel python-tornado
+RUN zypper install -y gcc python-devel python-numpy python-scipy python-matplotlib gcc-fortran python-SQLAlchemy python-lxml python-mock python-pip geos geos-devel python-numpy-devel python-tornado
 RUN pip install -U setuptools
 RUN pip install flake8 suds-jurko future
 RUN GEOS_DIR=/usr/lib64 pip install basemap --allow-unverified basemap --allow-external basemap