From f2f6078eae45f502a503829c6955bcefea9e667a Mon Sep 17 00:00:00 2001
From: rlyu <rlyu@svi.edu.au>
Date: Mon, 14 Oct 2019 15:52:45 +1100
Subject: [PATCH] Dockerfile merge

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a582ba2..6b61659 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,6 @@ RUN sudo add-apt-repository ppa:ubuntugis/ppa && sudo apt-get update
 #RUN sudo apt-get update && apt-get install -yq --no-install-recommends python3-pip python3-setuptools
 RUN sudo apt-get update && apt-get install -yq --no-install-recommends gdal-bin libgdal-dev  
 RUN sudo apt-get update && apt-get install -yq --no-install-recommends python3-gdal python3-numpy
-RUN sudo apt-get update && apt-get install -yq --no-install-recommends xorg libx11-dev libglu1-mesa-dev libfreetype6-dev
 RUN sudo add-apt-repository ppa:thomas-schiex/blender 
 RUN echo which gdal
 
@@ -162,6 +161,7 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
 
 # Install other CRAN
 RUN Rscript -e 'install.packages(c("Seurat", "rJava", "umap", "bookdown", "cluster", "KernSmooth", "ROCR", "googleVis", "ggbeeswarm", "SLICER", "ggfortify", "mclust", "Rmagic", "DrImpute","Polychrome","future"))'
+RUN sudo apt-get update && apt-get install -yq --no-install-recommends xorg libx11-dev libglu1-mesa-dev libfreetype6-dev
 
 # Install Bioconductor packages
 RUN Rscript -e 'BiocManager::install(c("graph", "RBGL", "gtools", "xtable", "pcaMethods", "limma", "SingleCellExperiment", "Rhdf5lib", "scater", "scran", "RUVSeq", "sva", "SC3",  "TSCAN", "monocle", "destiny", "DESeq2", "edgeR", "MAST", "scmap", "biomaRt", "MultiAssayExperiment", "SummarizedExperiment","EnsDb.Mmusculus.v79","slingshot","scds"))'
-- 
GitLab