diff --git a/.github/workflows/continuous_integration.yml b/.github/continuous_integration.yml similarity index 100% rename from .github/workflows/continuous_integration.yml rename to .github/continuous_integration.yml diff --git a/.github/workflows/.DS_Store b/.github/workflows/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/.github/workflows/.DS_Store differ diff --git a/Dockerfile b/Dockerfile index 29eaf836..955f0b8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,8 @@ -FROM rocker/tidyverse:4.2 +FROM rocker/tidyverse:4.4.0 LABEL maintainer = "Ryan Corbett (corbettr@chop.edu)" -COPY scripts/install_github.r . -COPY scripts/install_bioc.r . - -### Install apt-getable packages to start ######################################### RUN apt-get update && apt-get install -y --no-install-recommends apt-utils dialog @@ -25,34 +21,36 @@ RUN apt-get -y --no-install-recommends install \ libudunits2-dev \ libmagick++-dev -# install R packages from CRAN -RUN install2.r \ - BiocManager \ - circlize \ - data.table \ - ggalluvial \ - ggpubr \ - ggthemes \ - optparse \ - pheatmap \ - RColorBrewer \ - survival \ - survMisc \ - survminer \ - tidytext \ - openxlsx \ - - # install R packages from Bioconductor -RUN ./install_bioc.r \ - biomaRt \ - ComplexHeatmap \ - GenomicRanges +# Set the Bioconductor repository as the primary repository +RUN R -e "options(repos = BiocManager::repositories())" + +# Install BiocManager and the desired version of Bioconductor +RUN R -e "install.packages('BiocManager', dependencies=TRUE)" +RUN R -e "BiocManager::install(version = '3.19')" + +# Install packages +RUN R -e 'BiocManager::install(c( \ + "biomaRt", \ + "circlize", \ + "ComplexHeatmap", \ + "data.table", \ + "GenomicRanges", \ + "ggalluvial", \ + "ggthemes", \ + "optparse", \ + "pheatmap", \ + "RColorBrewer", \ + "survival", \ + "survMisc", \ + "survminer", \ + "tidytext", \ + "openxlsx" \ +))' -RUN ./install_github.r \ - clauswilke/colorblindr -RUN ./install_github.r 'thomasp85/patchwork' --ref 'c67c6603ba59dd46899f17197f9858bc5672e9f4' +RUN R -e "remotes::install_github('clauswilke/colorblindr', ref = '1ac3d4d62dad047b68bb66c06cee927a4517d678', dependencies = TRUE)" +RUN R -e "remotes::install_github('thomasp85/patchwork', ref = '1cb732b129ed6a65774796dc1f618558c7498b66')" WORKDIR /rocker-build/ -ADD Dockerfile . \ No newline at end of file +ADD Dockerfile . diff --git a/README.md b/README.md index 5c22de4b..e2abe8c6 100644 --- a/README.md +++ b/README.md @@ -4,17 +4,20 @@ 1. Clone the repository: ``` - git clone https://github.com/d3b-center/pbta-ancestry.git +git clone git@github.com:d3b-center/pbta-ancestry.git ``` + 2. Pull Docker container: ``` - docker pull pgc-images.sbgenomics.com/corbettr/pbta-ancestry:latest +docker pull pgc-images.sbgenomics.com/d3b-bixu/pbta-ancestry:latest ``` + 3. Start the Docker container; from the `pbta-ancestry` folder, run: ``` - docker run --platform linux/amd64 --name -d -e PASSWORD=pass -p 8787:8787 -v $PWD:/home/rstudio/pbta-ancestry pgc-images.sbgenomics.com/corbettr/pbta-ancestry:latest +docker run --platform linux/amd64 --name -d -e PASSWORD=pass -p 8787:8787 -v $PWD:/home/rstudio/pbta-ancestry pgc-images.sbgenomics.com/d3b-bixu/pbta-ancestry:latest ``` + 4. Execute the shell within the docker image; from the `pbta-ancestry` folder, run: ``` - docker exec -ti bash +docker exec -ti bash ``` \ No newline at end of file