diff --git a/Dockerfile b/Dockerfile index 2288e559c..17fa7a9fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,14 +19,19 @@ ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ## common package installations RUN sed 's/main$/main universe/' -i /etc/apt/sources.list RUN apt-get update -RUN apt-get install -y software-properties-common RUN apt-get install -y make ## install lucida RUN mkdir -p /usr/local/lucida ADD . /usr/local/lucida WORKDIR "/usr/local/lucida/tools" -RUN /usr/bin/make +RUN /bin/bash apt_deps.sh +RUN /bin/bash install_python.sh +RUN /bin/bash install_java.sh +RUN /bin/bash install_opencv.sh +RUN /bin/bash install_thrift.sh +RUN /bin/bash install_fbthrift.sh +RUN /bin/bash install_mongodb.sh WORKDIR "/usr/local/lucida/lucida" RUN /usr/bin/make RUN /bin/bash commandcenter/apache/install_apache.sh @@ -41,4 +46,4 @@ RUN mkdir -p /etc/letsencrypt/live/host ### docker rm ${d} 2>&1 > /dev/null ### done ### fi -### } \ No newline at end of file +### } diff --git a/lucida/djinntonic/Makefile b/lucida/djinntonic/Makefile index 10940459e..352aa3d83 100644 --- a/lucida/djinntonic/Makefile +++ b/lucida/djinntonic/Makefile @@ -1,5 +1,4 @@ include ../../Makefile.common -SUBDIRS=dig face imc fname=djinn-weights-1.0.tar.gz all: