From 456ab0507d89a300d42b023fa902e0ff06455e1f Mon Sep 17 00:00:00 2001 From: Jermiah Date: Tue, 6 Feb 2024 01:03:27 +0000 Subject: [PATCH] Update package version and Docker tag --- DESCRIPTION | 2 +- build/annotationGx.Dockerfile | 13 ++++++++++++- build/buildimage.sh | 4 +++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 76766ce..5152e69 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: AnnotationGx Title: AnnotationGx: A package for building, updating and querying an annotation database for pharmaco-genomic data -Version: 0.0.5.9002 +Version: 0.0.5.9100 Authors@R: c( person("Christopher", "Eeles", role = c("aut"), email = "christopher.eeles@uhnresearch.ca"), diff --git a/build/annotationGx.Dockerfile b/build/annotationGx.Dockerfile index b4f3730..15d5211 100644 --- a/build/annotationGx.Dockerfile +++ b/build/annotationGx.Dockerfile @@ -34,10 +34,21 @@ RUN apt-get update && apt-get install -y \ # RUN R -e "BiocManager::install('data.table', update = FALSE, ask = FALSE)" RUN install2.r --error --deps TRUE pak +# add "https://r.acidgenomics.com", BiocManager::repositories() to the list of repositories + +RUN R -e "install.packages( \ + pkgs = 'Cellosaurus',\ + repos = c(\ + 'https://r.acidgenomics.com',\ + BiocManager::repositories()\ + ),\ + dependencies = TRUE\ + )" -RUN R -e "pak::pkg_install('bhklab/AnnotationGx@main', ask = F)" +RUN R -e "pak::pkg_install('bhklab/AnnotationGx@main', ask = F)" +RUN R -e "pak::pak_cleanup(force=TRUE)" RUN rm -rf /tmp/* CMD ["R"] \ No newline at end of file diff --git a/build/buildimage.sh b/build/buildimage.sh index f02d1b0..7e7e4b3 100755 --- a/build/buildimage.sh +++ b/build/buildimage.sh @@ -2,7 +2,9 @@ export DOCKER_REPO="jjjermiah" export DOCKER_IMAGE_NAME="annotationgx-r" -export DOCKER_TAG="0.1" +export DOCKER_TAG="0.1.1" docker build -t $DOCKER_REPO/$DOCKER_IMAGE_NAME:$DOCKER_TAG -f build/annotationGx.Dockerfile . +# then push to dockerhub +docker push $DOCKER_REPO/$DOCKER_IMAGE_NAME:$DOCKER_TAG