Merge pull request #928 from hdoupe/local-dockerfile

Merged #928

Makefile

@@ -7,6 +7,12 @@ dist-build:
 	docker build --no-cache --build-arg TAG=$(TAG) -t opensourcepolicycenter/flask:$(TAG) --file Dockerfile.flask ./ && \
 	docker build --no-cache --build-arg TAG=$(TAG) -t opensourcepolicycenter/celery:$(TAG) --file Dockerfile.celery ./
 
+dist-build-local:
+	cd distributed && \
+	docker build -t opensourcepolicycenter/distributed:$(TAG) ./ --build-arg PUF_TOKEN=$(OSPC_ANACONDA_TOKEN) --file Dockerfile.local && \
+	docker build --no-cache --build-arg TAG=$(TAG) -t opensourcepolicycenter/flask:$(TAG) --file Dockerfile.flask ./ && \
+	docker build --no-cache --build-arg TAG=$(TAG) -t opensourcepolicycenter/celery:$(TAG) --file Dockerfile.celery ./
+
 dist-push:
 	cd distributed && \
 	docker push opensourcepolicycenter/distributed:$(TAG) && \

distributed/Dockerfile

@@ -4,23 +4,15 @@ USER root
 RUN  apt-get update && apt install libgl1-mesa-glx --yes
 
 RUN mkdir /home/distributed
+RUN mkdir /home/distributed/api
 COPY requirements.txt home/distributed
 
-WORKDIR /home/distributed
+WORKDIR /home/distributed/api
 
 RUN conda config --add channels ospc
 RUN conda config --add channels ospc/label/dev
 RUN conda config --append channels conda-forge
 
-RUN conda install numpy>=1.12.1 pandas>=0.23.0 taxcalc=0.20.1 \
-    btax=0.2.2 ogusa=0.5.11 matplotlib numba six bokeh>=0.12.7 mock xlrd \
-    sphinx nomkl
-
-RUN pip install -r requirements.txt
-
-RUN mkdir /home/distributed/api
-WORKDIR /home/distributed/api
-
 # not safe. don't publish with token
 # see conversations like: https://github.com/moby/moby/issues/33343
 ARG PUF_TOKEN
@@ -31,3 +23,13 @@ RUN if [ -z ${PUF_TOKEN+x} ]; \
             write-latest-taxpuf; \
             gunzip -k puf.csv.gz; \
         fi
+
+WORKDIR /home/distributed
+
+RUN conda install numpy>=1.12.1 pandas>=0.23.0 taxcalc=0.20.1 \
+    btax=0.2.2 ogusa=0.5.11 matplotlib numba six bokeh>=0.12.7 mock xlrd \
+    sphinx nomkl
+
+RUN pip install -r requirements.txt
+
+WORKDIR /home/distributed/api

distributed/Dockerfile.local

@@ -0,0 +1,37 @@
+FROM continuumio/miniconda3
+USER root
+RUN  apt-get update && apt install libgl1-mesa-glx --yes
+
+RUN mkdir /home/distributed
+RUN mkdir /home/distributed/api
+
+COPY requirements.txt home/distributed
+
+WORKDIR /home/distributed/api
+
+RUN conda config --append channels conda-forge
+
+# not safe. don't publish with token
+# see conversations like: https://github.com/moby/moby/issues/33343
+ARG PUF_TOKEN
+RUN if [ -z ${PUF_TOKEN+x} ]; \
+        then echo PUF token not specified; \
+        else echo getting and writing PUF file && \
+            conda install taxpuf -c https://conda.anaconda.org/t/$PUF_TOKEN/opensourcepolicycenter && \
+            write-latest-taxpuf; \
+            gunzip -k puf.csv.gz; \
+        fi
+
+WORKDIR /home/distributed
+
+RUN conda install numpy>=1.12.1 pandas>=0.23.0 \
+    matplotlib numba six bokeh>=0.12.7 mock xlrd \
+    sphinx nomkl
+RUN pip install -r requirements.txt
+
+COPY script.sh /home/distributed
+COPY ./Tax-Calculator /home/distributed/Tax-Calculator/
+COPY ./B-Tax /home/distributed/B-Tax/
+RUN bash script.sh
+
+WORKDIR /home/distributed/api

distributed/script.sh

@@ -0,0 +1,7 @@
+cd Tax-Calculator
+pip install -e .
+cd ..
+
+cd B-Tax
+pip install -e .
+cd ..