Merge branch 'master' of github.com:mskcc/facets-suite

Author: cband

Dockerfile

@@ -30,15 +30,16 @@ RUN cd /tmp \
 # Clean up tmp
 RUN rm -rf /tmp/*
 
-# Download facetsSuite repo
-RUN wget -O facets-suite-${FACETSSUITE_VERSION}.zip https://github.com/mskcc/facets-suite/archive/${FACETSSUITE_VERSION}.zip \
-    && unzip facets-suite-${FACETSSUITE_VERSION}.zip \
-    && mv facets-suite-${FACETSSUITE_VERSION}/*-wrapper.R /usr/bin \
-    && chmod +x /usr/bin/*wrapper.R
-
-# Install package
-RUN cd facets-suite-${FACETSSUITE_VERSION} \
-    && Rscript -e "devtools::install()"
-
-# Always run Rscript as vanilla
-RUN export Rscript="Rscript --vanilla"
+# Add Facets Suite to the container
+RUN mkdir /facets-suite
+ADD . /facets-suite
+RUN cd /facets-suite && \
+    Rscript -e "devtools::install()"
+ENV PATH=/facets-suite:$PATH
+
+# install Facets
+RUN wget https://github.com/mskcc/facets/archive/v0.5.14.zip -O facets_v0.5.14.zip && \
+    unzip facets_v0.5.14.zip && \
+    rm -f facets_v0.5.14.zip && \
+    cd facets-0.5.14 && \
+    Rscript -e "devtools::install()"