From 2a068c3cf43f2097dfe85b65b6fa837cb7627895 Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 29 Jun 2019 11:38:57 -0400 Subject: [PATCH] basemap version up, code up --- api-async/Dockerfile | 4 ++-- mimir/Dockerfile | 2 +- ui-nginx/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api-async/Dockerfile b/api-async/Dockerfile index 52c2932..5a38db4 100644 --- a/api-async/Dockerfile +++ b/api-async/Dockerfile @@ -192,11 +192,11 @@ RUN cd /usr/local/source/ \ && pip install pandas \ && pip install numpy \ && pip install shapely \ - && pip install https://github.com/matplotlib/basemap/archive/v1.1.0.tar.gz \ + && pip install git+https://github.com/matplotlib/basemap \ && pip install -e . \ && mkdir -p /usr/local/source/web-api/.vizierdb -ENV PULL_CODE=8 +ENV PULL_CODE=9 RUN cd /usr/local/source/web-api \ && git pull diff --git a/mimir/Dockerfile b/mimir/Dockerfile index 4dcfcd8..c04eb59 100644 --- a/mimir/Dockerfile +++ b/mimir/Dockerfile @@ -88,7 +88,7 @@ RUN curl -sL "https://github.com/sbt/sbt/releases/download/v0.13.15/sbt-0.13.15. RUN cd /usr/local/source/mimir \ && ../sbt/bin/sbt "runMimirVizier -X LOG LOGM remoteSpark NO-VISTRAILS" -ENV PULL_CODE=12 +ENV PULL_CODE=13 RUN cd /usr/local/source/mimir \ && git pull \ diff --git a/ui-nginx/Dockerfile b/ui-nginx/Dockerfile index 3f7cc59..28debd9 100644 --- a/ui-nginx/Dockerfile +++ b/ui-nginx/Dockerfile @@ -33,7 +33,7 @@ ENV API_BASIC_AUTH=false #setup production web-ui branch RUN mkdir /usr/local/source/ \ && cd /usr/local/source/ \ - && echo 'test8' \ + && echo 'test12' \ && git clone https://github.com/VizierDB/web-ui.git \ && cd /usr/local/source/web-ui \ && git checkout -b local_$UI_BRANCH origin/$UI_BRANCH \