Merge pull request #13 from USDA-ARS-NWRC/dockerfile_fix

Docker build fix
USDA-ARS-NWRC · Oct 24, 2019 · 81c4c4a · 81c4c4a
2 parents 34e4369 + 119bfec
commit 81c4c4a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -51,18 +51,15 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/reposit
     make install && \
     apk del .nco-dependencies && \
     rm -rf /code/nco-4.7.2
-
-# build the requirements first, CCFLAGS help reduce the size of pandas and numpy
-COPY requirements_grib2nc.txt /code
-RUN CFLAGS="-g0 -Wl,--strip-all" \
-    python3 -m pip install --no-cache-dir --compile --global-option=build_ext -r /code/requirements_grib2nc.txt 
 
 # Add the weather code
 ADD . /code/weather_forecast_retrieval
 
 # Add and build weather forecast retrival
 RUN cd /code/weather_forecast_retrieval && \
     apk --no-cache add netcdf-utils hdf5 hdf5-dev libffi-dev && \
+    CFLAGS="-g0 -Wl,--strip-all" \
+    python3 -m pip install --no-cache-dir --compile --global-option=build_ext -r requirements.txt && \
     python3 setup.py install && \
     apk del .build-dependencies
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 pyyaml==4.2b1
 coloredlogs==6.1
 siphon>=0.6.1
-pyproj>=1.9.5.1
+pyproj>=1.9.5.1,<2.0
 utm==0.4.0
 pytz
 requests>=2.21.0

diff --git a/requirements_grib2nc.txt b/requirements_grib2nc.txt