updated docker and added gdal-bin

AstroDigital · Mar 22, 2017 · 3673a54 · 3673a54
1 parent 408e39d
commit 3673a54
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Dockerfile-base b/Dockerfile-base
@@ -5,7 +5,7 @@ COPY requirements.txt /build/requirements.txt
 COPY requirements-dev.txt /build/requirements-dev.txt
 
 RUN apt-get update; \
-    apt-get install -y python-setuptools python-numpy python-dev libgdal-dev python-gdal swig git g++; \
+    apt-get install -y python-setuptools python-numpy python-dev libgdal-dev python-gdal gdal-bin swig git g++; \
     easy_install pip; pip install wheel;
 
 RUN \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
 
-  base:
+  dev:
     build:
         context: .
         dockerfile: Dockerfile-base
@@ -11,21 +11,22 @@ services:
     volumes:
       - '.:/work'
 
-  build:
+  latest:
     build:
         context: .
     image: 'modispds:latest'
+    entrypoint: /bin/bash
 
   test:
-    image: 'modispds:latest'
+    image: 'modispds:base'
     entrypoint: bash -c 'nosetests --with-coverage --cover-package modispds --cover-inclusive --with-timer -v -s;'
     working_dir: /work
     volumes:
       - '.:/work'
 
   ingest:
     image: 'modispds:latest'
-    entrypoint: 'python modispds/main.py'
+    entrypoint: 'modis-pds'
     working_dir: /work
     volumes:
       - '.:/work'