updated docker container to install wget, less, and vim; also fixed r…

…equirements for numpy

Docker/Dockerfile

@@ -12,7 +12,7 @@ ENV HOME /home/$USERNAME
 ENV IMAGE_NAME $IMAGE_NAME
 ENV IMAGE_TAG $IMAGE_TAG
 
-RUN apt-get update && apt-get install -y --no-install-recommends build-essential r-base r-base-dev python3.6 python3-pip python3-setuptools python3-dev git autoconf automake
+RUN apt-get update && apt-get install -y --no-install-recommends build-essential r-base r-base-dev python3.6 python3-pip python3-setuptools python3-dev git autoconf automake vim wget less
 
 WORKDIR /app
 
@@ -93,5 +93,5 @@ RUN echo "export PATH=/app/bin:/app/scripts/python/admixturePipeline:${PATH}" >>
 
 USER $USER
 
-WORKDIR /app
+WORKDIR /app/data
 

Docker/buildDocker.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-#docker image build --no-cache -t admixpipe --file Dockerfile .
-docker image build -t admixpipe --file Dockerfile .
+docker image build --no-cache -t admixpipe --file Dockerfile .
+#docker image build -t admixpipe --file Dockerfile .
 
 
 exit

Docker/requirements.txt

@@ -2,3 +2,4 @@ geopandas==0.9.0
 pandas==1.1.5
 rpy2==3.4.3
 matplotlib==3.3.4
+numpy==1.22.2